]> git.sesse.net Git - ffmpeg/log
ffmpeg
12 years agoeval: fix infinite loop on opensolaris x86.
Michael Niedermayer [Thu, 1 Mar 2012 02:24:45 +0000 (03:24 +0100)]
eval: fix infinite loop on opensolaris x86.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 1 Mar 2012 00:13:16 +0000 (01:13 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master: (58 commits)
  amrnbdec: check frame size before decoding.
  cscd: use negative error values to indicate decode_init() failures.
  h264: prevent overreads in intra PCM decoding.
  FATE: do not decode audio in the nuv test.
  dxa: set audio stream time base using the sample rate
  psx-str: do not allow seeking by bytes
  asfdec: Do not set AVCodecContext.frame_size
  vqf: set packet parameters after av_new_packet()
  mpegaudiodec: use DSPUtil.butterflies_float().
  FATE: add mp3 test for sample that exhibited false overreads
  fate: add cdxl test for bit line plane arrangement
  vmnc: return error on decode_init() failure.
  libvorbis: add/update error messages
  libvorbis: use AVFifoBuffer for output packet buffer
  libvorbis: remove unneeded e_o_s check
  libvorbis: check return values for functions that can return errors
  libvorbis: use float input instead of s16
  libvorbis: do not flush libvorbis analysis if dsp state was not initialized
  libvorbis: use VBR by default, with default quality of 3
  libvorbis: fix use of minrate/maxrate AVOptions
  ...

Conflicts:
Changelog
doc/APIchanges
libavcodec/avcodec.h
libavcodec/dpxenc.c
libavcodec/libvorbis.c
libavcodec/vmnc.c
libavformat/asfdec.c
libavformat/id3v2enc.c
libavformat/internal.h
libavformat/mp3enc.c
libavformat/utils.c
libavformat/version.h
libswscale/utils.c
tests/fate/video.mak
tests/ref/fate/nuv
tests/ref/fate/prores-alpha
tests/ref/lavf/ffm
tests/ref/vsynth1/prores
tests/ref/vsynth2/prores

Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoamrnbdec: check frame size before decoding.
Vitor Sessak [Wed, 29 Feb 2012 21:09:10 +0000 (22:09 +0100)]
amrnbdec: check frame size before decoding.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
12 years agocscd: use negative error values to indicate decode_init() failures.
Ronald S. Bultje [Wed, 29 Feb 2012 21:55:09 +0000 (13:55 -0800)]
cscd: use negative error values to indicate decode_init() failures.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
12 years agoh264: prevent overreads in intra PCM decoding.
Ronald S. Bultje [Wed, 29 Feb 2012 02:48:27 +0000 (18:48 -0800)]
h264: prevent overreads in intra PCM decoding.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
12 years agoFATE: do not decode audio in the nuv test.
Justin Ruggles [Fri, 20 Jan 2012 04:47:48 +0000 (23:47 -0500)]
FATE: do not decode audio in the nuv test.

We already have sufficient coverage for 16-bit pcm.

12 years agodxa: set audio stream time base using the sample rate
Justin Ruggles [Thu, 19 Jan 2012 20:55:18 +0000 (15:55 -0500)]
dxa: set audio stream time base using the sample rate

12 years agopsx-str: do not allow seeking by bytes
Justin Ruggles [Tue, 17 Jan 2012 15:16:34 +0000 (10:16 -0500)]
psx-str: do not allow seeking by bytes

12 years agoasfdec: Do not set AVCodecContext.frame_size
Justin Ruggles [Fri, 13 Jan 2012 23:20:18 +0000 (18:20 -0500)]
asfdec: Do not set AVCodecContext.frame_size

12 years agovqf: set packet parameters after av_new_packet()
Justin Ruggles [Thu, 19 Jan 2012 20:48:11 +0000 (15:48 -0500)]
vqf: set packet parameters after av_new_packet()

Otherwise the values are overwritten.

12 years agolavc: fix 10l oversight in realloc of avcodec_encode_video2.
Michael Niedermayer [Wed, 29 Feb 2012 20:33:00 +0000 (21:33 +0100)]
lavc: fix 10l oversight in realloc of avcodec_encode_video2.

Packets are not guranteed to be allocated by av_malloc().

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agodca: dont overread dca_default_coeffs.
Michael Niedermayer [Wed, 29 Feb 2012 20:14:17 +0000 (21:14 +0100)]
dca: dont overread dca_default_coeffs.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agodca: Check scale_sum.
Michael Niedermayer [Wed, 29 Feb 2012 19:47:47 +0000 (20:47 +0100)]
dca: Check scale_sum.

Fixes a out of array read.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agodca: Check LFEScaleIndex.
Michael Niedermayer [Wed, 29 Feb 2012 17:09:51 +0000 (18:09 +0100)]
dca: Check LFEScaleIndex.

Its not clear from the spec what to do with values larger than 127
so iam opting for the safe side and ask for a sample.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agompegaudiodec: use DSPUtil.butterflies_float().
Vitor Sessak [Wed, 29 Feb 2012 20:06:13 +0000 (21:06 +0100)]
mpegaudiodec: use DSPUtil.butterflies_float().

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
12 years agoFATE: add mp3 test for sample that exhibited false overreads
Justin Ruggles [Fri, 24 Feb 2012 21:47:28 +0000 (16:47 -0500)]
FATE: add mp3 test for sample that exhibited false overreads

related to b7165426917f91ebcad84bdff366824f03b32bfe
Error messages and audible artifacts were fixed in that commit.

12 years agofate: add cdxl test for bit line plane arrangement
Paul B Mahol [Sun, 26 Feb 2012 19:23:50 +0000 (19:23 +0000)]
fate: add cdxl test for bit line plane arrangement

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
12 years agovmnc: return error on decode_init() failure.
Ronald S. Bultje [Wed, 29 Feb 2012 03:00:48 +0000 (19:00 -0800)]
vmnc: return error on decode_init() failure.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
12 years agolibvorbis: add/update error messages
Justin Ruggles [Wed, 29 Feb 2012 05:02:55 +0000 (00:02 -0500)]
libvorbis: add/update error messages

also use AVERROR codes for some return values instead of -1

12 years agolibvorbis: use AVFifoBuffer for output packet buffer
Justin Ruggles [Wed, 29 Feb 2012 03:39:07 +0000 (22:39 -0500)]
libvorbis: use AVFifoBuffer for output packet buffer

simplifies the code and does less memmove()

12 years agolibvorbis: remove unneeded e_o_s check
Justin Ruggles [Wed, 29 Feb 2012 02:02:22 +0000 (21:02 -0500)]
libvorbis: remove unneeded e_o_s check

vorbis_bitrate_flushpacket() does not return any packets that should not be
output in the bitstream.

12 years agolibvorbis: check return values for functions that can return errors
Justin Ruggles [Wed, 29 Feb 2012 02:00:33 +0000 (21:00 -0500)]
libvorbis: check return values for functions that can return errors

12 years agolibvorbis: use float input instead of s16
Justin Ruggles [Wed, 29 Feb 2012 00:55:10 +0000 (19:55 -0500)]
libvorbis: use float input instead of s16

libvorbis takes float input, so we can just deinterleave/reorder the input
as-is instead of also converting.

12 years agolibvorbis: do not flush libvorbis analysis if dsp state was not initialized
Justin Ruggles [Wed, 29 Feb 2012 00:51:25 +0000 (19:51 -0500)]
libvorbis: do not flush libvorbis analysis if dsp state was not initialized

Fixes a segfault if init() fails before initializing the dsp state

12 years agolibvorbis: use VBR by default, with default quality of 3
Justin Ruggles [Wed, 29 Feb 2012 00:33:07 +0000 (19:33 -0500)]
libvorbis: use VBR by default, with default quality of 3

12 years agolibvorbis: fix use of minrate/maxrate AVOptions
Justin Ruggles [Tue, 28 Feb 2012 23:52:30 +0000 (18:52 -0500)]
libvorbis: fix use of minrate/maxrate AVOptions

- enable the options for audio encoding
- properly check for user-set maxrate
- use correct calling order in vorbis_encode_setup_managed()

12 years agolibvorbis: cosmetics: renaming/pretty-printing/comments/unused code
Justin Ruggles [Tue, 28 Feb 2012 23:51:04 +0000 (18:51 -0500)]
libvorbis: cosmetics: renaming/pretty-printing/comments/unused code

12 years ago(e)ac3enc: select a default bit rate based on the channel layout
Justin Ruggles [Thu, 23 Feb 2012 02:45:06 +0000 (21:45 -0500)]
(e)ac3enc: select a default bit rate based on the channel layout

12 years agoac3enc: choose the closest bit rate to the one requested instead of failing
Justin Ruggles [Thu, 23 Feb 2012 02:26:09 +0000 (21:26 -0500)]
ac3enc: choose the closest bit rate to the one requested instead of failing

12 years agorpza: error out on buffer overreads.
Ronald S. Bultje [Wed, 29 Feb 2012 01:04:33 +0000 (17:04 -0800)]
rpza: error out on buffer overreads.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
12 years agoqtrle: return error on decode_init() failure.
Ronald S. Bultje [Wed, 29 Feb 2012 03:00:39 +0000 (19:00 -0800)]
qtrle: return error on decode_init() failure.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
12 years agoswscale: fix another integer overflow.
Ronald S. Bultje [Wed, 29 Feb 2012 02:21:31 +0000 (18:21 -0800)]
swscale: fix another integer overflow.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
12 years agodpxenc: Don't include the libavcodec ident if bitexact mode is enabled
Martin Storsjö [Wed, 29 Feb 2012 15:35:00 +0000 (17:35 +0200)]
dpxenc: Don't include the libavcodec ident if bitexact mode is enabled

This avoids breaking fate every time the lavc version is bumped.

Signed-off-by: Martin Storsjö <martin@martin.st>
12 years agoencode_video2: shrink packet after encoding.
Nicolas George [Wed, 29 Feb 2012 13:39:50 +0000 (14:39 +0100)]
encode_video2: shrink packet after encoding.

With the encode2 API, encoders allocate huge packets to be
sure they have enough room (a typical case is mpeg4, which
allocs ~10M for 1280x768 yuv420p) but only actually use a
very small part of the buffer.

12 years agortpenc: Fix setting the max packet size
Martin Storsjö [Wed, 29 Feb 2012 12:50:06 +0000 (14:50 +0200)]
rtpenc: Fix setting the max packet size

This fixes cases where the user had specified one desired MTU
via an option, and the protocol indicates another one.

Signed-off-by: Martin Storsjö <martin@martin.st>
12 years agoAdd a minor bump, changelog/APIchanges entry and some documentation for APIC support.
Anton Khirnov [Tue, 28 Feb 2012 11:07:53 +0000 (12:07 +0100)]
Add a minor bump, changelog/APIchanges entry and some documentation for APIC support.

12 years agomp3enc: write attached pictures (APIC).
Anton Khirnov [Tue, 28 Feb 2012 08:52:05 +0000 (09:52 +0100)]
mp3enc: write attached pictures (APIC).

12 years agomp3enc: move mp3_write_xing() further up in the file.
Anton Khirnov [Wed, 29 Feb 2012 08:11:26 +0000 (09:11 +0100)]
mp3enc: move mp3_write_xing() further up in the file.

It will be need by new functions called from mp3_write_trailer().

12 years agoid3v2enc: add a function for writing attached pictures.
Anton Khirnov [Mon, 27 Feb 2012 21:51:28 +0000 (22:51 +0100)]
id3v2enc: add a function for writing attached pictures.

Unused so far.

12 years agoid3v2enc: fix writing frame sizes for ID3v2.3
Anton Khirnov [Tue, 28 Feb 2012 10:45:07 +0000 (11:45 +0100)]
id3v2enc: fix writing frame sizes for ID3v2.3

Frame sizes in ID3v2.3 are not synchsafe, they are simply 32be numbers.

In practice this bug is not noticeable unless the frame size takes more
than 7 bits (which is almost never for text frames).

12 years agoid3v2enc: split ff_id3v2_write().
Anton Khirnov [Mon, 27 Feb 2012 21:08:50 +0000 (22:08 +0100)]
id3v2enc: split ff_id3v2_write().

This will allow writing the tag in several steps, needed for writing
attached pictures.

12 years agoid3v2enc: make id3v2_put_size take only an AVIOContext.
Anton Khirnov [Mon, 27 Feb 2012 20:48:37 +0000 (21:48 +0100)]
id3v2enc: make id3v2_put_size take only an AVIOContext.

It has no need of full AVFormatContext.

12 years agoid3v2: remove unused ff_id3v2_read().
Anton Khirnov [Sat, 25 Feb 2012 08:53:59 +0000 (09:53 +0100)]
id3v2: remove unused ff_id3v2_read().

Rename ff_id3v2_read_all to ff_id3v2_read().

12 years agolavf: export id3v2 attached pictures as streams.
Anton Khirnov [Sat, 25 Feb 2012 08:53:35 +0000 (09:53 +0100)]
lavf: export id3v2 attached pictures as streams.

12 years agolavf: generic code for exporting attached pictures.
Anton Khirnov [Sat, 25 Feb 2012 17:05:55 +0000 (18:05 +0100)]
lavf: generic code for exporting attached pictures.

12 years agoid3v2: read attached pictures and export them in ID3v2ExtraMeta.
Anton Khirnov [Sat, 25 Feb 2012 08:45:38 +0000 (09:45 +0100)]
id3v2: read attached pictures and export them in ID3v2ExtraMeta.

12 years agolavf: move CodecMime from matroska.h to internal.h
Anton Khirnov [Wed, 19 Jan 2011 09:21:29 +0000 (10:21 +0100)]
lavf: move CodecMime from matroska.h to internal.h

it will be useful for attached pictures in ID3v2

12 years agoswfdec: do not set codec timebase.
Anton Khirnov [Wed, 29 Feb 2012 07:07:57 +0000 (08:07 +0100)]
swfdec: do not set codec timebase.

It is not supposed to be set outside of lavc.

Fixes a divide by zero when the stored framerate is 0.

12 years agoprores: store and retrieve extended colourspace information
Kostya Shishkov [Tue, 28 Feb 2012 18:44:07 +0000 (19:44 +0100)]
prores: store and retrieve extended colourspace information

Based on the patch by Phil Barrett.

12 years agoproresenc: correct edge emulation
Phil Barrett [Tue, 28 Feb 2012 18:26:11 +0000 (19:26 +0100)]
proresenc: correct edge emulation

Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
12 years agoprores: handle 444 chroma in right order
Kostya Shishkov [Tue, 28 Feb 2012 18:03:09 +0000 (19:03 +0100)]
prores: handle 444 chroma in right order

ProRes codes chroma blocks in 444 mode in different order than luma blocks,
so make both decoder and encoder read/write chroma blocks in right order.

Reported by Phil Barrett

12 years agompegvideo_enc: add quantizer_noise_shaping private option.
Anton Khirnov [Mon, 27 Feb 2012 19:06:23 +0000 (20:06 +0100)]
mpegvideo_enc: add quantizer_noise_shaping private option.

Deprecate corresponding AVCodecContext field.

12 years agolavc: deprecate AVCodecContext.inter_threshold.
Anton Khirnov [Mon, 27 Feb 2012 18:58:41 +0000 (19:58 +0100)]
lavc: deprecate AVCodecContext.inter_threshold.

It's unused.

12 years agolavc: deprecate AVCodecContext.color_table_id.
Anton Khirnov [Mon, 27 Feb 2012 18:53:21 +0000 (19:53 +0100)]
lavc: deprecate AVCodecContext.color_table_id.

It's currently only used as temporary storage by the mov demuxer. Make
it use a local variable instead.

12 years agoavplay: remove an unused variable.
Anton Khirnov [Mon, 27 Feb 2012 18:44:41 +0000 (19:44 +0100)]
avplay: remove an unused variable.

12 years agompegvideo_enc: add chroma/luma_elim_threshold private options.
Anton Khirnov [Mon, 27 Feb 2012 18:09:49 +0000 (19:09 +0100)]
mpegvideo_enc: add chroma/luma_elim_threshold private options.

Deprecate corresponding AVCodecContext fields.

12 years agompegvideo_enc: add cbp_rd flag to mpv_flags.
Anton Khirnov [Mon, 27 Feb 2012 11:23:19 +0000 (12:23 +0100)]
mpegvideo_enc: add cbp_rd flag to mpv_flags.

Deprecate CODEC_FLAG_CBP_RD.

12 years agompegvideo_enc: add qp_rd flag to mpv_flags.
Anton Khirnov [Mon, 27 Feb 2012 11:23:19 +0000 (12:23 +0100)]
mpegvideo_enc: add qp_rd flag to mpv_flags.

Deprecate CODEC_FLAG_QP_RD.

12 years agompegvideo_enc: add strict_gop flag to mpv_flags.
Anton Khirnov [Mon, 27 Feb 2012 11:23:19 +0000 (12:23 +0100)]
mpegvideo_enc: add strict_gop flag to mpv_flags.

Deprecate CODEC_FLAG2_STRICT_GOP.

12 years agolavc: add -mpv_flags to mpegvideo_enc-based encoders.
Anton Khirnov [Mon, 27 Feb 2012 11:12:19 +0000 (12:12 +0100)]
lavc: add -mpv_flags to mpegvideo_enc-based encoders.

Deprecate CODEC_FLAG2_SKIP_RD in favor of the corresponding mpv_flags
flag.

12 years agofate: disable deshake test as it isnt binary identical across archs.
Michael Niedermayer [Wed, 29 Feb 2012 05:44:19 +0000 (06:44 +0100)]
fate: disable deshake test as it isnt binary identical across archs.

probably due to float rounding

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoaacdec: Support stereo streams that erroneously signal predefined channel configurati...
Michael Niedermayer [Fri, 21 Oct 2011 09:41:40 +0000 (09:41 +0000)]
aacdec: Support stereo streams that erroneously signal predefined channel configuration 1 (mono).

[alex.converse@mgail.com]
Move code to get_che()
Update for AAC new channel configuration interface
Only set chan_config if output_configure succeeds.

Signed-off-by: Alex Converse <alex.converse@gmail.com>
12 years agoaacdec: Reshuffle functions so get_che() can call set_default_channel_config() and...
Alex Converse [Tue, 28 Feb 2012 18:36:29 +0000 (10:36 -0800)]
aacdec: Reshuffle functions so get_che() can call set_default_channel_config() and output_configure().

12 years agovmnc: Fail if bpp is not recognized instead of crashing.
Michael Niedermayer [Wed, 29 Feb 2012 05:21:44 +0000 (06:21 +0100)]
vmnc: Fail if bpp is not recognized instead of crashing.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoget_buffers: Check that pix_fmt is not NONE.
Michael Niedermayer [Wed, 29 Feb 2012 05:20:22 +0000 (06:20 +0100)]
get_buffers: Check that pix_fmt is not NONE.

This is somewhat redundant as no decoder should call get_buffer() with such argument.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoalsdec: Check that quantized parcor coeffs are within range.
Michael Niedermayer [Wed, 29 Feb 2012 05:10:17 +0000 (06:10 +0100)]
alsdec: Check that quantized parcor coeffs are within range.

ALS spec:
11.6.3.1.1 Quantization and encoding of parcor coefficients
...
In all cases the resulting quantized values ak are restricted to the range [-64,63].

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agolibpostproc: fix out of array accesses detected by AddressSanitizer.
Michael Niedermayer [Wed, 29 Feb 2012 03:25:13 +0000 (04:25 +0100)]
libpostproc: fix out of array accesses detected by AddressSanitizer.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agovf_deshake: try to fix memleak
Michael Niedermayer [Wed, 29 Feb 2012 01:33:32 +0000 (02:33 +0100)]
vf_deshake: try to fix memleak

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agofate: switch lavfi-pp targets which need bitexact flags to use them.
Michael Niedermayer [Wed, 29 Feb 2012 01:24:59 +0000 (02:24 +0100)]
fate: switch lavfi-pp targets which need bitexact flags to use them.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agolibpostproc: add bitexact mode, which is needed for regression testing.
Michael Niedermayer [Wed, 29 Feb 2012 01:05:54 +0000 (02:05 +0100)]
libpostproc: add bitexact mode, which is needed for regression testing.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agofate: More libpostproc tests to improve coverage.
Michael Niedermayer [Tue, 28 Feb 2012 19:54:13 +0000 (20:54 +0100)]
fate: More libpostproc tests to improve coverage.

Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agovp56: error out on invalid stream dimensions.
Ronald S. Bultje [Thu, 23 Feb 2012 19:19:33 +0000 (11:19 -0800)]
vp56: error out on invalid stream dimensions.

Prevents crashes when playing corrupt vp5/6 streams.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
12 years agocook: avoid out of global array read.
Michael Niedermayer [Tue, 28 Feb 2012 19:08:47 +0000 (20:08 +0100)]
cook: avoid out of global array read.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoasf: don't seek back on EOF.
Ronald S. Bultje [Wed, 29 Feb 2012 00:13:46 +0000 (16:13 -0800)]
asf: don't seek back on EOF.

Seeking back on EOF will reset the EOF flag, causing us to re-enter
the loop to find the next marker in the ASF file, thus potentially
causing an infinite loop.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
12 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 28 Feb 2012 23:30:35 +0000 (00:30 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  adpcm: Clip step_index values read from the bitstream at the beginning of each frame.
  oma: don't read beyond end of leaf_table.
  doxygen: Remove documentation for non-existing parameters; misc small fixes.
  Indeo3: fix crashes on corrupt bitstreams.
  msmpeg4: Replace forward declaration by proper #include.
  segment: implement wrap around
  avf: reorder AVStream and AVFormatContext
  aacdec: Remove erroneous reference to global gain from the out of bounds scalefactor error message.

Conflicts:
libavcodec/indeo3.c
libavformat/avformat.h
libavutil/avutil.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoasf: error out on ridiculously large minpktsize values.
Ronald S. Bultje [Fri, 17 Feb 2012 20:21:22 +0000 (12:21 -0800)]
asf: error out on ridiculously large minpktsize values.

They cause various issues further down in demuxing.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
12 years agoadpcm_xa: Check filter validity.
Michael Niedermayer [Tue, 28 Feb 2012 21:53:20 +0000 (22:53 +0100)]
adpcm_xa: Check filter validity.

Fixes out of global array read.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoadpcm: Clip step_index values read from the bitstream at the beginning of each frame.
Alex Converse [Tue, 28 Feb 2012 19:50:22 +0000 (11:50 -0800)]
adpcm: Clip step_index values read from the bitstream at the beginning of each frame.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
12 years agooma: don't read beyond end of leaf_table.
Ronald S. Bultje [Tue, 28 Feb 2012 19:35:36 +0000 (11:35 -0800)]
oma: don't read beyond end of leaf_table.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
12 years agodoxygen: Remove documentation for non-existing parameters; misc small fixes.
Diego Biurrun [Tue, 21 Feb 2012 22:33:01 +0000 (23:33 +0100)]
doxygen: Remove documentation for non-existing parameters; misc small fixes.

12 years agomxfdec: set pixel format for cdci picture formats
Philip de Nier [Tue, 28 Feb 2012 14:16:39 +0000 (14:16 +0000)]
mxfdec: set pixel format for cdci picture formats

The properties of the CDCI Descriptor are insufficient to specify
the pixel format for uncompressed picture data. SMPTE 377-1 and
RP224v10 have defined a set of picture coding labels to indicate what
formatting was used.

This patch uses 2 labels to detect UYVY422 or YUYV422 pixel formats.

It defaults to UYVY422 for 8-bit 4:2:2 pictures to support files
that were created before the coding labels were introduced ~2008

The codec pix_fmt default was changed from 0 (PIX_FMT_YUV420P) to
-1 (PIX_FMT_NONE)

Reviewed-by: Baptiste Coudurier <baptiste.coudurier@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agomxfdec: detect uncomp pictures using essence container ul
Philip de Nier [Tue, 28 Feb 2012 14:16:38 +0000 (14:16 +0000)]
mxfdec: detect uncomp pictures using essence container ul

This supports detection of uncompressed picture in files that
didn't include a Picture Coding Label. The lables weren't
available until SMPTE 377-1 and RP224v10

Reviewed-by: Baptiste Coudurier <baptiste.coudurier@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agomxf: add uncompressed 422 8-bit rawvideo label
Philip de Nier [Tue, 28 Feb 2012 14:16:37 +0000 (14:16 +0000)]
mxf: add uncompressed 422 8-bit rawvideo label

Reviewed-by: Baptiste Coudurier <baptiste.coudurier@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agomxfdec: set track edit rate num/den in expected order
Philip de Nier [Tue, 28 Feb 2012 14:16:36 +0000 (14:16 +0000)]
mxfdec: set track edit rate num/den in expected order

This matches the order used for the index table edit rate.

Reviewed-by: Baptiste Coudurier <baptiste.coudurier@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agomxf: fix v210 label matching len
Philip de Nier [Tue, 28 Feb 2012 14:16:35 +0000 (14:16 +0000)]
mxf: fix v210 label matching len

Must check all 16 bytes because there is a planar 10-bit format
label that has equal first 15 bytes

Review-by: Baptiste Coudurier <baptiste.coudurier@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agocook: add const to quant_index_table of categorize()
Michael Niedermayer [Tue, 28 Feb 2012 19:07:26 +0000 (20:07 +0100)]
cook: add const to quant_index_table of categorize()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoIndeo3: fix crashes on corrupt bitstreams.
Ronald S. Bultje [Tue, 28 Feb 2012 18:22:28 +0000 (10:22 -0800)]
Indeo3: fix crashes on corrupt bitstreams.

Splits at borders of cells are invalid, since it leaves one of the
cells with a width/height of zero. Also, propagate errors on buffer
allocation failures, so we don't continue decoding (which crashes).

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
12 years agoomadec: Fix wrong number of array elements.
Michael Niedermayer [Tue, 28 Feb 2012 17:41:44 +0000 (18:41 +0100)]
omadec: Fix wrong number of array elements.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoffmpeg: Fix division by 0 due to invalid timebase
Michael Niedermayer [Tue, 28 Feb 2012 17:41:01 +0000 (18:41 +0100)]
ffmpeg: Fix division by 0 due to invalid timebase

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoadd v210 to intra only list to allow "-vcodec copy"
Philip de Nier [Tue, 28 Feb 2012 14:16:41 +0000 (14:16 +0000)]
add v210 to intra only list to allow "-vcodec copy"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agotests: add libpostproc test
Michael Niedermayer [Tue, 28 Feb 2012 04:18:08 +0000 (05:18 +0100)]
tests: add libpostproc test

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agomsmpeg4: Replace forward declaration by proper #include.
Diego Biurrun [Sat, 18 Feb 2012 12:43:59 +0000 (13:43 +0100)]
msmpeg4: Replace forward declaration by proper #include.

12 years agosegment: implement wrap around
Luca Barbato [Sat, 25 Feb 2012 20:45:23 +0000 (21:45 +0100)]
segment: implement wrap around

Provide a way to wrap around the segment index so pseudostreaming
live through a web server and html5 browser is simpler.

Also ensure that 0 (disable) is a valid value across the options
providing wrap around.

12 years agoavf: reorder AVStream and AVFormatContext
Luca Barbato [Mon, 27 Feb 2012 21:40:11 +0000 (22:40 +0100)]
avf: reorder AVStream and AVFormatContext

12 years agopmpdec: Check for zero audio packets.
Michael Niedermayer [Tue, 28 Feb 2012 06:19:37 +0000 (07:19 +0100)]
pmpdec: Check for zero audio packets.

This fixes a division by 0.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 28 Feb 2012 02:38:58 +0000 (03:38 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avcodec_default_reget_buffer(): fix compilation in DEBUG mode
  fate: Overhaul WavPack coverage
  h264: fix mmxext chroma deblock to use correct TC values.
  flvdec: Remove the now redundant check for known broken metadata creator
  flvdec: Validate index entries added from metadata while reading
  rtsp: Handle requests from server to client
  movenc: use timestamps instead of frame_size for samples-per-packet
  movenc: use the first cluster duration as the tfhd default duration
  movenc: factorize calculation of cluster duration into a separate function
  doc/APIchanges: fill in missing dates and hashes.
  lavc: reorder AVCodecContext fields.
  lavc: reorder AVFrame fields.

Conflicts:
doc/APIchanges
libavcodec/avcodec.h
libavformat/flvdec.c
libavformat/movenc.c
tests/fate/lossless-audio.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoaacdec: Remove erroneous reference to global gain from the out of bounds scalefactor...
Alex Converse [Thu, 23 Feb 2012 19:08:47 +0000 (11:08 -0800)]
aacdec: Remove erroneous reference to global gain from the out of bounds scalefactor error message.

12 years agolibpostproc: add pp=help support to print the help text via av_log()
Michael Niedermayer [Mon, 27 Feb 2012 20:48:18 +0000 (21:48 +0100)]
libpostproc: add pp=help support to print the help text via av_log()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoavcodec_default_reget_buffer(): fix compilation in DEBUG mode
Diego Biurrun [Mon, 27 Feb 2012 19:52:06 +0000 (20:52 +0100)]
avcodec_default_reget_buffer(): fix compilation in DEBUG mode

12 years agoExit ffmpeg if swr_convert() fails.
Carl Eugen Hoyos [Mon, 27 Feb 2012 18:01:53 +0000 (19:01 +0100)]
Exit ffmpeg if swr_convert() fails.