ffmpeg.git
4 years agoMerge commit 'f261a55d72753bcec33369954809732abae8f8f7'
Michael Niedermayer [Sun, 31 May 2015 22:25:30 +0000 (00:25 +0200)]
Merge commit 'f261a55d72753bcec33369954809732abae8f8f7'

* commit 'f261a55d72753bcec33369954809732abae8f8f7':
  mov: Fix two memleaks

See: 8e77f8ab4abc199a5cc9d6c2c206b73fc2921af0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '3f38d4b816b2aeca15c0b90000ea7ed40377eb0c'
Michael Niedermayer [Sun, 31 May 2015 22:24:45 +0000 (00:24 +0200)]
Merge commit '3f38d4b816b2aeca15c0b90000ea7ed40377eb0c'

* commit '3f38d4b816b2aeca15c0b90000ea7ed40377eb0c':
  vp9: Parse subsampling and report missing feature

Conflicts:
libavcodec/vp9.c
libavcodec/vp9.h

No change as FFmpeg already supports subsampling

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'd68c05380cebf563915412182643a8be04ef890b'
Michael Niedermayer [Sun, 31 May 2015 22:22:23 +0000 (00:22 +0200)]
Merge commit 'd68c05380cebf563915412182643a8be04ef890b'

* commit 'd68c05380cebf563915412182643a8be04ef890b':
  x86: check for AV_CPU_FLAG_AVXSLOW where useful

See: c16e99e3b3c02edcf33245468731d414eab97dac
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agox86: check for AV_CPU_FLAG_AVXSLOW where useful
James Almer [Sun, 31 May 2015 17:20:29 +0000 (14:20 -0300)]
x86: check for AV_CPU_FLAG_AVXSLOW where useful

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'cae39851201b7781f1262e1c23627b45e6e80bb4'
Michael Niedermayer [Sun, 31 May 2015 21:59:18 +0000 (23:59 +0200)]
Merge commit 'cae39851201b7781f1262e1c23627b45e6e80bb4'

* commit 'cae39851201b7781f1262e1c23627b45e6e80bb4':
  x86: Add helper macros to check for slow cpuflags

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'f7cafb5d02aa3f26c185f6f9851413ad77a73872'
Michael Niedermayer [Sun, 31 May 2015 21:57:50 +0000 (23:57 +0200)]
Merge commit 'f7cafb5d02aa3f26c185f6f9851413ad77a73872'

* commit 'f7cafb5d02aa3f26c185f6f9851413ad77a73872':
  x86: add AV_CPU_FLAG_AVXSLOW flag

Conflicts:
doc/APIchanges
libavutil/version.h

See: c312bfac4c8ac1ac55d6648fd6eb36db436100f3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'd0bf20a4f25ac5de021c860a0c8ad05638ee2078'
Michael Niedermayer [Sun, 31 May 2015 21:43:18 +0000 (23:43 +0200)]
Merge commit 'd0bf20a4f25ac5de021c860a0c8ad05638ee2078'

* commit 'd0bf20a4f25ac5de021c860a0c8ad05638ee2078':
  ppc: vsx: Implement diff_pixels and get_pixels

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavutil/ppc/float_dsp_init: Disable duplicate functions
Michael Niedermayer [Sun, 31 May 2015 21:31:06 +0000 (23:31 +0200)]
avutil/ppc/float_dsp_init: Disable duplicate functions

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'eecd29b3fd7fee221580798346d6582b75c7ade4'
Michael Niedermayer [Sun, 31 May 2015 21:23:58 +0000 (23:23 +0200)]
Merge commit 'eecd29b3fd7fee221580798346d6582b75c7ade4'

* commit 'eecd29b3fd7fee221580798346d6582b75c7ade4':
  ppc: vsx: Implement float_dsp

Conflicts:
libavutil/ppc/float_dsp_init.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoconfigure: ldbrx seems not working on qemu power8, disable for now
Michael Niedermayer [Sun, 31 May 2015 21:12:57 +0000 (23:12 +0200)]
configure: ldbrx seems not working on qemu power8, disable for now

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '7d07ee5a9bd170a06d26fd967cf8de5d3b1ce331'
Michael Niedermayer [Sun, 31 May 2015 20:47:29 +0000 (22:47 +0200)]
Merge commit '7d07ee5a9bd170a06d26fd967cf8de5d3b1ce331'

* commit '7d07ee5a9bd170a06d26fd967cf8de5d3b1ce331':
  ppc: cpu: Add support for VSX and POWER8 extensions

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'da60b99a8857d5ca236f32c1799a066e0135a866'
Michael Niedermayer [Sun, 31 May 2015 20:44:07 +0000 (22:44 +0200)]
Merge commit 'da60b99a8857d5ca236f32c1799a066e0135a866'

* commit 'da60b99a8857d5ca236f32c1799a066e0135a866':
  ppc: Restrict some Altivec implementations to Big Endian

Conflicts:
libavcodec/ppc/huffyuvdsp_altivec.c
libavcodec/ppc/me_cmp.c

Not merged, our PPC64LE fate clients passed all tests last time they did run

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'f22ebd2555d15b59e109a5b630dd71374b076d0b'
Michael Niedermayer [Sun, 31 May 2015 20:22:16 +0000 (22:22 +0200)]
Merge commit 'f22ebd2555d15b59e109a5b630dd71374b076d0b'

* commit 'f22ebd2555d15b59e109a5b630dd71374b076d0b':
  ppc: configure: Support ISA 2.06 and later

Conflicts:
configure

See: ab12373956e92b865bced9b05b12971f062cfd3e and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '3058872c293e239e3b51e86fe18cfbe720aadff1'
Michael Niedermayer [Sun, 31 May 2015 20:14:39 +0000 (22:14 +0200)]
Merge commit '3058872c293e239e3b51e86fe18cfbe720aadff1'

* commit '3058872c293e239e3b51e86fe18cfbe720aadff1':
  ppc: Clarify and extend the cpuid check

Conflicts:
libavutil/ppc/cpu.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavutil/ppc/cpu: Check if unistd.h is available before including it
Michael Niedermayer [Sun, 31 May 2015 20:09:37 +0000 (22:09 +0200)]
avutil/ppc/cpu: Check if unistd.h is available before including it

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'baa94563fede8959a638b0fa132dd2124acd93e8'
Michael Niedermayer [Sun, 31 May 2015 19:57:07 +0000 (21:57 +0200)]
Merge commit 'baa94563fede8959a638b0fa132dd2124acd93e8'

* commit 'baa94563fede8959a638b0fa132dd2124acd93e8':
  ppc: linux: Check altivec using the auxv

Conflicts:
libavutil/ppc/cpu.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '7014b65995b1fe6188fb53447bf61b08e3963355'
Michael Niedermayer [Sun, 31 May 2015 19:48:06 +0000 (21:48 +0200)]
Merge commit '7014b65995b1fe6188fb53447bf61b08e3963355'

* commit '7014b65995b1fe6188fb53447bf61b08e3963355':
  ppc: pixblockdsp: Use the abriged vector types

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '72cebae0d981dde144340cf51f3c323f01e215e5'
Michael Niedermayer [Sun, 31 May 2015 19:38:58 +0000 (21:38 +0200)]
Merge commit '72cebae0d981dde144340cf51f3c323f01e215e5'

* commit '72cebae0d981dde144340cf51f3c323f01e215e5':
  ppc: avutil: Use the abriged vector types

Conflicts:
libavutil/ppc/float_dsp_altivec.c
libavutil/ppc/util_altivec.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '254eb5b6faebb7bcfc3cefc1edced6652fe9d5be'
Michael Niedermayer [Sun, 31 May 2015 19:17:53 +0000 (21:17 +0200)]
Merge commit '254eb5b6faebb7bcfc3cefc1edced6652fe9d5be'

* commit '254eb5b6faebb7bcfc3cefc1edced6652fe9d5be':
  ppc: avutil: Drop a potentially dangerous workaround

See: 9564375deeaf22f8e8eaa4fcbc33115d104f7138
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/libquvi: fix error handling
Gilles Chanteperdrix [Wed, 8 Apr 2015 17:16:36 +0000 (19:16 +0200)]
avformat/libquvi: fix error handling

avoid calling cleanup functions on uninitialized variables

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/vf_mpdecimate: add comment about 8x8 SAD
Peter Cordes [Wed, 4 Mar 2015 07:35:36 +0000 (03:35 -0400)]
avfilter/vf_mpdecimate: add comment about 8x8 SAD

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/vf_mpdecimate: support more pixel formats, including GBRP
Peter Cordes [Wed, 4 Mar 2015 07:35:36 +0000 (03:35 -0400)]
avfilter/vf_mpdecimate: support more pixel formats, including GBRP

Add some planar formats we can handle without distorting the meaning of
hi and lo.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/vf_mpdecimate: debug logging of threshold stats
Peter Cordes [Tue, 3 Mar 2015 02:57:30 +0000 (22:57 -0400)]
avfilter/vf_mpdecimate: debug logging of threshold stats

It's often really helpful to know why a frame wasn't decimated (lo or
hi), and how much you exceeded the threshold by, if you're trying to
tweak the thresholds to get what you want.

mpdecimate already prints a line per input frame with -v debug, this
just makes it longer.

Signed-off-by: Peter Cordes <peter@cordes.ca>
4 years agomov: Fix two memleaks
Andreas Cadhalpun [Tue, 26 May 2015 13:24:36 +0000 (14:24 +0100)]
mov: Fix two memleaks

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
CC: libav-stable@libav.org
4 years agoavfilter/vf_mpdecimate: pass the same AVClass context as use elsewhere to av_pixeluti...
Peter Cordes [Tue, 3 Mar 2015 02:57:08 +0000 (22:57 -0400)]
avfilter/vf_mpdecimate: pass the same AVClass context as use elsewhere to av_pixelutils_get_sad_fn()

Signed-off-by: Peter Cordes <peter@cordes.ca>
4 years agovp9: Parse subsampling and report missing feature
Vittorio Giovara [Wed, 27 May 2015 14:06:57 +0000 (15:06 +0100)]
vp9: Parse subsampling and report missing feature

4 years agotests: add some ASS/SSA/MKS remux and transcode tests
Clément Bœsch [Mon, 25 May 2015 12:00:01 +0000 (14:00 +0200)]
tests: add some ASS/SSA/MKS remux and transcode tests

4 years agox86: check for AV_CPU_FLAG_AVXSLOW where useful
James Almer [Tue, 26 May 2015 17:29:08 +0000 (14:29 -0300)]
x86: check for AV_CPU_FLAG_AVXSLOW where useful

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
4 years agox86: Add helper macros to check for slow cpuflags
James Almer [Tue, 26 May 2015 17:29:07 +0000 (14:29 -0300)]
x86: Add helper macros to check for slow cpuflags

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
4 years agox86: add AV_CPU_FLAG_AVXSLOW flag
James Almer [Tue, 26 May 2015 17:29:06 +0000 (14:29 -0300)]
x86: add AV_CPU_FLAG_AVXSLOW flag

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
4 years agoppc: vsx: Implement diff_pixels and get_pixels
Luca Barbato [Tue, 12 May 2015 00:38:56 +0000 (02:38 +0200)]
ppc: vsx: Implement diff_pixels and get_pixels

Use a macro to abstract the endianness.

4 years agoppc: vsx: Implement float_dsp
Luca Barbato [Mon, 11 May 2015 00:44:10 +0000 (02:44 +0200)]
ppc: vsx: Implement float_dsp

4 years agoppc: cpu: Add support for VSX and POWER8 extensions
Luca Barbato [Sun, 10 May 2015 02:15:59 +0000 (04:15 +0200)]
ppc: cpu: Add support for VSX and POWER8 extensions

4 years agoppc: Restrict some Altivec implementations to Big Endian
Luca Barbato [Sun, 10 May 2015 21:22:17 +0000 (23:22 +0200)]
ppc: Restrict some Altivec implementations to Big Endian

In Little Endian the vec_ld/vec_st operations work as
expected only for byte-vectors.

4 years agoppc: configure: Support ISA 2.06 and later
Luca Barbato [Sun, 10 May 2015 00:47:31 +0000 (02:47 +0200)]
ppc: configure: Support ISA 2.06 and later

POWER 7 and POWER 8 support VSX and ldbrx.

POWER 8 supports additional extended VSX instructions introduced
with ISA 2.07.

4 years agoppc: Clarify and extend the cpuid check
Luca Barbato [Sat, 9 May 2015 22:49:51 +0000 (00:49 +0200)]
ppc: Clarify and extend the cpuid check

Add POWER entries.

4 years agoppc: linux: Check altivec using the auxv
Luca Barbato [Fri, 3 Apr 2015 13:31:32 +0000 (15:31 +0200)]
ppc: linux: Check altivec using the auxv

Should prevent trying to use altivec when it is disabled by the kernel.

4 years agoppc: pixblockdsp: Use the abriged vector types
Luca Barbato [Mon, 11 May 2015 22:45:37 +0000 (00:45 +0200)]
ppc: pixblockdsp: Use the abriged vector types

4 years agoppc: avutil: Use the abriged vector types
Luca Barbato [Sun, 10 May 2015 02:37:50 +0000 (04:37 +0200)]
ppc: avutil: Use the abriged vector types

4 years agoppc: avutil: Drop a potentially dangerous workaround
Luca Barbato [Sun, 10 May 2015 20:48:30 +0000 (22:48 +0200)]
ppc: avutil: Drop a potentially dangerous workaround

The compiler is free to optimize such expressions in any sort of way.

4 years agoconfigure: Check for SecItemImport for securetransport as well
Rodger Combs [Sun, 31 May 2015 03:05:32 +0000 (22:05 -0500)]
configure: Check for SecItemImport for securetransport as well

This fixes the default build on iOS; eventually I should come up with
a better solution for that platform.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '881b80b3294483696a21b21a69fa5eee30f33037'
Michael Niedermayer [Sun, 31 May 2015 09:52:12 +0000 (11:52 +0200)]
Merge commit '881b80b3294483696a21b21a69fa5eee30f33037'

* commit '881b80b3294483696a21b21a69fa5eee30f33037':
  network: prevent SIGPIPE on OSX

See: c41e0aedf5fc2a92502bc400010e64b8fea89d4e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agonetwork: prevent SIGPIPE on OSX
wm4 [Thu, 28 May 2015 16:23:27 +0000 (18:23 +0200)]
network: prevent SIGPIPE on OSX

OSX does not know MSG_NOSIGNAL. BSD (which OSX is based on) has got
the socket option SO_NOSIGPIPE (even if modern BSDs also support
MSG_NOSIGNAL).

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agoavfilter/vf_fade: Force alpha pixel format if alpha is set to 1
Michael Niedermayer [Wed, 27 May 2015 23:38:15 +0000 (01:38 +0200)]
avfilter/vf_fade: Force alpha pixel format if alpha is set to 1

Fixes Ticket4321

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/parser: Print an error in case of reallocation fails in ff_combine_frame()
Michael Niedermayer [Sun, 31 May 2015 00:59:06 +0000 (02:59 +0200)]
avcodec/parser: Print an error in case of reallocation fails in ff_combine_frame()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agopostproc: Avoid floats in maxClipped computation
Michael Niedermayer [Sat, 30 May 2015 23:40:12 +0000 (01:40 +0200)]
postproc: Avoid floats in maxClipped computation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agopostproc/postprocess_template: Compute packedYScale and QPCorrecture without floats
Michael Niedermayer [Sat, 30 May 2015 22:50:45 +0000 (00:50 +0200)]
postproc/postprocess_template: Compute packedYScale and QPCorrecture without floats

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agonetwork: prevent SIGPIPE on OSX
wm4 [Sat, 30 May 2015 18:50:43 +0000 (20:50 +0200)]
network: prevent SIGPIPE on OSX

OSX does not know MSG_NOSIGNAL, and provides its own non-standard
mechanism instead. I guess Apple hates standards.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '0181ae9af2de1526464d23209b82e6674d362f5d'
Michael Niedermayer [Sat, 30 May 2015 19:33:00 +0000 (21:33 +0200)]
Merge commit '0181ae9af2de1526464d23209b82e6674d362f5d'

* commit '0181ae9af2de1526464d23209b82e6674d362f5d':
  h264: Make sure reinit failures mark the context as not initialized

Conflicts:
libavcodec/h264_slice.c

See: e8714f6f93d1a32f4e4655209960afcf4c185214
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '5ecabd3c54b7c802522dc338838c9a4c2dc42948'
Michael Niedermayer [Sat, 30 May 2015 19:03:16 +0000 (21:03 +0200)]
Merge commit '5ecabd3c54b7c802522dc338838c9a4c2dc42948'

* commit '5ecabd3c54b7c802522dc338838c9a4c2dc42948':
  msrle: Use FFABS to determine the frame size in msrle_decode_pal4

Conflicts:
libavcodec/msrledec.c

See: f7e1367f58263593e6cee3c282f7277d7ee9d553
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolibopenjpegdec: check existence of image component data
Andreas Cadhalpun [Sat, 30 May 2015 14:18:48 +0000 (16:18 +0200)]
libopenjpegdec: check existence of image component data

libopenjpeg can return images with components without data.

This fixes segmentation faults.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
4 years agodoc/ffmpeg: Document xerror
Michael Niedermayer [Sat, 30 May 2015 16:32:00 +0000 (18:32 +0200)]
doc/ffmpeg: Document xerror

Previous version reviewed-by: Lou Logan <lou@lrcd.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/movenc: Add loction/xyz support to allow copying data between mov files
Michael Niedermayer [Sat, 30 May 2015 13:32:40 +0000 (15:32 +0200)]
avformat/movenc: Add loction/xyz support to allow copying data between mov files

Fixes Ticket4337

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoh264: Make sure reinit failures mark the context as not initialized
Luca Barbato [Mon, 25 May 2015 20:30:10 +0000 (22:30 +0200)]
h264: Make sure reinit failures mark the context as not initialized

Bug-Id: CVE-2015-3417
CC: libav-stable@libav.org
4 years agomsrle: Use FFABS to determine the frame size in msrle_decode_pal4
Luca Barbato [Mon, 25 May 2015 19:53:26 +0000 (21:53 +0200)]
msrle: Use FFABS to determine the frame size in msrle_decode_pal4

As done in msrle_decode_8_16_24_32.

Bug-Id: CVE-2015-3395
CC: libav-stable@libav.org
4 years agoavformat/mov: Also export loci altitude
Michael Niedermayer [Sat, 30 May 2015 13:28:31 +0000 (15:28 +0200)]
avformat/mov: Also export loci altitude

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/mov: Append place name instead of overwriting for loci
Michael Niedermayer [Sat, 30 May 2015 13:23:19 +0000 (15:23 +0200)]
avformat/mov: Append place name instead of overwriting for loci

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolavf/tls_securetransport: add missing copyright notice
Rodger Combs [Sat, 30 May 2015 07:12:49 +0000 (02:12 -0500)]
lavf/tls_securetransport: add missing copyright notice

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/dvbsubdec: Fix buf_size check in dvbsub_parse_display_definition_segment()
banastasov [Sat, 30 May 2015 02:28:39 +0000 (04:28 +0200)]
avcodec/dvbsubdec: Fix buf_size check in dvbsub_parse_display_definition_segment()

Fixes Ticket4326

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/h264dec: Add ff_tlog() with trace information about h264 probing
Michael Niedermayer [Sat, 30 May 2015 01:57:20 +0000 (03:57 +0200)]
avformat/h264dec: Add ff_tlog() with trace information about h264 probing

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/h264dec: Fix detection of invalid h264 with 0x100 startcodes
Michael Niedermayer [Sat, 30 May 2015 01:53:32 +0000 (03:53 +0200)]
avformat/h264dec: Fix detection of invalid h264 with 0x100 startcodes

Fies Ticket4325

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'b2f0f37d242f1194fe1f886557cf6cefdf98caf6'
Michael Niedermayer [Fri, 29 May 2015 22:59:54 +0000 (00:59 +0200)]
Merge commit 'b2f0f37d242f1194fe1f886557cf6cefdf98caf6'

* commit 'b2f0f37d242f1194fe1f886557cf6cefdf98caf6':
  rtmpdh: Generate the whole private exponent using av_get_random_seed() with nettle/gmp

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agortmpdh: Generate the whole private exponent using av_get_random_seed() with nettle/gmp
Martin Storsjö [Fri, 29 May 2015 07:14:39 +0000 (10:14 +0300)]
rtmpdh: Generate the whole private exponent using av_get_random_seed() with nettle/gmp

Don't use a PRNG for generating it; that defies the intended use
within the cryptograhic handshake.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agolavf/tls: Support Secure Transport
Rodger Combs [Thu, 28 May 2015 19:46:16 +0000 (14:46 -0500)]
lavf/tls: Support Secure Transport

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoconfigure: Fix showcqt fft dependancy
Michael Niedermayer [Fri, 29 May 2015 19:07:58 +0000 (21:07 +0200)]
configure: Fix showcqt fft dependancy

Found-by: Muhammad Faiz <mfcc64@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agobuild: add configure option pkgconfigdir
Ingo Brückl [Fri, 29 May 2015 14:08:36 +0000 (16:08 +0200)]
build: add configure option pkgconfigdir

This allows the user to override the directory for the installation
of the pkg-config files (from the default LIBDIR/pkgconfig).

It follows the usual behaviour of Makefiles generated by automake.

Signed-off-by: Ingo Brückl <ib@wupperonline.de>
Reviewed-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolibavutil: Cosmetic changes to fixed_dsp file.
Nedeljko Babic [Fri, 29 May 2015 13:46:20 +0000 (15:46 +0200)]
libavutil: Cosmetic changes to fixed_dsp file.

Names of functions vector_fmul_window_fixed_c and
vector_fmul_window_fixed_scaled_c are changed by removing "_fixed"
from the name since it is redundant.

Signed-off-by: Nedeljko Babic <nedeljko.babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agomov: fix DTS calculation for samples with negative stts duration
Andreas Cadhalpun [Wed, 27 May 2015 21:57:50 +0000 (23:57 +0200)]
mov: fix DTS calculation for samples with negative stts duration

A negative sample duration is invalid according to the spec, but there
are samples that use it for the DTS calculation, e.g.:
http://files.1f0.de/samples/mp4-negative-stts-problem.mp4

These currently get out of A/V sync.

Also change the logging type to AV_LOG_WARNING, because decoding the
sample can continue.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
4 years agoavcodec/mpegvideo: Use FFSWAP to exchange pointers
Michael Niedermayer [Fri, 29 May 2015 12:03:07 +0000 (14:03 +0200)]
avcodec/mpegvideo: Use FFSWAP to exchange pointers

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/ac3_parser: Avoid floats in bitrate computation
Michael Niedermayer [Fri, 29 May 2015 10:59:35 +0000 (12:59 +0200)]
avcodec/ac3_parser: Avoid floats in bitrate computation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/movenc: Check that track_width_1616 fits within the available 32bit before...
Michael Niedermayer [Fri, 29 May 2015 10:54:37 +0000 (12:54 +0200)]
avformat/movenc: Check that track_width_1616 fits within the available 32bit before storing it

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/movenc: avoid floats in width/height/aspect ratio computations
Michael Niedermayer [Fri, 29 May 2015 10:36:55 +0000 (12:36 +0200)]
avformat/movenc: avoid floats in width/height/aspect ratio computations

This avoids the possibility for rounding/precision differences between platforms

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/concatdec: Enable auto_convert by default
Michael Niedermayer [Tue, 26 May 2015 20:16:43 +0000 (22:16 +0200)]
avformat/concatdec: Enable auto_convert by default

Users have no means to find out from a failure how to make it work
or is it preferred to check and print a warning for h264 concat without auto_convert ?

Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/mov: Avoid float usage in yuv_to_rgba()
Michael Niedermayer [Fri, 29 May 2015 10:06:51 +0000 (12:06 +0200)]
avformat/mov: Avoid float usage in yuv_to_rgba()

This avoids the possibility for rounding/precision differences between platforms

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'e9e86d9ef637f5a600c76b352ffe5a82b71b25d1'
Michael Niedermayer [Fri, 29 May 2015 09:42:38 +0000 (11:42 +0200)]
Merge commit 'e9e86d9ef637f5a600c76b352ffe5a82b71b25d1'

* commit 'e9e86d9ef637f5a600c76b352ffe5a82b71b25d1':
  rtmpdh: Create sufficiently long private keys for gcrypt/nettle

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '8016a1bd3b60e917e1b12748dd80c06c3462c286'
Michael Niedermayer [Fri, 29 May 2015 09:42:17 +0000 (11:42 +0200)]
Merge commit '8016a1bd3b60e917e1b12748dd80c06c3462c286'

* commit '8016a1bd3b60e917e1b12748dd80c06c3462c286':
  rtmpdh: Remove an unnecessary check in the gcrypt/nettle dh_compute_key

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '063f7467e4d14ab7fe01b2845dab60cc75df8b53'
Michael Niedermayer [Fri, 29 May 2015 09:38:26 +0000 (11:38 +0200)]
Merge commit '063f7467e4d14ab7fe01b2845dab60cc75df8b53'

* commit '063f7467e4d14ab7fe01b2845dab60cc75df8b53':
  rtmpdh: Add fate test for the DH handshake routine

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '0508faaa11bf7507ffdd655aee57c9dc5a8203f4'
Michael Niedermayer [Fri, 29 May 2015 09:31:55 +0000 (11:31 +0200)]
Merge commit '0508faaa11bf7507ffdd655aee57c9dc5a8203f4'

* commit '0508faaa11bf7507ffdd655aee57c9dc5a8203f4':
  rtmpdh: Pass the actual buffer size of the output secret key

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '9f1b3050d9e31e9283d818f3640f3460ac8cfb5b'
Michael Niedermayer [Fri, 29 May 2015 09:31:38 +0000 (11:31 +0200)]
Merge commit '9f1b3050d9e31e9283d818f3640f3460ac8cfb5b'

* commit '9f1b3050d9e31e9283d818f3640f3460ac8cfb5b':
  rtmpdh: Check the output buffer size in the openssl version of dh_compute_key

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '127d813bcb5705202b7100cf1eccd1e26d72ba14'
Michael Niedermayer [Fri, 29 May 2015 09:31:22 +0000 (11:31 +0200)]
Merge commit '127d813bcb5705202b7100cf1eccd1e26d72ba14'

* commit '127d813bcb5705202b7100cf1eccd1e26d72ba14':
  rtmpdh: Fix a local variable name in the nettle/gcrypt codepath

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '78efc69e7c990226f4b913721ef1b308ca5bfa04'
Michael Niedermayer [Fri, 29 May 2015 09:21:26 +0000 (11:21 +0200)]
Merge commit '78efc69e7c990226f4b913721ef1b308ca5bfa04'

* commit '78efc69e7c990226f4b913721ef1b308ca5bfa04':
  rtmpdh: Make sure ret is initialized in the nettle version of bn_hex2bn

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agortmpdh: Create sufficiently long private keys for gcrypt/nettle
Martin Storsjö [Thu, 28 May 2015 08:42:44 +0000 (11:42 +0300)]
rtmpdh: Create sufficiently long private keys for gcrypt/nettle

There was a misunderstanding betewen bits and bytes for the parameter
value for generating random big numbers.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agortmpdh: Remove an unnecessary check in the gcrypt/nettle dh_compute_key
Martin Storsjö [Thu, 28 May 2015 08:39:45 +0000 (11:39 +0300)]
rtmpdh: Remove an unnecessary check in the gcrypt/nettle dh_compute_key

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agortmpdh: Add fate test for the DH handshake routine
Martin Storsjö [Thu, 28 May 2015 07:54:11 +0000 (10:54 +0300)]
rtmpdh: Add fate test for the DH handshake routine

This helps if these functions need to be implemented using another
crypto API.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agortmpdh: Pass the actual buffer size of the output secret key
Martin Storsjö [Thu, 28 May 2015 07:11:27 +0000 (10:11 +0300)]
rtmpdh: Pass the actual buffer size of the output secret key

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agortmpdh: Check the output buffer size in the openssl version of dh_compute_key
Martin Storsjö [Thu, 28 May 2015 07:08:27 +0000 (10:08 +0300)]
rtmpdh: Check the output buffer size in the openssl version of dh_compute_key

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agortmpdh: Fix a local variable name in the nettle/gcrypt codepath
Martin Storsjö [Thu, 28 May 2015 07:03:39 +0000 (10:03 +0300)]
rtmpdh: Fix a local variable name in the nettle/gcrypt codepath

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agortmpdh: Make sure ret is initialized in the nettle version of bn_hex2bn
Martin Storsjö [Thu, 28 May 2015 06:47:44 +0000 (09:47 +0300)]
rtmpdh: Make sure ret is initialized in the nettle version of bn_hex2bn

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agodxva2_hevc: re-write reference frame handling
Hendrik Leppkes [Thu, 28 May 2015 16:20:25 +0000 (18:20 +0200)]
dxva2_hevc: re-write reference frame handling

The old logic required and explicit clearing of the lists first and was
prone to overflow the DXVA2 struct in some circumstances.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agodxva2_hevc: fix 32x32 scaling lists
Hendrik Leppkes [Thu, 28 May 2015 16:20:24 +0000 (18:20 +0200)]
dxva2_hevc: fix 32x32 scaling lists

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/mpegvideo: Reset bitstream_buffer_size on allocation failure
Michael Niedermayer [Thu, 28 May 2015 22:33:18 +0000 (00:33 +0200)]
avcodec/mpegvideo: Reset bitstream_buffer_size on allocation failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/mpegvideo: Check pointer when allocation fail
Roman Savchenko [Thu, 28 May 2015 15:25:57 +0000 (18:25 +0300)]
avcodec/mpegvideo: Check pointer when allocation fail

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/avienc: Correct possible dereference of null
Roman Savchenko [Thu, 28 May 2015 15:25:56 +0000 (18:25 +0300)]
avformat/avienc: Correct possible dereference of null

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'a64a5773ea5f7337cd1d87cfdf511914d317fe81'
Michael Niedermayer [Thu, 28 May 2015 20:24:12 +0000 (22:24 +0200)]
Merge commit 'a64a5773ea5f7337cd1d87cfdf511914d317fe81'

* commit 'a64a5773ea5f7337cd1d87cfdf511914d317fe81':
  pixfmt: remove misleading and broken documentation

Conflicts:
libavutil/pixfmt.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'e4610300de6869bd6b3b00e76cfeabb6d7653dcd'
Michael Niedermayer [Thu, 28 May 2015 20:11:42 +0000 (22:11 +0200)]
Merge commit 'e4610300de6869bd6b3b00e76cfeabb6d7653dcd'

* commit 'e4610300de6869bd6b3b00e76cfeabb6d7653dcd':
  x86: cavs: Remove an unneeded scratch buffer

Conflicts:
libavcodec/x86/cavsdsp.c

See: d79f7bf0d63a81ee66026ee92a6946a7303d04bd
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '1b1bb2c4efc126d74d44d8c421860c85f932ecb1'
Michael Niedermayer [Thu, 28 May 2015 20:02:41 +0000 (22:02 +0200)]
Merge commit '1b1bb2c4efc126d74d44d8c421860c85f932ecb1'

* commit '1b1bb2c4efc126d74d44d8c421860c85f932ecb1':
  rl: Add error checking to ff_rl_init().

Conflicts:
libavcodec/rl.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '324e50ee95929a9491b855c5e15451145bd5d1ec'
Michael Niedermayer [Thu, 28 May 2015 19:55:17 +0000 (21:55 +0200)]
Merge commit '324e50ee95929a9491b855c5e15451145bd5d1ec'

* commit '324e50ee95929a9491b855c5e15451145bd5d1ec':
  rl: Add a function for freeing dynamically allocated tables.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '6f57375d707de40dcec28d3cef886c364e032c21'
Michael Niedermayer [Thu, 28 May 2015 19:48:49 +0000 (21:48 +0200)]
Merge commit '6f57375d707de40dcec28d3cef886c364e032c21'

* commit '6f57375d707de40dcec28d3cef886c364e032c21':
  rl: Rename ff_*_rl() to ff_rl_*()

Conflicts:
libavcodec/mpeg4videodec.c
libavcodec/rl.c
libavcodec/rl.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'fa1923f18205410a3b0aa6c0e77cb31443ef340d'
Michael Niedermayer [Thu, 28 May 2015 19:36:31 +0000 (21:36 +0200)]
Merge commit 'fa1923f18205410a3b0aa6c0e77cb31443ef340d'

* commit 'fa1923f18205410a3b0aa6c0e77cb31443ef340d':
  mpegvideo: Move ff_*_rl functions to a separate file

Conflicts:
libavcodec/mpegvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '419e3404d07acaac019e8f363c281e17c3a3d622'
Michael Niedermayer [Thu, 28 May 2015 19:28:04 +0000 (21:28 +0200)]
Merge commit '419e3404d07acaac019e8f363c281e17c3a3d622'

* commit '419e3404d07acaac019e8f363c281e17c3a3d622':
  mpegvideo: Drop exchange_uv() function and use its code directly

Merged-by: Michael Niedermayer <michaelni@gmx.at>