ffmpeg.git
4 years agoMerge commit '02d76141d68e38c80f9a205a56b9af10d74f0995'
Michael Niedermayer [Tue, 17 Mar 2015 19:48:39 +0000 (20:48 +0100)]
Merge commit '02d76141d68e38c80f9a205a56b9af10d74f0995'

* commit '02d76141d68e38c80f9a205a56b9af10d74f0995':
  riff: Add 'tshd' FourCC for H.264

Conflicts:
libavformat/riff.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'c0f504e947cc0a3c73770419bf7d1af98288fc59'
Michael Niedermayer [Tue, 17 Mar 2015 19:39:34 +0000 (20:39 +0100)]
Merge commit 'c0f504e947cc0a3c73770419bf7d1af98288fc59'

* commit 'c0f504e947cc0a3c73770419bf7d1af98288fc59':
  libx264: Allow full-range yuv422 and yuv444 pixel formats

See: 79209f5d6ca31c73260f1c5f5dbaa8395102d9f1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'c9ed48e80ef807ab0c1bb946ac8db5f34d83d9c9'
Michael Niedermayer [Tue, 17 Mar 2015 19:32:46 +0000 (20:32 +0100)]
Merge commit 'c9ed48e80ef807ab0c1bb946ac8db5f34d83d9c9'

* commit 'c9ed48e80ef807ab0c1bb946ac8db5f34d83d9c9':
  dca: Read params->pancABIT0[param_index] only if part0 is set

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '48aef27f5232794e70ecef0d347b9f65e27a9bad'
Michael Niedermayer [Tue, 17 Mar 2015 19:14:48 +0000 (20:14 +0100)]
Merge commit '48aef27f5232794e70ecef0d347b9f65e27a9bad'

* commit '48aef27f5232794e70ecef0d347b9f65e27a9bad':
  x86: Put COPY3_IF_LT under HAVE_6REGS

Conflicts:
libavcodec/x86/mathops.h

See: b38910c9790253b362839042a17e13252c1d4b90
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/vf_colormatrix: make sure the number of threads is even for yuv420p
Clément Bœsch [Tue, 17 Mar 2015 19:09:49 +0000 (20:09 +0100)]
avfilter/vf_colormatrix: make sure the number of threads is even for yuv420p

Fix crash with for example:
  ffmpeg -f lavfi -i testsrc=568x320 -threads 3 -vf format=yuv420p,colormatrix=bt709:smpte170m -f null -

4 years agoMerge commit '96dd04427fc46e5e25a5ac1f00753207e3aedb0c'
Michael Niedermayer [Tue, 17 Mar 2015 19:05:33 +0000 (20:05 +0100)]
Merge commit '96dd04427fc46e5e25a5ac1f00753207e3aedb0c'

* commit '96dd04427fc46e5e25a5ac1f00753207e3aedb0c':
  isom: Add support for TSCC2

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '91894f27dce531c13d7e1be20253877f2e1e9e66'
Michael Niedermayer [Tue, 17 Mar 2015 18:52:14 +0000 (19:52 +0100)]
Merge commit '91894f27dce531c13d7e1be20253877f2e1e9e66'

* commit '91894f27dce531c13d7e1be20253877f2e1e9e66':
  configure: Disable shift operator precedence warnings with MSVC

Conflicts:
configure

See: 9e208ce6dd94596b4185a93af4aab3dcd28eb5b7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/mov: fix mis-detection of jpeg2000
Michael Niedermayer [Tue, 17 Mar 2015 17:56:24 +0000 (18:56 +0100)]
avformat/mov: fix mis-detection of jpeg2000

Fixes demuxer choice for Ticket 2792

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/vf_histeq: Change enums to int, which are accessed via AVOption as int
Michael Niedermayer [Tue, 17 Mar 2015 16:13:38 +0000 (17:13 +0100)]
avfilter/vf_histeq: Change enums to int, which are accessed via AVOption as int

This fixes depending on implementation defined behavior

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/vf_fieldmatch: Change enums to int, which are accessed via AVOption as int
Michael Niedermayer [Tue, 17 Mar 2015 16:11:42 +0000 (17:11 +0100)]
avfilter/vf_fieldmatch: Change enums to int, which are accessed via AVOption as int

This fixes depending on implementation defined behavior

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/vf_field: Change enum to int, which is accessed via AVOption as int
Michael Niedermayer [Tue, 17 Mar 2015 15:52:10 +0000 (16:52 +0100)]
avfilter/vf_field: Change enum to int, which is accessed via AVOption as int

This fixes depending on implementation defined behavior

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agomxfenc: fix memleaks in mxf_write_footer
Andreas Cadhalpun [Sat, 14 Mar 2015 16:47:53 +0000 (17:47 +0100)]
mxfenc: fix memleaks in mxf_write_footer

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Reviewed-by: tomas.hardin@codemill.se
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agodoc/protocols: Fixed missing example section marker
Tobias Rapp [Wed, 11 Mar 2015 10:22:04 +0000 (11:22 +0100)]
doc/protocols: Fixed missing example section marker

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoriff: Add 'tshd' FourCC for H.264
Vittorio Giovara [Mon, 16 Mar 2015 10:34:12 +0000 (10:34 +0000)]
riff: Add 'tshd' FourCC for H.264

4 years agolibx264: Allow full-range yuv422 and yuv444 pixel formats
Carl Eugen Hoyos [Tue, 17 Mar 2015 13:29:05 +0000 (13:29 +0000)]
libx264: Allow full-range yuv422 and yuv444 pixel formats

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
4 years agodca: Read params->pancABIT0[param_index] only if part0 is set
Niels Möller [Mon, 16 Mar 2015 21:31:41 +0000 (22:31 +0100)]
dca: Read params->pancABIT0[param_index] only if part0 is set

Prevent a spurious read from uninitialized memory.

4 years agox86: Put COPY3_IF_LT under HAVE_6REGS
Luca Barbato [Mon, 16 Mar 2015 10:26:48 +0000 (11:26 +0100)]
x86: Put COPY3_IF_LT under HAVE_6REGS

It uses 6 registers, unbreaks building on hardened x86 system.

Bug-Id: gentoo/541930
CC: libav-stable@libav.org
4 years agoisom: Add support for TSCC2
Luca Barbato [Mon, 16 Mar 2015 13:18:45 +0000 (14:18 +0100)]
isom: Add support for TSCC2

As produced by Camtasia 4.

4 years agoconfigure: Disable shift operator precedence warnings with MSVC
Diego Biurrun [Sun, 15 Mar 2015 14:55:03 +0000 (15:55 +0100)]
configure: Disable shift operator precedence warnings with MSVC

4 years agoavcodec/vc1_pred: Fix undefined shifts
Michael Niedermayer [Tue, 17 Mar 2015 00:51:59 +0000 (01:51 +0100)]
avcodec/vc1_pred: Fix undefined shifts

Found-by: Clang -fsanitize=shift
Reported-by: Thierry Foucu <tfoucu@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/libx264: use AVERROR_EXTERNAL instead of AVERROR_UNKNOWN
Clément Bœsch [Mon, 16 Mar 2015 23:05:58 +0000 (00:05 +0100)]
avcodec/libx264: use AVERROR_EXTERNAL instead of AVERROR_UNKNOWN

4 years agoavfilter: handle error in query_formats() of a bunch of random video filters
Clément Bœsch [Sun, 15 Mar 2015 13:20:34 +0000 (14:20 +0100)]
avfilter: handle error in query_formats() of a bunch of random video filters

4 years agoavfilter/formats: proper error handling in ff_set_common_*() functions
Clément Bœsch [Sun, 15 Mar 2015 12:24:22 +0000 (13:24 +0100)]
avfilter/formats: proper error handling in ff_set_common_*() functions

4 years agoavfilter/formats: proper error handling in ff_channel_layouts_ref() and ff_formats_ref()
Clément Bœsch [Sat, 14 Mar 2015 20:21:49 +0000 (21:21 +0100)]
avfilter/formats: proper error handling in ff_channel_layouts_ref() and ff_formats_ref()

Also make sure the allocation and its check are properly done.

4 years agoavfilter/formats: use av_realloc_array in ADD_FORMAT()
Clément Bœsch [Sat, 14 Mar 2015 20:17:27 +0000 (21:17 +0100)]
avfilter/formats: use av_realloc_array in ADD_FORMAT()

4 years agoavfilter/formats: remove unused COPY_INT_LIST() macro
Clément Bœsch [Sat, 14 Mar 2015 20:14:46 +0000 (21:14 +0100)]
avfilter/formats: remove unused COPY_INT_LIST() macro

This macro is unused since 247fa6c27c4589d0f7a427c520d782edbb6de060.

4 years agoMerge commit '2cb9c2fc59c9267ad2631c07c81c188058502259'
Michael Niedermayer [Mon, 16 Mar 2015 22:30:13 +0000 (23:30 +0100)]
Merge commit '2cb9c2fc59c9267ad2631c07c81c188058502259'

* commit '2cb9c2fc59c9267ad2631c07c81c188058502259':
  movenc: Allow interleaving samples when writing fragmented files

Conflicts:
libavformat/movenc.c
libavformat/movenc.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoOpenCL uninit bug fix - clear is_compiled flag
srikanth [Mon, 9 Mar 2015 22:34:49 +0000 (17:34 -0500)]
OpenCL uninit bug fix - clear is_compiled flag

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/rtsp: Fix potential pointer overflow in sdp_probe()
Michael Niedermayer [Mon, 16 Mar 2015 21:40:36 +0000 (22:40 +0100)]
avformat/rtsp: Fix potential pointer overflow in sdp_probe()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/mpegts: Fix potential pointer overflows
Michael Niedermayer [Mon, 16 Mar 2015 21:37:46 +0000 (22:37 +0100)]
avformat/mpegts: Fix potential pointer overflows

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoconfigure: Silence EMMS warnings in ICC
Michael Niedermayer [Mon, 16 Mar 2015 14:38:36 +0000 (15:38 +0100)]
configure: Silence EMMS warnings in ICC

Real world MMX code does not put EMMS at the start and end of every function,
it would be incredibly inefficient to do that
thus do not warn about that

Tested-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '50ff0c05b691524d1fd044a2f2eefb706932fc98'
Michael Niedermayer [Mon, 16 Mar 2015 20:52:54 +0000 (21:52 +0100)]
Merge commit '50ff0c05b691524d1fd044a2f2eefb706932fc98'

* commit '50ff0c05b691524d1fd044a2f2eefb706932fc98':
  movenc: Support writing multiple trun atoms

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'faab8f9fcb4ffeb967dc6872c0f1e9da719106ce'
Michael Niedermayer [Mon, 16 Mar 2015 20:46:02 +0000 (21:46 +0100)]
Merge commit 'faab8f9fcb4ffeb967dc6872c0f1e9da719106ce'

* commit 'faab8f9fcb4ffeb967dc6872c0f1e9da719106ce':
  configure: move cross_compile checks after the toolchain section

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '3e1b5cbc9ab0a61c9bec08a1df1404b9da6ed7ea'
Michael Niedermayer [Mon, 16 Mar 2015 20:34:03 +0000 (21:34 +0100)]
Merge commit '3e1b5cbc9ab0a61c9bec08a1df1404b9da6ed7ea'

* commit '3e1b5cbc9ab0a61c9bec08a1df1404b9da6ed7ea':
  configure: handle Apple's armv7s in probe_arm_arch()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'f01c77157789b8e3a59ed2c9646faf8299e41641'
Michael Niedermayer [Mon, 16 Mar 2015 20:26:58 +0000 (21:26 +0100)]
Merge commit 'f01c77157789b8e3a59ed2c9646faf8299e41641'

* commit 'f01c77157789b8e3a59ed2c9646faf8299e41641':
  fate: add explicit support for the toolchain configure option

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'a9d60c390f35f3954821bd635fd31bbb5036b29d'
Michael Niedermayer [Mon, 16 Mar 2015 20:19:29 +0000 (21:19 +0100)]
Merge commit 'a9d60c390f35f3954821bd635fd31bbb5036b29d'

* commit 'a9d60c390f35f3954821bd635fd31bbb5036b29d':
  doc: fate: remove outdated SSH key fingerprint

Conflicts:
doc/fate.texi

Not merged, this does not apply to our servers

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agohevc: avoid unnecessary calls to get_format
Rainer Hochecker [Thu, 12 Mar 2015 13:08:24 +0000 (14:08 +0100)]
hevc: avoid unnecessary calls to get_format

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/cavsvideodec: use avpriv_find_start_code in cavsvideo_probe()
zhaoxiu.zeng [Sun, 15 Mar 2015 08:56:04 +0000 (16:56 +0800)]
avformat/cavsvideodec: use avpriv_find_start_code in cavsvideo_probe()

Signed-off-by: Zeng Zhaoxiu <zhaoxiu.zeng@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/x86/cavsdsp: remove incorrect LOCAL_ALIGN tmp
Michael Niedermayer [Mon, 16 Mar 2015 13:28:11 +0000 (14:28 +0100)]
avcodec/x86/cavsdsp: remove incorrect LOCAL_ALIGN tmp

This is faster and simpler as well

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/hevc: Fix undefined shifts
Michael Niedermayer [Mon, 16 Mar 2015 13:27:11 +0000 (14:27 +0100)]
avcodec/hevc: Fix undefined shifts

Found-by: Clang -fsanitize=shift
Reported-by: Thierry Foucu <tfoucu@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/tdsc: Remove ;;
Michael Niedermayer [Mon, 16 Mar 2015 12:04:47 +0000 (13:04 +0100)]
avcodec/tdsc: Remove ;;

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/hls: refactor repeated HLS option updates
Micah Galizia [Mon, 16 Mar 2015 09:26:29 +0000 (20:26 +1100)]
avformat/hls: refactor repeated HLS option updates

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agomovenc: Allow interleaving samples when writing fragmented files
Martin Storsjö [Tue, 10 Sep 2013 12:35:41 +0000 (15:35 +0300)]
movenc: Allow interleaving samples when writing fragmented files

This is incompatible with the omit_tfhd_offset flag (writing
position independent fragments with interleaving requires the
default_base_moof flag).

This makes the moof atoms slightly bigger, but can be better for
playback (improving locality of sample data in the mdat).

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agomovenc: Support writing multiple trun atoms
Martin Storsjö [Tue, 10 Sep 2013 12:24:24 +0000 (15:24 +0300)]
movenc: Support writing multiple trun atoms

This is needed if all the data for one track isn't continuous
within the mdat. Normally we make sure all the data for one
track is continuous, but in new cases we will need to have
the samples interleaved.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agoconfigure: move cross_compile checks after the toolchain section
Janne Grunau [Thu, 26 Feb 2015 20:54:55 +0000 (21:54 +0100)]
configure: move cross_compile checks after the toolchain section

4 years agoconfigure: handle Apple's armv7s in probe_arm_arch()
Janne Grunau [Wed, 25 Feb 2015 17:16:52 +0000 (18:16 +0100)]
configure: handle Apple's armv7s in probe_arm_arch()

4 years agofate: add explicit support for the toolchain configure option
Janne Grunau [Thu, 26 Feb 2015 21:04:12 +0000 (22:04 +0100)]
fate: add explicit support for the toolchain configure option

4 years agodoc: fate: remove outdated SSH key fingerprint
Janne Grunau [Mon, 9 Mar 2015 22:19:55 +0000 (23:19 +0100)]
doc: fate: remove outdated SSH key fingerprint

4 years agoMerge commit '66a0ac0a802dd794acc1ab8559d3db9e98755b57'
Michael Niedermayer [Mon, 16 Mar 2015 10:36:43 +0000 (11:36 +0100)]
Merge commit '66a0ac0a802dd794acc1ab8559d3db9e98755b57'

* commit '66a0ac0a802dd794acc1ab8559d3db9e98755b57':
  mkv: Add support for DVB subtitles

See: 4789c25d83c4a90e8ef81d2cc05be6d2f12dfa68
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolavfi/sendcmd: improve error reporting and robustness in case of missing commands
Stefano Sabatini [Mon, 16 Mar 2015 09:41:19 +0000 (10:41 +0100)]
lavfi/sendcmd: improve error reporting and robustness in case of missing commands

In particular, fix crash with -vf sendcmd, when no arguments are provided.

4 years agox86/proresdsp: remove ff_prores_idct_put_10_sse4
James Almer [Sun, 15 Mar 2015 18:03:54 +0000 (15:03 -0300)]
x86/proresdsp: remove ff_prores_idct_put_10_sse4

It's exactly the same as the sse2 version.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
4 years agox86/proresdsp: remove unused macro
James Almer [Sun, 15 Mar 2015 17:56:13 +0000 (14:56 -0300)]
x86/proresdsp: remove unused macro

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
4 years agoavformat/mov: Disallow ".." in dref unless use_absolute_path is set
Michael Niedermayer [Sat, 14 Mar 2015 20:32:35 +0000 (21:32 +0100)]
avformat/mov: Disallow ".." in dref unless use_absolute_path is set

as this kind of allows to circumvent it to some extend.
We also could add a separate parameter or value to choose this

Found-by: ramiro
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolibavformat/mxfdec: fix MXFPackage->comment_refs memory leak
Mark Reid [Sun, 15 Mar 2015 21:43:32 +0000 (14:43 -0700)]
libavformat/mxfdec: fix MXFPackage->comment_refs memory leak

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/hls: store cookies returned in HLS key response
Micah Galizia [Sat, 14 Mar 2015 22:31:59 +0000 (09:31 +1100)]
avformat/hls: store cookies returned in HLS key response

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/dcadec: if XLL is enabled use xll channels
Michael Niedermayer [Mon, 16 Mar 2015 00:19:18 +0000 (01:19 +0100)]
avcodec/dcadec: if XLL is enabled use xll channels

Fixes outputting 14 channels instead of 7

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/dcadec: Only upsample as much data as is there
Michael Niedermayer [Sun, 15 Mar 2015 23:44:54 +0000 (00:44 +0100)]
avcodec/dcadec: Only upsample as much data as is there

Found-by: carl
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '9a60b1fad02cb783b895b2145c3dafc01f7b337c'
Michael Niedermayer [Sun, 15 Mar 2015 23:14:30 +0000 (00:14 +0100)]
Merge commit '9a60b1fad02cb783b895b2145c3dafc01f7b337c'

* commit '9a60b1fad02cb783b895b2145c3dafc01f7b337c':
  libswscale: fix compiler warnings enumerated type mixed with another type

Conflicts:
libswscale/swscale_unscaled.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '66028b7ba6b411ba12ef553e9c8f1f4a4fe27710'
Michael Niedermayer [Sun, 15 Mar 2015 22:25:33 +0000 (23:25 +0100)]
Merge commit '66028b7ba6b411ba12ef553e9c8f1f4a4fe27710'

* commit '66028b7ba6b411ba12ef553e9c8f1f4a4fe27710':
  udp: Use AVOptions

Conflicts:
libavformat/udp.c

See: aefed6ca87971a9d277157c92fef4cdd42c5c1e2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agomkv: Add support for DVB subtitles
Luca Barbato [Sun, 15 Mar 2015 22:49:17 +0000 (23:49 +0100)]
mkv: Add support for DVB subtitles

Bug-Id: 833

4 years agoMerge commit 'a4c5801070198c1f2af32fa5cf850c330615ac24'
Michael Niedermayer [Sun, 15 Mar 2015 21:41:35 +0000 (22:41 +0100)]
Merge commit 'a4c5801070198c1f2af32fa5cf850c330615ac24'

* commit 'a4c5801070198c1f2af32fa5cf850c330615ac24':
  sctp: Update to match tcp

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'acbe15a99f158dbb0edb837fb6557171dc4376d4'
Michael Niedermayer [Sun, 15 Mar 2015 21:20:15 +0000 (22:20 +0100)]
Merge commit 'acbe15a99f158dbb0edb837fb6557171dc4376d4'

* commit 'acbe15a99f158dbb0edb837fb6557171dc4376d4':
  fate: Add test for DCA XLL

Conflicts:
tests/fate/audio.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '217e4ff4d1f845b76e44634e29371cd09313d1c2'
Michael Niedermayer [Sun, 15 Mar 2015 20:44:06 +0000 (21:44 +0100)]
Merge commit '217e4ff4d1f845b76e44634e29371cd09313d1c2'

* commit '217e4ff4d1f845b76e44634e29371cd09313d1c2':
  dca: Support for XLL (lossless extension)

Conflicts:
Changelog
doc/general.texi
libavcodec/Makefile
libavcodec/dca.h
libavcodec/dca_exss.c
libavcodec/dcadata.h
libavcodec/dcadec.c
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '4da5aacc7eba274a4f18411120de539d39c5151e'
Michael Niedermayer [Sun, 15 Mar 2015 20:14:39 +0000 (21:14 +0100)]
Merge commit '4da5aacc7eba274a4f18411120de539d39c5151e'

* commit '4da5aacc7eba274a4f18411120de539d39c5151e':
  dca: Mark syncword constants unsigned; they do not fit in 32-bit signed int

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/dvbsub_parser: Fix potential pointer overflows
Michael Niedermayer [Sun, 15 Mar 2015 17:20:58 +0000 (18:20 +0100)]
avcodec/dvbsub_parser: Fix potential pointer overflows

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/palettegen: make sure at least one frame was sent to the filter
Clément Bœsch [Sun, 15 Mar 2015 18:09:16 +0000 (19:09 +0100)]
avfilter/palettegen: make sure at least one frame was sent to the filter

Fix FPE.

4 years agolibswscale: fix compiler warnings enumerated type mixed with another type
Himangi Saraogi [Sat, 14 Mar 2015 15:52:25 +0000 (21:22 +0530)]
libswscale: fix compiler warnings enumerated type mixed with another type

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
4 years agoudp: Use AVOptions
Luca Barbato [Fri, 13 Mar 2015 16:00:12 +0000 (17:00 +0100)]
udp: Use AVOptions

Add AVOptions for options currently available as url parameters.

4 years agosctp: Update to match tcp
Luca Barbato [Fri, 13 Mar 2015 13:33:41 +0000 (14:33 +0100)]
sctp: Update to match tcp

Use AVOption and fallback over multiple addresses

4 years agoavcodec/h264dsp_template: Fix undefined shifts
Michael Niedermayer [Sun, 15 Mar 2015 16:30:10 +0000 (17:30 +0100)]
avcodec/h264dsp_template: Fix undefined shifts

Found-by: Clang -fsanitize=shift
Reported-by: Thierry Foucu <tfoucu@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolibavformat/mxfenc: write user comment metadata
Mark Reid [Sun, 15 Mar 2015 00:59:50 +0000 (17:59 -0700)]
libavformat/mxfenc: write user comment metadata

Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolavfi/eq: clarify error message in case of expression parsing error
Stefano Sabatini [Sun, 15 Mar 2015 13:26:51 +0000 (14:26 +0100)]
lavfi/eq: clarify error message in case of expression parsing error

4 years agofate: Add test for DCA XLL
Diego Biurrun [Wed, 18 Feb 2015 23:05:22 +0000 (00:05 +0100)]
fate: Add test for DCA XLL

4 years agodca: Support for XLL (lossless extension)
Niels Möller [Tue, 11 Feb 2014 10:45:27 +0000 (11:45 +0100)]
dca: Support for XLL (lossless extension)

Cleanup and integration by Diego Biurrun.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
4 years agoavformat/dvbsub: Fix hypothetical pointer overflow in dvbsub_probe()
Michael Niedermayer [Sun, 15 Mar 2015 12:45:31 +0000 (13:45 +0100)]
avformat/dvbsub: Fix hypothetical pointer overflow in dvbsub_probe()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/mpegvideodec: fix hypothetical pointer overflow in mpegvideo_probe()
Michael Niedermayer [Sun, 15 Mar 2015 12:39:56 +0000 (13:39 +0100)]
avformat/mpegvideodec: fix hypothetical pointer overflow in mpegvideo_probe()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/mpegvideodec: use avpriv_find_start_code in mpegvideo_probe()
zhaoxiu.zeng [Sun, 15 Mar 2015 08:46:22 +0000 (16:46 +0800)]
avformat/mpegvideodec: use avpriv_find_start_code in mpegvideo_probe()

Signed-off-by: Zeng Zhaoxiu <zhaoxiu.zeng@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/avidec: cleanup include
zhaoxiu.zeng [Sun, 15 Mar 2015 08:38:27 +0000 (16:38 +0800)]
avformat/avidec: cleanup include

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/avidec: use avpriv_find_start_code in avi_read_packet()
zhaoxiu.zeng [Sun, 15 Mar 2015 08:38:27 +0000 (16:38 +0800)]
avformat/avidec: use avpriv_find_start_code in avi_read_packet()

Signed-off-by: Zeng Zhaoxiu <zhaoxiu.zeng@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/ac3: Fix undefined shift in ff_ac3_bit_alloc_calc_mask()
Michael Niedermayer [Sun, 15 Mar 2015 10:21:50 +0000 (11:21 +0100)]
avcodec/ac3: Fix undefined shift in ff_ac3_bit_alloc_calc_mask()

Found-by: Clang -fsanitize=shift
Reported-by: Thierry Foucu <tfoucu@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/ac3dec: Fix undefined shifts
Michael Niedermayer [Wed, 11 Mar 2015 15:21:26 +0000 (16:21 +0100)]
avcodec/ac3dec: Fix undefined shifts

Found-by: Clang -fsanitize=shift
Reported-by: Thierry Foucu <tfoucu@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/vc1: Fix undefined shifts
Michael Niedermayer [Sun, 15 Mar 2015 01:57:24 +0000 (02:57 +0100)]
avcodec/vc1: Fix undefined shifts

Found-by: Clang -fsanitize=shift
Reported-by: Thierry Foucu <tfoucu@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoRevert "ppc: lavc: use LOCAL_ALIGNED instead of DECLARE_ALIGNED"
Michael Niedermayer [Sun, 15 Mar 2015 01:02:21 +0000 (02:02 +0100)]
Revert "ppc: lavc: use LOCAL_ALIGNED instead of DECLARE_ALIGNED"

This broke build, note, LOCAL_ALIGNED_16() does not work either

Found-by: James Almer <jamrial@gmail.com>
This reverts commit 98cccdd91c9aab9e031753f6feb81be0c44a9c8e.

4 years agoavcodec/utils: mark codec argument as const in ff_lock_avcodec()
Michael Niedermayer [Sat, 14 Mar 2015 22:30:16 +0000 (23:30 +0100)]
avcodec/utils: mark codec argument as const in ff_lock_avcodec()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolibavformat/mxfdec: export user comments metadata
Mark Reid [Sat, 14 Mar 2015 01:58:38 +0000 (18:58 -0700)]
libavformat/mxfdec: export user comments metadata

Previous-revision-reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/mov: Check for string truncation in mov_open_dref()
Michael Niedermayer [Sat, 14 Mar 2015 20:24:54 +0000 (21:24 +0100)]
avformat/mov: Check for string truncation in mov_open_dref()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/mov: Use sizeof(filename) instead of a literal number
Michael Niedermayer [Sat, 14 Mar 2015 20:23:32 +0000 (21:23 +0100)]
avformat/mov: Use sizeof(filename) instead of a literal number

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolavc: use LOCAL_ALIGNED instead of DECLARE_ALIGNED
Christophe Gisquet [Sat, 14 Mar 2015 13:26:16 +0000 (14:26 +0100)]
lavc: use LOCAL_ALIGNED instead of DECLARE_ALIGNED

The later may yield incorrect code for on-stack variables.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agox86: lavc: use LOCAL_ALIGNED instead of DECLARE_ALIGNED
Christophe Gisquet [Sat, 14 Mar 2015 13:30:18 +0000 (14:30 +0100)]
x86: lavc: use LOCAL_ALIGNED instead of DECLARE_ALIGNED

The later may yield incorrect code for on-stack variables.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoppc: lavc: use LOCAL_ALIGNED instead of DECLARE_ALIGNED
Christophe Gisquet [Sat, 14 Mar 2015 15:30:27 +0000 (15:30 +0000)]
ppc: lavc: use LOCAL_ALIGNED instead of DECLARE_ALIGNED

The later may yield incorrect code for on-stack variables.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoppc: libswscale: use LOCAL_ALIGNED instead of DECLARE_ALIGNED
Christophe Gisquet [Sat, 14 Mar 2015 15:30:26 +0000 (15:30 +0000)]
ppc: libswscale: use LOCAL_ALIGNED instead of DECLARE_ALIGNED

The later may yield incorrect code for on-stack variables.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/wmadec: Fix undefined shift in wma_decode_block()
Michael Niedermayer [Sat, 14 Mar 2015 16:11:59 +0000 (17:11 +0100)]
avcodec/wmadec: Fix undefined shift in wma_decode_block()

Found-by: Clang -fsanitize=shift
Reported-by: Thierry Foucu <tfoucu@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoac3dec: cosmetics
Christophe Gisquet [Sat, 14 Mar 2015 11:49:00 +0000 (11:49 +0000)]
ac3dec: cosmetics

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoeac3dec: fix scaling
Christophe Gisquet [Sat, 14 Mar 2015 11:48:59 +0000 (11:48 +0000)]
eac3dec: fix scaling

This is the remaining error, the output on the SPX samples,
respectively csi_miami_stereo_128_spx.eac3 and
csi_miami_5.1_256_spx.eac3, goes from:
stddev:    8.71 PSNR: 77.52 MAXDIFF:  235
stddev:24270.51 PSNR: 22.17 MAXDIFF:47166
to:
stddev:    0.12 PSNR:114.12 MAXDIFF:    1
stddev:    0.12 PSNR:114.73 MAXDIFF:    1

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoac3_fixed: fix computation of spx_noise_blend
Christophe Gisquet [Sat, 14 Mar 2015 11:48:58 +0000 (11:48 +0000)]
ac3_fixed: fix computation of spx_noise_blend

It was set to 1 instead of sqrt(3)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoac3_fixed: fix out-of-bound read
Christophe Gisquet [Sat, 14 Mar 2015 11:48:57 +0000 (11:48 +0000)]
ac3_fixed: fix out-of-bound read

Should also improve decoding, but actually doesn't...

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agox86: xvid_idct: SSE2 merged add version
Christophe Gisquet [Tue, 10 Mar 2015 23:11:54 +0000 (23:11 +0000)]
x86: xvid_idct: SSE2 merged add version

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agox86: xvid_idct: merged idct_put SSE2 versions
Christophe Gisquet [Tue, 10 Mar 2015 23:11:53 +0000 (23:11 +0000)]
x86: xvid_idct: merged idct_put SSE2 versions

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agox86: dct-test: evaluate prores idct avx version
Christophe Gisquet [Sat, 14 Mar 2015 07:57:43 +0000 (07:57 +0000)]
x86: dct-test: evaluate prores idct avx version

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agox86: dct-test: fix compilation for prores
Christophe Gisquet [Sat, 14 Mar 2015 07:57:42 +0000 (07:57 +0000)]
x86: dct-test: fix compilation for prores

When the decoder is deactivated, the x86-optimized versions are
not compiled, resulting in a link error.

The C version is unaffected, as it is part of the idctdsp
subsystem.

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