ffmpeg.git
8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 25 Mar 2012 00:56:53 +0000 (01:56 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avc: Add a function for converting mp4 style extradata to annex b
  pthread: free progress if buffer allocation failed.
  lavc/avconv: support changing frame sizes in codecs with frame mt.
  libavformat: Document who sets the AVStream.id field
  utvideo: mark output picture as keyframe.
  sunrast: Add support for negative linesize.
  vp8: fix update_lf_deltas in libavcodec/vp8.c
  ralf: read Huffman code lengths without GetBitContext

Conflicts:
ffmpeg.c
libavcodec/sunrastenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoffmpeg: drop struct from SwrContext.
Michael Niedermayer [Sun, 25 Mar 2012 00:00:07 +0000 (01:00 +0100)]
ffmpeg: drop struct from SwrContext.

Its a typdef now and doesnt need the struct anymore.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoswr: fix compilation failure with old versions of gcc.
Michael Niedermayer [Sat, 24 Mar 2012 23:35:10 +0000 (00:35 +0100)]
swr: fix compilation failure with old versions of gcc.

gcc 4.4 did not like the way i used typedefs

Idea-by: beastd
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolibaacplus: switch to encode2()
Paul B Mahol [Sat, 24 Mar 2012 17:41:55 +0000 (17:41 +0000)]
libaacplus: switch to encode2()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoswr: drop SWR_CH_MAX with the next major ABI bump
Michael Niedermayer [Sat, 24 Mar 2012 22:20:46 +0000 (23:20 +0100)]
swr: drop SWR_CH_MAX with the next major ABI bump

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoswr: dont use SWR_CH_MAX in the public function declaration.
Michael Niedermayer [Sat, 24 Mar 2012 22:00:59 +0000 (23:00 +0100)]
swr: dont use SWR_CH_MAX in the public function declaration.

This change should make no binary difference to the generated code.
the API version is just bumped for correctness sake, this is not
really a API or ABI change.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoswr: make SwrContext a typedef.
Michael Niedermayer [Sat, 24 Mar 2012 21:56:24 +0000 (22:56 +0100)]
swr: make SwrContext a typedef.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoswresample: support up to 32 channels
Michael Niedermayer [Sat, 24 Mar 2012 21:38:14 +0000 (22:38 +0100)]
swresample: support up to 32 channels

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoavc: Add a function for converting mp4 style extradata to annex b
Martin Storsjö [Thu, 22 Mar 2012 11:25:58 +0000 (13:25 +0200)]
avc: Add a function for converting mp4 style extradata to annex b

Make movenc use this function instead of the current custom
conversion function.

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agopthread: free progress if buffer allocation failed.
Ronald S. Bultje [Sat, 24 Mar 2012 19:19:19 +0000 (20:19 +0100)]
pthread: free progress if buffer allocation failed.

Else we run out of progress variables after a few failed buffer
allocations.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agolavc/avconv: support changing frame sizes in codecs with frame mt.
Ronald S. Bultje [Fri, 23 Mar 2012 22:03:03 +0000 (15:03 -0700)]
lavc/avconv: support changing frame sizes in codecs with frame mt.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agolibavformat: Document who sets the AVStream.id field
Martin Storsjö [Thu, 22 Mar 2012 15:05:08 +0000 (17:05 +0200)]
libavformat: Document who sets the AVStream.id field

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agoutvideo: mark output picture as keyframe.
Kostya Shishkov [Sat, 24 Mar 2012 18:54:31 +0000 (19:54 +0100)]
utvideo: mark output picture as keyframe.

Spotted by Антон.

8 years agoadxenc: fix error in merging from qatar
Paul B Mahol [Sat, 24 Mar 2012 15:28:51 +0000 (15:28 +0000)]
adxenc: fix error in merging from qatar

Pointed out by FATE.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agosonic: mark as experimental
Paul B Mahol [Sat, 24 Mar 2012 16:08:57 +0000 (16:08 +0000)]
sonic: mark as experimental

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoindeo5dec: Make sure we have had a valid gop header.
Michael Niedermayer [Sat, 24 Mar 2012 16:43:55 +0000 (17:43 +0100)]
indeo5dec: Make sure we have had a valid gop header.

This prevents decoding happening on a half initialized context.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agotruemotion2dec: Fix overread of input.
Michael Niedermayer [Sat, 24 Mar 2012 16:42:14 +0000 (17:42 +0100)]
truemotion2dec: Fix overread of input.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agocavsdec: check stc in decode_slice_header()
Michael Niedermayer [Sat, 24 Mar 2012 15:29:46 +0000 (16:29 +0100)]
cavsdec: check stc in decode_slice_header()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agosunrast: Add support for negative linesize.
Aneesh Dogra [Fri, 23 Mar 2012 17:54:00 +0000 (23:24 +0530)]
sunrast: Add support for negative linesize.

Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
8 years agoh264: move resolution change check further up.
Michael Niedermayer [Sat, 24 Mar 2012 15:23:40 +0000 (16:23 +0100)]
h264: move resolution change check further up.

This prevents some variables from being changed in case of a
rejected resolution change.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agovp8: fix update_lf_deltas in libavcodec/vp8.c
Janne Salonen [Mon, 19 Mar 2012 07:35:09 +0000 (09:35 +0200)]
vp8: fix update_lf_deltas in libavcodec/vp8.c

lf_delta.ref[i] and lf_delta.mode[i] were incorrectly reset to 0 if
specific delta value was not updated. Fixed to keep the previous value
if flag indicates that element in question is not updated.

Signed-off-by: Janne Salonen <jsalonen@google.com>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
8 years agoalsdec: check opt_order.
Michael Niedermayer [Sat, 24 Mar 2012 00:39:13 +0000 (01:39 +0100)]
alsdec: check opt_order.

Fixes out of array write in quant_cof

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agompegvideo: increase buffer sizes.
Michael Niedermayer [Sat, 24 Mar 2012 13:25:52 +0000 (14:25 +0100)]
mpegvideo: increase buffer sizes.

Fixes buffer overflow

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoindeo4: Fix global array overread.
Michael Niedermayer [Sat, 24 Mar 2012 11:29:05 +0000 (12:29 +0100)]
indeo4: Fix global array overread.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoFix linking without yasm.
Carl Eugen Hoyos [Sat, 24 Mar 2012 13:54:06 +0000 (14:54 +0100)]
Fix linking without yasm.

8 years agoralf: read Huffman code lengths without GetBitContext
Kostya Shishkov [Sat, 24 Mar 2012 06:29:51 +0000 (07:29 +0100)]
ralf: read Huffman code lengths without GetBitContext

Those descriptions are stored in nibbles, so they are easy to extract.
And this way we don't need to pad tables for possible bit reader overreads.

8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 24 Mar 2012 09:59:43 +0000 (10:59 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  rv34: error out on size changes with frame threading
  aacsbr: Add a debug check to sbr_mapping.
  aac: Reset some state variables when turning SBR off
  aac: Reset PS parameters on header decode failure.
  fate: add wmalossless test.
  aacsbr: handle m_max values smaller than 4.

Conflicts:
libavcodec/aacsbr.c
tests/fate/lossless-audio.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolibopenjpegenc: switch to encode2()
Paul B Mahol [Sat, 24 Mar 2012 00:32:26 +0000 (00:32 +0000)]
libopenjpegenc: switch to encode2()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Reviewed-by: Michael Bradshaw <mbradshaw@sorensonmedia.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolibopenjpeg: make .long_name usefull
Paul B Mahol [Sat, 24 Mar 2012 00:12:16 +0000 (00:12 +0000)]
libopenjpeg: make .long_name usefull

Fixes following strange output:

DEV D  libopenjpeg     OpenJPEG based JPEG 2000 encoder

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Reviewed-by: Michael Bradshaw <mbradshaw@sorensonmedia.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agobintext: build decoders only if they are actually enabled
Paul B Mahol [Fri, 23 Mar 2012 23:03:55 +0000 (23:03 +0000)]
bintext: build decoders only if they are actually enabled

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Reviewed-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agovp56dec: avoid freeing the returned frame before returning it.
Michael Niedermayer [Sat, 24 Mar 2012 04:21:39 +0000 (05:21 +0100)]
vp56dec: avoid freeing the returned frame before returning it.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agocavsdec: check for changing w/h.
Michael Niedermayer [Sat, 24 Mar 2012 01:40:24 +0000 (02:40 +0100)]
cavsdec: check for changing w/h.

Our decoder does not support changing w/h.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoindeo3: fix out of picture write.
Michael Niedermayer [Sat, 24 Mar 2012 01:05:50 +0000 (02:05 +0100)]
indeo3: fix out of picture write.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agopthread/mpegvideo: detect and block attempts to init frames after setup.
Michael Niedermayer [Fri, 23 Mar 2012 23:20:05 +0000 (00:20 +0100)]
pthread/mpegvideo: detect and block attempts to init frames after setup.

This fixes race conditions that ultimately lead to memory corruption.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agorv34: error out on size changes with frame threading
Janne Grunau [Fri, 23 Mar 2012 21:30:38 +0000 (22:30 +0100)]
rv34: error out on size changes with frame threading

8 years agoaacsbr: Add a debug check to sbr_mapping.
Alex Converse [Wed, 21 Mar 2012 19:20:58 +0000 (12:20 -0700)]
aacsbr: Add a debug check to sbr_mapping.

There have been multiple bugs caused by inconsistencies here.

Based on an idea from Michael Niedermayer.

CC: libav-stable@libav.org
8 years agoaac: Reset some state variables when turning SBR off
Alex Converse [Wed, 21 Mar 2012 19:00:56 +0000 (12:00 -0700)]
aac: Reset some state variables when turning SBR off

This makes sure the reset flag gets set when SBR gets turned back on
and sets control variables for unguided mode back to their defaults.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
8 years agoaac: Reset PS parameters on header decode failure.
Alex Converse [Wed, 21 Mar 2012 17:11:02 +0000 (10:11 -0700)]
aac: Reset PS parameters on header decode failure.

If the next header frame codes zero envelopes the previous frame's
values will be used. Consequently the invalid values must be cleared.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
8 years agoerror_concealment: Prevent FPEs in case of corrupted input.
Michael Niedermayer [Fri, 23 Mar 2012 20:56:42 +0000 (21:56 +0100)]
error_concealment: Prevent FPEs in case of corrupted input.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agofate: add wmalossless test.
Ronald S. Bultje [Thu, 22 Mar 2012 19:13:24 +0000 (12:13 -0700)]
fate: add wmalossless test.

8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 23 Mar 2012 20:20:06 +0000 (21:20 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  rv34: Handle only complete frames in frame-mt.
  MPV: set reference frame pointers to NULL when allocation of dummy pictures fails
  configure: die if x11grab dependencies are unavailable
  zerocodec: factorize loop
  avconv: fix the resampling safety factors for output audio buffer allocation
  avconv: move audio output buffer allocation to a separate function
  avconv: make the async buffer global and free it in exit_program()

Conflicts:
ffmpeg.c
libavcodec/mpegvideo.c
libavcodec/rv34.c
libavcodec/zerocodec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoaacsbr: handle m_max values smaller than 4.
Ronald S. Bultje [Thu, 22 Mar 2012 18:50:48 +0000 (11:50 -0700)]
aacsbr: handle m_max values smaller than 4.

Prevents a signflip in the counter, and a subsequent crash because of
overreads/overwrites.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
8 years agoVC1: restore optimizations broken in 9a1ced32.
Reimar Döffinger [Fri, 23 Mar 2012 15:01:01 +0000 (16:01 +0100)]
VC1: restore optimizations broken in 9a1ced32.

They were moved into code under HAVE_YASM and most of them
even into completely disabled code with no reason given
for that in the commit message.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
8 years agointerplayvideo: give avctx to av_dlog()
Paul B Mahol [Fri, 23 Mar 2012 17:17:37 +0000 (17:17 +0000)]
interplayvideo: give avctx to av_dlog()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agointerplayvideo: remove superfluous strings from av_log()
Paul B Mahol [Fri, 23 Mar 2012 17:17:36 +0000 (17:17 +0000)]
interplayvideo: remove superfluous strings from av_log()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agovmdvideo: remove superfluous strings from av_log messages
Paul B Mahol [Fri, 23 Mar 2012 13:16:43 +0000 (13:16 +0000)]
vmdvideo: remove superfluous strings from av_log messages

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agosonic: fix warning about incompatible pointer types
Paul B Mahol [Fri, 23 Mar 2012 13:11:53 +0000 (13:11 +0000)]
sonic: fix warning about incompatible pointer types

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agorv34: Handle only complete frames in frame-mt.
Janne Grunau [Fri, 16 Mar 2012 15:18:57 +0000 (16:18 +0100)]
rv34: Handle only complete frames in frame-mt.

Correct handling of errors to prevent hags or crashes is very complex
otherwise.

The frame initializing is also moved from decode_slice() to
decode_frame() for clarity.

8 years agoMPV: set reference frame pointers to NULL when allocation of dummy pictures fails
Janne Grunau [Tue, 20 Mar 2012 13:44:28 +0000 (14:44 +0100)]
MPV: set reference frame pointers to NULL when allocation of dummy pictures fails

8 years agoconfigure: die if x11grab dependencies are unavailable
Josh Allmann [Wed, 21 Mar 2012 15:01:37 +0000 (08:01 -0700)]
configure: die if x11grab dependencies are unavailable

Signed-off-by: Diego Biurrun <diego@biurrun.de>
8 years agozerocodec: factorize loop
Michael Niedermayer [Thu, 22 Mar 2012 19:50:58 +0000 (15:50 -0400)]
zerocodec: factorize loop

Signed-off-by: Diego Biurrun <diego@biurrun.de>
8 years agoswr: check that there is enough information to do rematrixing when needed.
Michael Niedermayer [Fri, 23 Mar 2012 11:10:08 +0000 (12:10 +0100)]
swr: check that there is enough information to do rematrixing when needed.

Fixes assertion failure.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agobitstream: build_table, check table_nb_bits.
Michael Niedermayer [Fri, 23 Mar 2012 10:38:20 +0000 (11:38 +0100)]
bitstream: build_table, check table_nb_bits.

Fixes null ptr deref.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoindeo4: check ref_mb
Michael Niedermayer [Fri, 23 Mar 2012 10:03:53 +0000 (11:03 +0100)]
indeo4: check ref_mb

Fix NULL deref

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoffmpeg: check samplerate from decoder.
Michael Niedermayer [Fri, 23 Mar 2012 09:59:03 +0000 (10:59 +0100)]
ffmpeg: check samplerate from decoder.

Fixes FPE

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agorawdec: Check w/h.
Michael Niedermayer [Fri, 23 Mar 2012 09:48:18 +0000 (10:48 +0100)]
rawdec: Check w/h.

Fixes FPE

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoxmv: check channel number
Michael Niedermayer [Fri, 23 Mar 2012 09:31:45 +0000 (10:31 +0100)]
xmv: check channel number

Fixes FPE

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agomjpegdec: check h/v_count.
Michael Niedermayer [Fri, 23 Mar 2012 09:23:52 +0000 (10:23 +0100)]
mjpegdec: check h/v_count.

Fixes FPE

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoituh263dec: Implement enough of Annex O (scalability) to fix a FPE.
Michael Niedermayer [Fri, 23 Mar 2012 09:13:27 +0000 (10:13 +0100)]
ituh263dec: Implement enough of Annex O (scalability) to fix a FPE.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoavconv: fix the resampling safety factors for output audio buffer allocation
Justin Ruggles [Wed, 21 Mar 2012 20:56:49 +0000 (16:56 -0400)]
avconv: fix the resampling safety factors for output audio buffer allocation

This matches the output size required for audio_resample()

8 years agoavconv: move audio output buffer allocation to a separate function
Justin Ruggles [Wed, 21 Mar 2012 20:55:30 +0000 (16:55 -0400)]
avconv: move audio output buffer allocation to a separate function

Allows for removing a goto and makes the code easier to follow.

8 years agoavconv: make the async buffer global and free it in exit_program()
Justin Ruggles [Wed, 21 Mar 2012 20:36:23 +0000 (16:36 -0400)]
avconv: make the async buffer global and free it in exit_program()

8 years agoerror_conceal: fix FPE in guess_dc() with huge sizes.
Michael Niedermayer [Fri, 23 Mar 2012 04:21:10 +0000 (05:21 +0100)]
error_conceal: fix FPE in guess_dc() with huge sizes.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agomov: Fix FPE on 0 time_scale
Michael Niedermayer [Fri, 23 Mar 2012 03:32:16 +0000 (04:32 +0100)]
mov: Fix FPE on 0 time_scale

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoindeo4: check band->scan
Michael Niedermayer [Fri, 23 Mar 2012 03:18:10 +0000 (04:18 +0100)]
indeo4: check band->scan

Fixes null ptr exception

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agovorbisdemux: Check private context in theoras gtopts.
Michael Niedermayer [Fri, 23 Mar 2012 02:43:30 +0000 (03:43 +0100)]
vorbisdemux: Check private context in theoras gtopts.

This prevents a null ptr dereference.
It could be checked differently but this way it should
be possible to return some data.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agocosmetics: remove superfluous curly brackets
Paul B Mahol [Thu, 22 Mar 2012 20:22:39 +0000 (20:22 +0000)]
cosmetics: remove superfluous curly brackets

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agohuffyuv: remove long time disabled code
Paul B Mahol [Fri, 23 Mar 2012 01:20:40 +0000 (01:20 +0000)]
huffyuv: remove long time disabled code

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agohuffyuv: do not decode/encode yuv colorspace with odd width
Paul B Mahol [Fri, 23 Mar 2012 01:16:19 +0000 (01:16 +0000)]
huffyuv: do not decode/encode yuv colorspace with odd width

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoaacdec: prevent channels from exceeding MAX_CHANNELS.
Michael Niedermayer [Fri, 23 Mar 2012 01:34:32 +0000 (02:34 +0100)]
aacdec: prevent channels from exceeding MAX_CHANNELS.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agomatroskadec: fix strcmp(NULL)
Michael Niedermayer [Fri, 23 Mar 2012 00:27:49 +0000 (01:27 +0100)]
matroskadec: fix strcmp(NULL)

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agomov: fix global unicode convertion array overflow.
Michael Niedermayer [Fri, 23 Mar 2012 00:09:04 +0000 (01:09 +0100)]
mov: fix global unicode convertion array overflow.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agommdemux: dont set pkt->size to an invalid value.
Michael Niedermayer [Thu, 22 Mar 2012 23:49:00 +0000 (00:49 +0100)]
mmdemux: dont set pkt->size to an invalid value.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoeatqi: replace break by goto.
Michael Niedermayer [Thu, 22 Mar 2012 23:27:59 +0000 (00:27 +0100)]
eatqi: replace break by goto.

This fixes some heap overread.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoaacdec: reset max_sfb on invalid data.
Michael Niedermayer [Thu, 22 Mar 2012 22:57:45 +0000 (23:57 +0100)]
aacdec: reset max_sfb on invalid data.

Fixes global out of array read.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agovqavideodev: Check image dimensions
Michael Niedermayer [Thu, 22 Mar 2012 22:43:37 +0000 (23:43 +0100)]
vqavideodev: Check image dimensions

Fixes out of heap array read

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 22 Mar 2012 22:16:49 +0000 (23:16 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  xwma: Validate channels and bits_per_coded_sample.
  mov: Do not read past the end of the ctts_data table.
  mov: Add missing terminator to mov_ch_layout_map_1ch.
  asf: reset side data elements on packet copy.
  wmavoice: fix stack overread.
  wmalossless: error out if a subframe is not used by any channel.
  vqa: check palette chunk size before reading data.
  wmalossless: reset sample pointer for each subframe.
  wmalossless: error out on invalid values for order.

Conflicts:
libavcodec/vqavideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoindeo4: check motion vetors.
Michael Niedermayer [Thu, 22 Mar 2012 21:44:54 +0000 (22:44 +0100)]
indeo4: check motion vetors.

Fixes out of heap array read.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agopngenc: make max_packet_size 64bit check check it.
Michael Niedermayer [Thu, 22 Mar 2012 20:09:03 +0000 (21:09 +0100)]
pngenc: make max_packet_size 64bit check check it.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agopng: make ff_png_pass_mask local to pngdec.
Clément Bœsch [Thu, 22 Mar 2012 21:52:55 +0000 (22:52 +0100)]
png: make ff_png_pass_mask local to pngdec.

8 years agoFix libgsm.c compilation after typo in 67b8c8.
Carl Eugen Hoyos [Thu, 22 Mar 2012 21:00:58 +0000 (22:00 +0100)]
Fix libgsm.c compilation after typo in 67b8c8.

8 years agoxwma: Validate channels and bits_per_coded_sample.
Alex Converse [Wed, 21 Mar 2012 17:58:07 +0000 (10:58 -0700)]
xwma: Validate channels and bits_per_coded_sample.

This prevents a SIGFPE later on.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
8 years agomov: Do not read past the end of the ctts_data table.
Alex Converse [Wed, 21 Mar 2012 18:24:10 +0000 (11:24 -0700)]
mov: Do not read past the end of the ctts_data table.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
8 years agomov: Add missing terminator to mov_ch_layout_map_1ch.
Alex Converse [Wed, 21 Mar 2012 16:35:45 +0000 (09:35 -0700)]
mov: Add missing terminator to mov_ch_layout_map_1ch.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: Libav-stable@libav.org
8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 22 Mar 2012 19:58:56 +0000 (20:58 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  FATE: Add ZeroCodec test
  oggparseogm: fix order of arguments of avpriv_set_pts_info().
  pngenc: better upper bound for encoded frame size.
  aiffdec: set block_duration to 1 for PCM codecs that are supported in AIFF-C
  aiffdec: factor out handling of integer PCM for AIFF-C and plain AIFF
  aiffdec: use av_get_audio_frame_duration() to set block_duration for AIFF-C
  aiffdec: do not set bit rate if block duration is unknown
  wmall: output packet only if we have decoded some samples

Conflicts:
libavcodec/pngenc.c
tests/fate/lossless-video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agodcaenc: switch to encode2()
Paul B Mahol [Thu, 22 Mar 2012 19:27:19 +0000 (19:27 +0000)]
dcaenc: switch to encode2()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoSupport dropping audio dts/pts via -async -1.
Reimar Döffinger [Thu, 22 Mar 2012 19:17:42 +0000 (20:17 +0100)]
Support dropping audio dts/pts via -async -1.

Allows working around issue #605.
Note: as a side effect this fixes that -vsync drop
as far as I could tell would not drop pts/dts values
when duplicating frames or when flushing encoder delay.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
8 years agoasf: reset side data elements on packet copy.
Ronald S. Bultje [Wed, 21 Mar 2012 23:10:37 +0000 (16:10 -0700)]
asf: reset side data elements on packet copy.

Prevents crash (double free) when free()ing the original packet.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
8 years agowmavoice: fix stack overread.
Ronald S. Bultje [Wed, 21 Mar 2012 22:47:11 +0000 (15:47 -0700)]
wmavoice: fix stack overread.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
8 years agowmalossless: error out if a subframe is not used by any channel.
Ronald S. Bultje [Wed, 21 Mar 2012 22:43:03 +0000 (15:43 -0700)]
wmalossless: error out if a subframe is not used by any channel.

Prevents infinite loop because min_channel_len never increments.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
8 years agovqa: check palette chunk size before reading data.
Ronald S. Bultje [Wed, 21 Mar 2012 22:19:31 +0000 (15:19 -0700)]
vqa: check palette chunk size before reading data.

Prevents overreads beyond buffer boundaries.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
8 years agowmalossless: reset sample pointer for each subframe.
Ronald S. Bultje [Wed, 21 Mar 2012 22:02:19 +0000 (15:02 -0700)]
wmalossless: reset sample pointer for each subframe.

Prevents overwrites when some subframes only encode some channels.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
8 years agowmalossless: error out on invalid values for order.
Ronald S. Bultje [Wed, 21 Mar 2012 19:40:59 +0000 (12:40 -0700)]
wmalossless: error out on invalid values for order.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
8 years agoFATE: Add ZeroCodec test
Derek Buitenhuis [Mon, 19 Mar 2012 22:23:42 +0000 (18:23 -0400)]
FATE: Add ZeroCodec test

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agooggparseogm: fix order of arguments of avpriv_set_pts_info().
Michael Niedermayer [Thu, 8 Mar 2012 20:11:37 +0000 (21:11 +0100)]
oggparseogm: fix order of arguments of avpriv_set_pts_info().

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agopngenc: better upper bound for encoded frame size.
Anton Khirnov [Wed, 21 Mar 2012 08:48:26 +0000 (09:48 +0100)]
pngenc: better upper bound for encoded frame size.

Fixes encoding very large pictures.

Thanks to Костя for providing the formula.

8 years agolibutvideoenc: switch to ff_alloc_packet2().
Michael Niedermayer [Thu, 22 Mar 2012 18:31:18 +0000 (19:31 +0100)]
libutvideoenc: switch to ff_alloc_packet2().

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolavc: limit realloc() on encoding to the libav compatibility API.
Michael Niedermayer [Thu, 22 Mar 2012 18:12:11 +0000 (19:12 +0100)]
lavc: limit realloc() on encoding to the libav compatibility API.

Neither the old nor new need it.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoVC1: Fix skiploopfilter=all.
Reimar Döffinger [Wed, 21 Mar 2012 21:52:33 +0000 (22:52 +0100)]
VC1: Fix skiploopfilter=all.

It is currently only handled in the parser code for WMV/ASF style
header, but not the one used in the bytestream format used when
muxed into MPEG-TS as on e.g. BluRay.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
8 years agoReplace SSE2 instruction in scalarproduct_float_sse() by SSE equivalent.
ami_stuff [Thu, 22 Mar 2012 18:28:52 +0000 (19:28 +0100)]
Replace SSE2 instruction in scalarproduct_float_sse() by SSE equivalent.

Fixes an AAC decoding issue with the sample from ticket #213 on machines
with SSE but without SSE2.
Based on 89411a by Reimar.