ffmpeg.git
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: 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>
4 years agox86: xvid_idct: port MMX iDCT to yasm
Christophe Gisquet [Tue, 10 Mar 2015 23:11:52 +0000 (23:11 +0000)]
x86: xvid_idct: port MMX iDCT to yasm

Also reduce the table duplication with SSE2 code, remove duplicated
macro parameters.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoac3dec_fixed: always use the USE_FIXED=1 variant of the AC3DecodeContext
Andreas Cadhalpun [Fri, 13 Mar 2015 21:28:42 +0000 (22:28 +0100)]
ac3dec_fixed: always use the USE_FIXED=1 variant of the AC3DecodeContext

The AC3DecodeContext has a float (USE_FIXED=0) and an integer
(USE_FIXED=1) variant, both of which can be present in the same binary.
This is not only very confusing, but it also breaks horribly, when one
variant is used by code expecting the other.

This currently happens, because eac3dec.c is only compiled for the float
variant, but also used from ac3dec_fixed.c, which uses the integer
variant.

The result is memory corruption, leading to crashes.

So compile eac3dec.c once for each variant and adapt it, so that it
works with the integer variant.

A loss of precission and scaling bug has been fixed by the committer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoswresample/resample: Fix undefined shifts
Michael Niedermayer [Sat, 14 Mar 2015 00:15:37 +0000 (01:15 +0100)]
swresample/resample: 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/utils: use atomic operations on entangled_thread_counter
Michael Niedermayer [Fri, 13 Mar 2015 21:28:25 +0000 (22:28 +0100)]
avcodec/utils: use atomic operations on entangled_thread_counter

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoconfigure: fix zlib dependancy of tdsc
Michael Niedermayer [Fri, 13 Mar 2015 22:43:24 +0000 (23:43 +0100)]
configure: fix zlib dependancy of tdsc

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/tdsc: use ff_codec_open2_recursive()
Michael Niedermayer [Fri, 13 Mar 2015 22:18:12 +0000 (23:18 +0100)]
avcodec/tdsc: use ff_codec_open2_recursive()

Fixes assertion failure and race conditions

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '247e370e2a913db52ca079b347a174c8d393b171'
Michael Niedermayer [Fri, 13 Mar 2015 22:17:54 +0000 (23:17 +0100)]
Merge commit '247e370e2a913db52ca079b347a174c8d393b171'

* commit '247e370e2a913db52ca079b347a174c8d393b171':
  TDSC decoder

Conflicts:
Changelog
doc/general.texi
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/version.h
tests/fate/video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '5a0e953c2465be9d449d5f523c3d3e2b886910b2'
Michael Niedermayer [Fri, 13 Mar 2015 21:48:54 +0000 (22:48 +0100)]
Merge commit '5a0e953c2465be9d449d5f523c3d3e2b886910b2'

* commit '5a0e953c2465be9d449d5f523c3d3e2b886910b2':
  mjpeg: Mark decoder family as thread safe

Conflicts:
libavcodec/mjpegbdec.c
libavcodec/mjpegdec.c
libavcodec/mxpegdec.c
libavcodec/sp5xdec.c

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

* commit '117b432748ca87de4cd0f09d9b1495545e264733':
  lavc: Introduce AVCodec internal capabilities

Conflicts:
libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '9993a067f6c8c7e7838052ac3146aa6b80dd7e81'
Michael Niedermayer [Fri, 13 Mar 2015 21:02:19 +0000 (22:02 +0100)]
Merge commit '9993a067f6c8c7e7838052ac3146aa6b80dd7e81'

* commit '9993a067f6c8c7e7838052ac3146aa6b80dd7e81':
  lavc: Improve thread locking error message

Conflicts:
libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agodca: Mark syncword constants unsigned; they do not fit in 32-bit signed int
Diego Biurrun [Thu, 12 Mar 2015 23:23:32 +0000 (00:23 +0100)]
dca: Mark syncword constants unsigned; they do not fit in 32-bit signed int

4 years agoTDSC decoder
Vittorio Giovara [Wed, 11 Mar 2015 20:44:00 +0000 (20:44 +0000)]
TDSC decoder

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
4 years agomjpeg: Mark decoder family as thread safe
Vittorio Giovara [Wed, 11 Mar 2015 20:43:59 +0000 (20:43 +0000)]
mjpeg: Mark decoder family as thread safe

No global variables are used and the VLC tables are allocated without
static elements. This will allow using a JPEG decoding context within
other decoders.

4 years agolavc: Introduce AVCodec internal capabilities
Vittorio Giovara [Wed, 11 Mar 2015 20:43:58 +0000 (20:43 +0000)]
lavc: Introduce AVCodec internal capabilities

This field is designed for marking codec properties useful to lavc internals.
Two internal capabilities are added:
 - FF_CODEC_CAP_INIT_THREADSAFE: codec can be opened without locks;
 - FF_CODEC_CAP_INIT_CLEANUP: codec frees memory if initialization fails.

4 years agolavc: Improve thread locking error message
Vittorio Giovara [Wed, 11 Mar 2015 20:43:57 +0000 (20:43 +0000)]
lavc: Improve thread locking error message

4 years agoavformat/http: support auto reconnect
Zhang Rui [Thu, 12 Mar 2015 03:39:55 +0000 (11:39 +0800)]
avformat/http: support auto reconnect

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/flvdec: add support for OnCaption
Michael Niedermayer [Fri, 13 Mar 2015 15:25:27 +0000 (16:25 +0100)]
avformat/flvdec: add support for OnCaption

4 years agoavformat/flvdec: re enable flv_data_packet()
Michael Niedermayer [Tue, 20 Jan 2015 22:56:17 +0000 (23:56 +0100)]
avformat/flvdec: re enable flv_data_packet()

Found-by: kurosu
Reviewed-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/flvdec: Change subtitle stream type to subtitle type
Michael Niedermayer [Fri, 13 Mar 2015 15:00:53 +0000 (16:00 +0100)]
avformat/flvdec: Change subtitle stream type to subtitle type

Previous-version-reviewed-by: Andreas Cadhalpun
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/svq1dec: Fix undefined shifts
Michael Niedermayer [Fri, 13 Mar 2015 03:46:44 +0000 (04:46 +0100)]
avcodec/svq1dec: 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 agolavc: Print number of reference frames if debug level >= verbose.
Carl Eugen Hoyos [Fri, 13 Mar 2015 07:52:36 +0000 (08:52 +0100)]
lavc: Print number of reference frames if debug level >= verbose.

4 years agolavf: Do not list mov-only codecs in riff.c.
Carl Eugen Hoyos [Fri, 13 Mar 2015 07:49:03 +0000 (08:49 +0100)]
lavf: Do not list mov-only codecs in riff.c.

Instead check for all mov code-points when demuxing avi
and print a warning if a video codec is found like this.
Fixes a regression similar to the one described in ticket #4307.

4 years agodoc: Fix alphabetic ordering for decklink input device.
Carl Eugen Hoyos [Fri, 13 Mar 2015 00:57:42 +0000 (01:57 +0100)]
doc: Fix alphabetic ordering for decklink input device.

4 years agox86: xvid_idct: port SSE2 iDCT to yasm
Christophe Gisquet [Tue, 10 Mar 2015 23:11:51 +0000 (23:11 +0000)]
x86: xvid_idct: port SSE2 iDCT to yasm

The main difference consists in renaming properly labels, and
letting yasm select the gprs for skipping 1D transforms.

Previous-version-reviewed-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '913aa9a4874418724183a3ec862cdc63b829367d'
Michael Niedermayer [Thu, 12 Mar 2015 23:02:18 +0000 (00:02 +0100)]
Merge commit '913aa9a4874418724183a3ec862cdc63b829367d'

* commit '913aa9a4874418724183a3ec862cdc63b829367d':
  libx264: Return more meaningful error codes

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '6bdae41d3ef74a0865e8f87896e649f93b2f39bd'
Michael Niedermayer [Thu, 12 Mar 2015 22:50:41 +0000 (23:50 +0100)]
Merge commit '6bdae41d3ef74a0865e8f87896e649f93b2f39bd'

* commit '6bdae41d3ef74a0865e8f87896e649f93b2f39bd':
  matroskadec: Check memory allocations

Conflicts:
libavformat/matroskadec.c

See: 3e2a5b33f0355eeb80b6b2805be7f1b4fa1d1a46
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'c3bd1d60af97e8d2568dac9fcce7bdabb4ff93c8'
Michael Niedermayer [Thu, 12 Mar 2015 21:39:27 +0000 (22:39 +0100)]
Merge commit 'c3bd1d60af97e8d2568dac9fcce7bdabb4ff93c8'

* commit 'c3bd1d60af97e8d2568dac9fcce7bdabb4ff93c8':
  formats: Check memory allocations

Conflicts:
libavfilter/formats.c

See: 527ca3985c736ffe077a82fdf3616f0fd571b923
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '5a2645cafeca1c2207ac55cc831c3349572a82ed'
Michael Niedermayer [Thu, 12 Mar 2015 20:58:38 +0000 (21:58 +0100)]
Merge commit '5a2645cafeca1c2207ac55cc831c3349572a82ed'

* commit '5a2645cafeca1c2207ac55cc831c3349572a82ed':
  nutdec: Prevent leaks on memory error

Conflicts:
libavformat/nutdec.c

See: 269845db86d994c7d43c3ad6eabd4fde5bb391ea
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'edca1dd552efa1ebef016ca9eff4ce6757605819'
Michael Niedermayer [Thu, 12 Mar 2015 20:50:36 +0000 (21:50 +0100)]
Merge commit 'edca1dd552efa1ebef016ca9eff4ce6757605819'

* commit 'edca1dd552efa1ebef016ca9eff4ce6757605819':
  xcbgrab: Check av_strdup() allocation

Conflicts:
libavdevice/xcbgrab.c

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