ffmpeg.git
6 years agoavformat/vqf: check number of channels before use.
Michael Niedermayer [Tue, 7 May 2013 20:26:22 +0000 (22:26 +0200)]
avformat/vqf: check number of channels before use.

Fixes division by zero

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agosanm: Check dimensions before use
Michael Niedermayer [Tue, 7 May 2013 19:58:27 +0000 (21:58 +0200)]
sanm: Check dimensions before use

Fixes integer overflow and out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/cdgraphics: check buffer size before use
Michael Niedermayer [Tue, 7 May 2013 19:04:33 +0000 (21:04 +0200)]
avcodec/cdgraphics: check buffer size before use

Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodxa: check vectors of 2x2 motion blocks
Michael Niedermayer [Tue, 7 May 2013 18:33:33 +0000 (20:33 +0200)]
dxa: check vectors of 2x2 motion blocks

Fixes out of array reads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodxa: check vectors of 4x4 motion blocks
Michael Niedermayer [Tue, 7 May 2013 18:18:41 +0000 (20:18 +0200)]
dxa: check vectors of 4x4 motion blocks

Fixes out of array reads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoshorten: allocate space for padding
Michael Niedermayer [Tue, 7 May 2013 17:57:10 +0000 (19:57 +0200)]
shorten: allocate space for padding

Fixes array overread

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agogifdec: reset previous Graphic Control Extension disposal type
Michael Niedermayer [Tue, 7 May 2013 14:07:27 +0000 (16:07 +0200)]
gifdec: reset previous Graphic Control Extension disposal type

This fixes out of array accesses.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/overlay: reindent fix.
Clément Bœsch [Wed, 1 May 2013 12:34:21 +0000 (14:34 +0200)]
lavfi/overlay: reindent fix.

6 years agolavfi/alphaextract: copy width and not linesize.
Clément Bœsch [Wed, 1 May 2013 12:27:23 +0000 (14:27 +0200)]
lavfi/alphaextract: copy width and not linesize.

Padding data is not supposed to be copied.

6 years agosws: factorize rgb 9+ planar funcs declarations.
Clément Bœsch [Sun, 21 Apr 2013 20:31:36 +0000 (22:31 +0200)]
sws: factorize rgb 9+ planar funcs declarations.

6 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Tue, 7 May 2013 12:21:45 +0000 (14:21 +0200)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Support decoding of Lagarith frame type FRAME_SOLID_COLOR.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoTicket #2540 Enable threading when using -c:v libx264rgb
Gunther Piez [Tue, 7 May 2013 09:32:15 +0000 (11:32 +0200)]
Ticket #2540 Enable threading when using -c:v libx264rgb

Signed-off-by: Gunther Piez <gupiez@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavutil/av_pix_fmt_swap_endianness: simplify and fix code
Michael Niedermayer [Tue, 7 May 2013 10:59:20 +0000 (12:59 +0200)]
avutil/av_pix_fmt_swap_endianness: simplify and fix code

This makes the code also more robust, not having a hard-coded
table that can become (and was) incomplete.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoSupport decoding of Lagarith frame type FRAME_SOLID_COLOR.
Carl Eugen Hoyos [Mon, 6 May 2013 20:40:38 +0000 (22:40 +0200)]
Support decoding of Lagarith frame type FRAME_SOLID_COLOR.

Fixes bug 459.

6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 7 May 2013 09:33:28 +0000 (11:33 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  fate-jpeg2000-dcinema: force output to xyz12le

Conflicts:
tests/fate/video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '5f87c277bd5caa09cc4f9061d4ccdd58dc121110'
Michael Niedermayer [Tue, 7 May 2013 09:23:55 +0000 (11:23 +0200)]
Merge commit '5f87c277bd5caa09cc4f9061d4ccdd58dc121110'

* commit '5f87c277bd5caa09cc4f9061d4ccdd58dc121110':
  vf_scale: add endianness conversion pixel format in query_formats

Conflicts:
libavfilter/vf_scale.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '9cfa21c8c2b81146aab574f55c93f27e5c2d435c'
Michael Niedermayer [Tue, 7 May 2013 09:13:46 +0000 (11:13 +0200)]
Merge commit '9cfa21c8c2b81146aab574f55c93f27e5c2d435c'

* commit '9cfa21c8c2b81146aab574f55c93f27e5c2d435c':
  swscale: support endianness conversion for AV_PIX_FMT_XYZ12

Conflicts:
libswscale/swscale_unscaled.c
libswscale/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'c1eb3e7fecdc270e03a700d61ef941600a6af491'
Michael Niedermayer [Tue, 7 May 2013 08:59:26 +0000 (10:59 +0200)]
Merge commit 'c1eb3e7fecdc270e03a700d61ef941600a6af491'

* commit 'c1eb3e7fecdc270e03a700d61ef941600a6af491':
  swscale: add support for endianness only conversion

Conflicts:
libswscale/utils.c
libswscale/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '74652af821d7e526a6541876a637fbf81261fa8e'
Michael Niedermayer [Tue, 7 May 2013 08:47:25 +0000 (10:47 +0200)]
Merge commit '74652af821d7e526a6541876a637fbf81261fa8e'

* commit '74652af821d7e526a6541876a637fbf81261fa8e':
  pixdesc: add function to return pixel format with swapped endiannes

Conflicts:
libavutil/pixdesc.c
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoAdd FATE test for matroska error recovery.
Reimar Döffinger [Sun, 5 May 2013 07:53:58 +0000 (09:53 +0200)]
Add FATE test for matroska error recovery.

This is the first 2 MB of the official test7.mkv.
That length seems to be enough to detect the bugs
we had in our code so far.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
6 years agomatroska: set "done" only during resync fail.
Reimar Döffinger [Sun, 5 May 2013 07:46:37 +0000 (09:46 +0200)]
matroska: set "done" only during resync fail.

Fixes playback of test7.mkv validation test file.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
6 years agoavcodec/utils: Fix leak by dereferencing audio frame when side data causes whole...
Matt Wolenetz [Mon, 6 May 2013 21:44:17 +0000 (14:44 -0700)]
avcodec/utils: Fix leak by dereferencing audio frame when side data causes whole frame skip

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agojpeg2000dec: fix memleaks in error cases in jpeg2000_decode_frame()
Michael Niedermayer [Mon, 6 May 2013 20:06:15 +0000 (22:06 +0200)]
jpeg2000dec: fix memleaks in error cases in jpeg2000_decode_frame()

Reviewed-by: Nicolas BERTRAND <nicoinattendu@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf/mpsub: remove sscanf from probing.
Clément Bœsch [Mon, 6 May 2013 20:48:36 +0000 (22:48 +0200)]
lavf/mpsub: remove sscanf from probing.

This should make probing faster.

6 years agoCosmetics: Fix indentation and add braces after last commit.
Carl Eugen Hoyos [Mon, 6 May 2013 19:31:36 +0000 (21:31 +0200)]
Cosmetics: Fix indentation and add braces after last commit.

6 years agovc1dec: Call ff_vdpau_vc1_decode_picture() once for each field.
Carl Eugen Hoyos [Mon, 6 May 2013 19:28:59 +0000 (21:28 +0200)]
vc1dec: Call ff_vdpau_vc1_decode_picture() once for each field.

Fixes mplayer -vc ffvc1vdpau for interlaced streams.

6 years agoFix vdpau vc1 interlace modes also when using decoder vc1_vdpau.
Rainer Hochecker [Mon, 6 May 2013 19:27:59 +0000 (21:27 +0200)]
Fix vdpau vc1 interlace modes also when using decoder vc1_vdpau.

Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
6 years agofate-jpeg2000-dcinema: force output to xyz12le
Janne Grunau [Mon, 22 Apr 2013 14:19:37 +0000 (16:19 +0200)]
fate-jpeg2000-dcinema: force output to xyz12le

Fixes Fate tests on big-endian configs.

6 years agovf_scale: add endianness conversion pixel format in query_formats
Janne Grunau [Fri, 26 Apr 2013 12:49:43 +0000 (14:49 +0200)]
vf_scale: add endianness conversion pixel format in query_formats

6 years agoswscale: support endianness conversion for AV_PIX_FMT_XYZ12
Janne Grunau [Fri, 26 Apr 2013 12:47:50 +0000 (14:47 +0200)]
swscale: support endianness conversion for AV_PIX_FMT_XYZ12

6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 6 May 2013 19:47:55 +0000 (21:47 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  swscale: Use alpha from the right row in yuva2rgba_c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '6c5eac9a603a91a707d030d96ba97e2ef6b3ce50'
Michael Niedermayer [Mon, 6 May 2013 19:15:47 +0000 (21:15 +0200)]
Merge commit '6c5eac9a603a91a707d030d96ba97e2ef6b3ce50'

* commit '6c5eac9a603a91a707d030d96ba97e2ef6b3ce50':
  swscale: Remove unnecessary backslashes
  jpeg2000: Fix uninitialized data errors pointed out by valgrind/memcheck

Conflicts:
libavcodec/jpeg2000dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agojpeg2000: fix for uninitialized data errors in valgrind/memcheck
Nicolas Bertrand [Mon, 29 Apr 2013 10:25:09 +0000 (12:25 +0200)]
jpeg2000: fix for uninitialized data errors in valgrind/memcheck

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '110796739ab32854dc0b6b0a1c95e6ae98889062'
Michael Niedermayer [Mon, 6 May 2013 18:59:52 +0000 (20:59 +0200)]
Merge commit '110796739ab32854dc0b6b0a1c95e6ae98889062'

* commit '110796739ab32854dc0b6b0a1c95e6ae98889062':
  x86: hpeldsp: Move avg_pixels8_x2_mmx() out of hpeldsp_rnd_template.c

Conflicts:
libavcodec/x86/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'dc1b328d0df6e5ad5ff0ca4ae031e08466624f9c'
Michael Niedermayer [Mon, 6 May 2013 18:53:37 +0000 (20:53 +0200)]
Merge commit 'dc1b328d0df6e5ad5ff0ca4ae031e08466624f9c'

* commit 'dc1b328d0df6e5ad5ff0ca4ae031e08466624f9c':
  x86: hpeldsp: Only compile MMX hpeldsp code if MMX is enabled

Conflicts:
libavcodec/x86/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '9e5e76ef9ea803432ef2782a3f528c3f5bab621e'
Michael Niedermayer [Mon, 6 May 2013 18:46:27 +0000 (20:46 +0200)]
Merge commit '9e5e76ef9ea803432ef2782a3f528c3f5bab621e'

* commit '9e5e76ef9ea803432ef2782a3f528c3f5bab621e':
  x86: More specific ifdefs for dsputil/hpeldsp init functions

Conflicts:
libavcodec/x86/dsputil_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoswscale: add support for endianness only conversion
Janne Grunau [Fri, 26 Apr 2013 12:47:08 +0000 (14:47 +0200)]
swscale: add support for endianness only conversion

Use bitfields in FormatEntry array to avoid wasting an int for each flag.

6 years agopixdesc: add function to return pixel format with swapped endiannes
Janne Grunau [Fri, 26 Apr 2013 12:43:02 +0000 (14:43 +0200)]
pixdesc: add function to return pixel format with swapped endiannes

6 years agosnow: add av_cold where appropriate
Michael Niedermayer [Mon, 6 May 2013 14:58:17 +0000 (16:58 +0200)]
snow: add av_cold where appropriate

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavfilter: add av_cold to uninit()
Michael Niedermayer [Mon, 6 May 2013 14:55:06 +0000 (16:55 +0200)]
avfilter: add av_cold to uninit()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoswscale: Use alpha from the right row in yuva2rgba_c
Martin Storsjö [Mon, 6 May 2013 11:48:25 +0000 (14:48 +0300)]
swscale: Use alpha from the right row in yuva2rgba_c

Every other pixel had the alpha channel taken from the wrong
row.

This fixes bug 504.

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoswscale: Remove unnecessary backslashes
Martin Storsjö [Mon, 6 May 2013 11:48:02 +0000 (14:48 +0300)]
swscale: Remove unnecessary backslashes

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoj2kdec: frame multithreading support
Michael Niedermayer [Sun, 28 Apr 2013 14:38:06 +0000 (16:38 +0200)]
j2kdec: frame multithreading support

This allows comparing the 2 decoders with threads

Based on:commit 2e2d24667a2c5cc7af94cfa7b63bb9ec1c04224b
By: Nicolas Bertrand <nicoinattendu@gmail.com>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/deshake_opencl: use ff_opencl_set_parameter
highgod0401 [Mon, 6 May 2013 02:02:50 +0000 (10:02 +0800)]
lavfi/deshake_opencl: use ff_opencl_set_parameter

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agojpeg2000: Fix uninitialized data errors pointed out by valgrind/memcheck
Nicolas Bertrand [Tue, 30 Apr 2013 09:09:55 +0000 (11:09 +0200)]
jpeg2000: Fix uninitialized data errors pointed out by valgrind/memcheck

Signed-off-by: Diego Biurrun <diego@biurrun.de>
6 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Mon, 6 May 2013 10:24:18 +0000 (12:24 +0200)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Remove a superfluous include from libavcodec/options_table.h.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoRemove a superfluous include from libavcodec/options_table.h.
Carl Eugen Hoyos [Mon, 6 May 2013 10:16:50 +0000 (12:16 +0200)]
Remove a superfluous include from libavcodec/options_table.h.

6 years agolavfi/unsharp_opencl: use av_opencl_errstr
highgod0401 [Mon, 6 May 2013 01:54:28 +0000 (09:54 +0800)]
lavfi/unsharp_opencl: use av_opencl_errstr

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavu/opencl_internal: use av_opencl_errstr
highgod0401 [Mon, 6 May 2013 01:46:44 +0000 (09:46 +0800)]
lavu/opencl_internal: use av_opencl_errstr

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/unsharp: fix opencl crash on 64bit linux
highgod0401 [Mon, 6 May 2013 03:34:45 +0000 (11:34 +0800)]
lavfi/unsharp: fix opencl crash on 64bit linux

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agox86: hpeldsp: Move avg_pixels8_x2_mmx() out of hpeldsp_rnd_template.c
Diego Biurrun [Tue, 23 Apr 2013 16:36:25 +0000 (18:36 +0200)]
x86: hpeldsp: Move avg_pixels8_x2_mmx() out of hpeldsp_rnd_template.c

The function is only instantiated once, so there is no point
in keeping it in a template file.

6 years agox86: hpeldsp: Only compile MMX hpeldsp code if MMX is enabled
Diego Biurrun [Sun, 5 May 2013 23:01:05 +0000 (01:01 +0200)]
x86: hpeldsp: Only compile MMX hpeldsp code if MMX is enabled

6 years agox86: More specific ifdefs for dsputil/hpeldsp init functions
Diego Biurrun [Sun, 5 May 2013 22:58:07 +0000 (00:58 +0200)]
x86: More specific ifdefs for dsputil/hpeldsp init functions

6 years agowav_seek_tag: fix integer overflow
Michael Niedermayer [Mon, 6 May 2013 08:58:31 +0000 (10:58 +0200)]
wav_seek_tag: fix integer overflow

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 6 May 2013 08:47:49 +0000 (10:47 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  wav: Always seek to an even offset

Conflicts:
libavformat/wavdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '46c1917350f58dfab84e41919e6c02d43950db8c'
Michael Niedermayer [Mon, 6 May 2013 08:34:26 +0000 (10:34 +0200)]
Merge commit '46c1917350f58dfab84e41919e6c02d43950db8c'

* commit '46c1917350f58dfab84e41919e6c02d43950db8c':
  nut: use a define for the nut version
  bgmc: Do not mark ff_bgmc_decode_init() as av_cold

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'bd8ac882140a38868c33c000a430a1292a352533'
Michael Niedermayer [Mon, 6 May 2013 08:27:54 +0000 (10:27 +0200)]
Merge commit 'bd8ac882140a38868c33c000a430a1292a352533'

* commit 'bd8ac882140a38868c33c000a430a1292a352533':
  avcodec: Add av_cold attributes to end functions missing them

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '7abd35a1ffaecfd79fa07b801621ee11ab595c43'
Michael Niedermayer [Mon, 6 May 2013 08:19:56 +0000 (10:19 +0200)]
Merge commit '7abd35a1ffaecfd79fa07b801621ee11ab595c43'

* commit '7abd35a1ffaecfd79fa07b801621ee11ab595c43':
  avformat: Add av_cold attributes to init functions missing them

Conflicts:
libavformat/rtpdec_xiph.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agowav: Always seek to an even offset
Luca Barbato [Sat, 4 May 2013 10:18:57 +0000 (12:18 +0200)]
wav: Always seek to an even offset

RIFF chunks are aligned to 16bit according to the specification.

Bug-Id:500
CC:libav-stable@libav.org

6 years agonut: use a define for the nut version
Luca Barbato [Sat, 4 May 2013 10:47:15 +0000 (12:47 +0200)]
nut: use a define for the nut version

Ease switching version in the future and make evident why that value.

6 years agoid3v2: stop ignoring text encoding for chapter titles
Paul B Mahol [Mon, 6 May 2013 00:54:13 +0000 (00:54 +0000)]
id3v2: stop ignoring text encoding for chapter titles

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoh264: check mb_width/height
Michael Niedermayer [Sun, 5 May 2013 23:37:34 +0000 (01:37 +0200)]
h264: check mb_width/height

Fixes inconsistency that leads to out of array accesses with threads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoff_h264_decode_seq_parameter_set: dont set h->sps
Michael Niedermayer [Sun, 5 May 2013 22:03:57 +0000 (00:03 +0200)]
ff_h264_decode_seq_parameter_set: dont set h->sps

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoh264_sei/decode_picture_timing: do not depend on h->sps being set
Michael Niedermayer [Sun, 5 May 2013 22:27:58 +0000 (00:27 +0200)]
h264_sei/decode_picture_timing: do not depend on h->sps being set

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoff_h264_decode_picture_parameter_set: fix return code
Michael Niedermayer [Sun, 5 May 2013 22:01:47 +0000 (00:01 +0200)]
ff_h264_decode_picture_parameter_set: fix return code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoff_h264_decode_picture_parameter_set: use the correct sps
Michael Niedermayer [Sun, 5 May 2013 22:01:05 +0000 (00:01 +0200)]
ff_h264_decode_picture_parameter_set: use the correct sps

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agobgmc: Do not mark ff_bgmc_decode_init() as av_cold
Diego Biurrun [Sun, 5 May 2013 18:51:52 +0000 (20:51 +0200)]
bgmc: Do not mark ff_bgmc_decode_init() as av_cold

The function is possibly called once per block.

6 years agoavcodec: Add av_cold attributes to end functions missing them
Diego Biurrun [Thu, 2 May 2013 08:20:12 +0000 (10:20 +0200)]
avcodec: Add av_cold attributes to end functions missing them

6 years agoCosmetics: Reindent Sierra vmd demuxer after last commit.
Carl Eugen Hoyos [Sun, 5 May 2013 17:56:46 +0000 (19:56 +0200)]
Cosmetics: Reindent Sierra vmd demuxer after last commit.

6 years agoSupport demuxing of audio-only vmd files.
Carl Eugen Hoyos [Sun, 5 May 2013 17:52:30 +0000 (19:52 +0200)]
Support demuxing of audio-only vmd files.

Reviewed-by: Paul B Mahol
6 years agoFix type of shared flac table ff_flac_blocksize_table[].
Carl Eugen Hoyos [Sun, 5 May 2013 17:29:00 +0000 (19:29 +0200)]
Fix type of shared flac table ff_flac_blocksize_table[].

Fixes ticket #2533.

6 years agoavformat: Add av_cold attributes to init functions missing them
Diego Biurrun [Thu, 18 Apr 2013 13:54:26 +0000 (15:54 +0200)]
avformat: Add av_cold attributes to init functions missing them

6 years agoMerge branch 'vdpau' of https://github.com/FernetMenta/FFmpeg
Michael Niedermayer [Sun, 5 May 2013 14:28:09 +0000 (16:28 +0200)]
Merge branch 'vdpau' of https://github.com/FernetMenta/FFmpeg

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoconfigure: Use the tool specified with --valgrind instead of a hardcoded "valgrind"
Michael Niedermayer [Sun, 5 May 2013 14:22:44 +0000 (16:22 +0200)]
configure: Use the tool specified with --valgrind instead of a hardcoded "valgrind"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoconfigure: set valgrind-memcheck toolchain when --valgrind is specified
Michael Niedermayer [Sun, 5 May 2013 14:21:57 +0000 (16:21 +0200)]
configure: set valgrind-memcheck toolchain when --valgrind is specified

This avoids duplicating the default command line arguments

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoregister AV_PIX_FMT_VDPAU for hwaccel
Rainer Hochecker [Sun, 5 May 2013 14:15:41 +0000 (16:15 +0200)]
register AV_PIX_FMT_VDPAU for hwaccel

6 years agofix vdpau vc1 interlace modes
Rainer Hochecker [Sun, 5 May 2013 13:12:59 +0000 (15:12 +0200)]
fix vdpau vc1 interlace modes

6 years agoavcodec: Set frame.width/height on all exit pathes of ff_get_buffer()
Michael Niedermayer [Sun, 5 May 2013 12:23:16 +0000 (14:23 +0200)]
avcodec: Set frame.width/height on all exit pathes of ff_get_buffer()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavu/opencl: add opencl public error API
highgod0401 [Sun, 28 Apr 2013 00:47:20 +0000 (08:47 +0800)]
lavu/opencl: add opencl public error API

Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat: replace "AVPROBE_SCORE_MAX / X" by AVPROBE_SCORE_EXTENSION / Y
Michael Niedermayer [Sun, 5 May 2013 11:16:53 +0000 (13:16 +0200)]
avformat: replace "AVPROBE_SCORE_MAX / X" by AVPROBE_SCORE_EXTENSION / Y

Demuxers where the changed code looked less readable where skiped

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomake the ordering of the return type and av_cold consistent
Michael Niedermayer [Sun, 5 May 2013 11:13:00 +0000 (13:13 +0200)]
make the ordering of the return type and av_cold consistent

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 5 May 2013 11:05:38 +0000 (13:05 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  configure: Check for getenv

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '2b677ffca54a5fbef9c8860841c32f28ecd68f70'
Michael Niedermayer [Sun, 5 May 2013 11:00:21 +0000 (13:00 +0200)]
Merge commit '2b677ffca54a5fbef9c8860841c32f28ecd68f70'

* commit '2b677ffca54a5fbef9c8860841c32f28ecd68f70':
  swscale: Add av_cold attributes to init functions missing them

Conflicts:
libswscale/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '1fda184a85178cfd7b98d9e308d18e1ded76a511'
Michael Niedermayer [Sun, 5 May 2013 10:53:42 +0000 (12:53 +0200)]
Merge commit '1fda184a85178cfd7b98d9e308d18e1ded76a511'

* commit '1fda184a85178cfd7b98d9e308d18e1ded76a511':
  avutil: Add av_cold attributes to init functions missing them

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '20c86571ccc71412781d4a4813e4693e0c42aec6'
Michael Niedermayer [Sun, 5 May 2013 10:48:25 +0000 (12:48 +0200)]
Merge commit '20c86571ccc71412781d4a4813e4693e0c42aec6'

* commit '20c86571ccc71412781d4a4813e4693e0c42aec6':
  lavfi: let gcc realign the stack on public graph driving functions

Conflicts:
libavfilter/buffersink.c
libavfilter/buffersrc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'c0c2b96c136ec2cbfd808eefc26de399f447d62f'
Michael Niedermayer [Sun, 5 May 2013 10:41:36 +0000 (12:41 +0200)]
Merge commit 'c0c2b96c136ec2cbfd808eefc26de399f447d62f'

* commit 'c0c2b96c136ec2cbfd808eefc26de399f447d62f':
  sctp: Add a note on why sctp_recvmsg and sctp_sendmsg have ff_-prefixes
  avs: Increase magic value score above file extension score

Conflicts:
libavformat/avs.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'e0f8be6413b6a8d334d6052e610af32935c310af'
Michael Niedermayer [Sun, 5 May 2013 10:29:56 +0000 (12:29 +0200)]
Merge commit 'e0f8be6413b6a8d334d6052e610af32935c310af'

* commit 'e0f8be6413b6a8d334d6052e610af32935c310af':
  avformat: Add AVPROBE_SCORE_EXTENSION define and use where appropriate

Conflicts:
libavformat/ac3dec.c
libavformat/avformat.h
libavformat/avs.c
libavformat/m4vdec.c
libavformat/mov.c
libavformat/mp3dec.c
libavformat/mpeg.c
libavformat/mpegvideodec.c
libavformat/psxstr.c
libavformat/pva.c
libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '4d7ed3e73541983459a7913c2034eba69ebc113d'
Michael Niedermayer [Sun, 5 May 2013 09:59:20 +0000 (11:59 +0200)]
Merge commit '4d7ed3e73541983459a7913c2034eba69ebc113d'

* commit '4d7ed3e73541983459a7913c2034eba69ebc113d':
  build: output-example: Add avutil to ELIBS in link command

Conflicts:
libavformat/Makefile

No change as our example build code doesnt have this bug

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'e445647b4fdf481b13b2743b303d84de4f43bedd'
Michael Niedermayer [Sun, 5 May 2013 09:50:29 +0000 (11:50 +0200)]
Merge commit 'e445647b4fdf481b13b2743b303d84de4f43bedd'

* commit 'e445647b4fdf481b13b2743b303d84de4f43bedd':
  avresample: Add av_cold attributes to init functions missing them

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '093804a93cc5da3f95f98265a5df116912443cec'
Michael Niedermayer [Sun, 5 May 2013 09:42:18 +0000 (11:42 +0200)]
Merge commit '093804a93cc5da3f95f98265a5df116912443cec'

* commit '093804a93cc5da3f95f98265a5df116912443cec':
  avfilter: Add av_cold attributes to init/uninit functions

Conflicts:
libavfilter/af_ashowinfo.c
libavfilter/af_volume.c
libavfilter/src_movie.c
libavfilter/vf_lut.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '6fee1b90ce3bf4fbdfde7016e0890057c9000487'
Michael Niedermayer [Sun, 5 May 2013 09:34:29 +0000 (11:34 +0200)]
Merge commit '6fee1b90ce3bf4fbdfde7016e0890057c9000487'

* commit '6fee1b90ce3bf4fbdfde7016e0890057c9000487':
  avcodec: Add av_cold attributes to init functions missing them

Conflicts:
libavcodec/aacpsy.c
libavcodec/atrac3.c
libavcodec/dvdsubdec.c
libavcodec/ffv1.c
libavcodec/ffv1enc.c
libavcodec/h261enc.c
libavcodec/h264_parser.c
libavcodec/h264dsp.c
libavcodec/h264pred.c
libavcodec/libschroedingerenc.c
libavcodec/libxvid_rc.c
libavcodec/mpeg12.c
libavcodec/mpeg12enc.c
libavcodec/proresdsp.c
libavcodec/rangecoder.c
libavcodec/videodsp.c
libavcodec/x86/proresdsp_init.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '72e228b274a98af1aba9588415d0cd87fde44663'
Michael Niedermayer [Sun, 5 May 2013 09:19:12 +0000 (11:19 +0200)]
Merge commit '72e228b274a98af1aba9588415d0cd87fde44663'

* commit '72e228b274a98af1aba9588415d0cd87fde44663':
  nut: K&R formatting cosmetics

Conflicts:
libavformat/nut.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoconfigure: fix valgrind-memcheck arguments
Michael Niedermayer [Sun, 5 May 2013 08:48:33 +0000 (10:48 +0200)]
configure: fix valgrind-memcheck arguments

They now match the --valgrind arguments

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'b1ee8eec849f17fce2f411a297de9cbf2edaeb3a'
Michael Niedermayer [Sun, 5 May 2013 08:47:19 +0000 (10:47 +0200)]
Merge commit 'b1ee8eec849f17fce2f411a297de9cbf2edaeb3a'

* commit 'b1ee8eec849f17fce2f411a297de9cbf2edaeb3a':
  configure: Add basic valgrind-memcheck support

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '95e8ac60f8b7317ce23c648250fdc8fb68d65a07'
Michael Niedermayer [Sun, 5 May 2013 08:36:23 +0000 (10:36 +0200)]
Merge commit '95e8ac60f8b7317ce23c648250fdc8fb68d65a07'

* commit '95e8ac60f8b7317ce23c648250fdc8fb68d65a07':
  build: normalize coverage.info

Conflicts:
tests/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '768e44d044bc32de1e58c198a3708d186af7e966'
Michael Niedermayer [Sun, 5 May 2013 08:18:41 +0000 (10:18 +0200)]
Merge commit '768e44d044bc32de1e58c198a3708d186af7e966'

* commit '768e44d044bc32de1e58c198a3708d186af7e966':
  build: tune down the output of lcov/gcov

Conflicts:
tests/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoDetect and skip mj2-style jp2c header.
Reimar Döffinger [Thu, 2 May 2013 21:56:19 +0000 (23:56 +0200)]
Detect and skip mj2-style jp2c header.

This this fixes one of the issues with
http://blogs.bu.edu/mhirsch/files/2012/08/Rotate180CCW-checkerboard.mj2_.zip
and at least allows to demux the file properly instead
of failing during probing.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
6 years agoAvoid incorrect deprecated pixel format warning.
Reimar Döffinger [Thu, 2 May 2013 21:52:44 +0000 (23:52 +0200)]
Avoid incorrect deprecated pixel format warning.

Should only be printed if a "JPEG" format was used,
not for e.g. XYZ.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
6 years agoAAC encoder: Fix rate control on twoloop.
Claudio Freire [Sat, 4 May 2013 21:36:37 +0000 (18:36 -0300)]
AAC encoder: Fix rate control on twoloop.

Fixes a case where multichannel bitrate isn't accurately
targetted by psy model alone, never achieving the target bitrate.
Now fixed.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoAAC encoder: Fixed a rounding bug in psy's channel bitrate computation.
Claudio Freire [Sat, 4 May 2013 21:35:49 +0000 (18:35 -0300)]
AAC encoder: Fixed a rounding bug in psy's channel bitrate computation.

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