]>
git.sesse.net Git - ffmpeg/log
Clément Bœsch [Thu, 5 Jan 2012 22:07:18 +0000 (23:07 +0100)]
log: use a different color for debug (green).
Paul B Mahol [Mon, 9 Jan 2012 21:35:19 +0000 (22:35 +0100)]
pngdec: show verbose message for unsupported files
Michael Niedermayer [Mon, 9 Jan 2012 15:02:11 +0000 (16:02 +0100)]
cabac: 3rd try at working around a compiler bug in clang.
Switch to a broader detection of versions.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Sun, 8 Jan 2012 00:44:02 +0000 (01:44 +0100)]
ffprobe: change formatting logic in the JSON writer
Print a "\n" at the end of each section, also print the section name in
the section print function, print the chapter name only in case the
chapter contains multiple entries.
Increase textual output readability - different sections can be
distinguished more easily.
Stefano Sabatini [Sun, 8 Jan 2012 00:20:03 +0000 (01:20 +0100)]
ffprobe: implement generic reindent logic in the JSON writer
Clarify/generalize indent logic.
Reimar Döffinger [Sun, 8 Jan 2012 11:19:48 +0000 (12:19 +0100)]
sgidec: make compiler optimize away memcpy call in inner loop.
Using an always_inline function makes the memcpy length a constant,
any reasonable compiler will replace it by a single mov instruction
without us having to duplicate the actual code.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Reimar Döffinger [Sun, 8 Jan 2012 15:56:46 +0000 (16:56 +0100)]
rawdec: use av_shrink_packet.
This fixes reads of uninitialized data by the parser when running
FATE sample h264-conformance/SL1_SVA_B.264.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Marton Balint [Mon, 9 Jan 2012 00:42:38 +0000 (01:42 +0100)]
libswresample: introduce int swr_set_compensation() instead of void swr_compensate()
The new version returns AVERROR(EINVAL) is the specified paramters are invalid,
and also creates the resampler if none was used so far.
Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 9 Jan 2012 01:59:10 +0000 (02:59 +0100)]
fate: add bitexact and idct to x8intra
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 9 Jan 2012 02:42:46 +0000 (03:42 +0100)]
cabac: Disable get_cabac_inline_x86() for clang 2.9 on x86_32
This should finally fix the compilation issue on darwin
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 9 Jan 2012 02:32:06 +0000 (03:32 +0100)]
Revert "Revert commit
599b4c6efddaed33b1667c386b34b07729ba732b "
This reverts commit
c4f237a98175438e76da64c51cc6fe613f8d767e .
This didnt fix compilation on darwin with current clang.
Michael Niedermayer [Mon, 9 Jan 2012 00:12:48 +0000 (01:12 +0100)]
lavf: Add forgotten line from
212fd3a1f1121a9db20c478f1fccf15e8bb53c94
This fixes a tiny memleak.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 8 Jan 2012 23:32:38 +0000 (00:32 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
bfi: Use bytestream2 functions to prevent buffer overreads.
dpcm: Fix invalid writes
utvideo: frame multithreading.
vorbis: An additional defense in the Vorbis codec.
vorbisdec: Fix decoding bug with channel handling
Conflicts:
libavcodec/dpcm.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 7 Jan 2012 19:17:50 +0000 (20:17 +0100)]
ljpegdec: Support MCU in ljpeg_decode_yuv_scan()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Aneesh Dogra [Sun, 8 Jan 2012 19:57:58 +0000 (01:27 +0530)]
bfi: Use bytestream2 functions to prevent buffer overreads.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Laurentiu Ion [Sun, 8 Jan 2012 21:05:37 +0000 (23:05 +0200)]
dpcm: Fix invalid writes
Fixes bug: #152
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Aneesh Dogra [Sun, 8 Jan 2012 19:19:46 +0000 (00:49 +0530)]
utvideo: frame multithreading.
>> time ./avconv -i file.avi -f null -
Before : real 0m7.784s
After : real 0m3.662s
Tested on a Intel Core i3 Processor (2 cores, 4 threads).
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Michael Niedermayer [Sun, 8 Jan 2012 19:26:49 +0000 (20:26 +0100)]
Merge remote-tracking branch 'dilaroga/master'
* dilaroga/master:
vda: cosmetic.
vda: removes useless doxygen command.
vda: uses pthreads directly.
vda: convert 3 byte NAL sizes to 4 byte.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 8 Jan 2012 17:37:19 +0000 (18:37 +0100)]
ipmovie: Fix passing resolution changes on.
Fixes Ticket676
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Sun, 8 Jan 2012 16:52:54 +0000 (16:52 +0000)]
tta: remove obsolete and useless error message
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Sun, 8 Jan 2012 19:22:17 +0000 (20:22 +0100)]
Support 48bit rgb pam encoding.
Sebastien Zwickert [Sun, 8 Jan 2012 19:22:12 +0000 (20:22 +0100)]
vda: cosmetic.
Sebastien Zwickert [Sun, 8 Jan 2012 19:22:12 +0000 (20:22 +0100)]
vda: removes useless doxygen command.
Sebastien Zwickert [Sun, 8 Jan 2012 19:22:12 +0000 (20:22 +0100)]
vda: uses pthreads directly.
Sebastien Zwickert [Sun, 8 Jan 2012 19:22:12 +0000 (20:22 +0100)]
vda: convert 3 byte NAL sizes to 4 byte.
Carl Eugen Hoyos [Sun, 8 Jan 2012 19:20:29 +0000 (20:20 +0100)]
Support 16bit gray pam encoding.
Carl Eugen Hoyos [Sun, 8 Jan 2012 19:16:57 +0000 (20:16 +0100)]
Support decoding 32bit sunrast images.
Fixes ticket #895.
Clément Bœsch [Sun, 8 Jan 2012 17:14:38 +0000 (18:14 +0100)]
fate: add generic rules for most of the remaining tests/fate/*.mak files.
Reimar Döffinger [Sun, 8 Jan 2012 17:17:07 +0000 (18:17 +0100)]
indeo4, swresample: add some missing static/const to tables.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Reimar Döffinger [Sun, 8 Jan 2012 11:47:27 +0000 (12:47 +0100)]
Add wmv8-x8intra fate test.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Reimar Döffinger [Sun, 8 Jan 2012 11:01:59 +0000 (12:01 +0100)]
Fix incorrect increment in sgidec.c
Fixes trac issue #899.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Clément Bœsch [Tue, 3 Jan 2012 22:47:09 +0000 (23:47 +0100)]
lavfi: add audio silencedetect filter.
Stefano Sabatini [Sat, 7 Jan 2012 19:41:35 +0000 (20:41 +0100)]
ffprobe: use more meaningful names for writer chapter/section header/footer function
The passed argument is supposed to be the chapter/section name, rather
than the header/footer. Less confusing.
Stefano Sabatini [Sun, 8 Jan 2012 09:40:11 +0000 (10:40 +0100)]
ffprobe: use "%*" printf syntax in XML_INDENT() in place of a loop
Possibly faster/cleaner.
Suggested-By: Clément Bœsch <ubitux@gmail.com>
Chris Evans [Thu, 5 Jan 2012 20:25:41 +0000 (21:25 +0100)]
vorbis: An additional defense in the Vorbis codec.
Fixes Bug: #190
Chromium Bug: #100543
Related to CVE-2011-3893
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
Michael Niedermayer [Sun, 8 Jan 2012 03:35:18 +0000 (04:35 +0100)]
fate: enable wc4-xan test, the sample is now on our rsync server.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 8 Jan 2012 00:29:15 +0000 (01:29 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master: (29 commits)
cabac: Move code only used within the CABAC test program into the test program.
vp56: Drop unnecessary cabac.h #include.
h264-test: Initialize AVCodecContext.av_class.
build: Skip compiling network.h and rtsp.h if networking is not enabled.
cosmetics: drop some pointless parentheses
Disable annoying warning without changing behavior
faq: Solutions for common problems with sample paths when running FATE.
avcodec: attempt to clarify the CODEC_CAP_DELAY documentation
avcodec: fix avcodec_encode_audio() documentation.
FATE: xmv-demux test; exercise the XMV demuxer without decoding the perceptual codecs inside.
vqf: recognize more metadata chunks
FATE test: BMV demuxer and associated video and audio decoders.
FATE: indeo4 video decoder test.
FATE: update xxan-wc4 test to a sample with more code coverage.
Change the recent h264_mp4toannexb bitstream filter test to output to an elementary stream rather than a program stream.
g722enc: validate AVCodecContext.trellis
g722enc: set frame_size, and also handle an odd number of input samples
g722enc: split encoding into separate functions for trellis vs. no trellis
mpegaudiodec: Use clearer pointer math
tta: Fix returned error code at EOF
...
Conflicts:
libavcodec/h264.c
libavcodec/indeo3.c
libavcodec/interplayvideo.c
libavcodec/ivi_common.c
libavcodec/libxvidff.c
libavcodec/mpegvideo.c
libavcodec/ppc/mpegvideo_altivec.c
libavcodec/tta.c
libavcodec/utils.c
libavfilter/vsrc_buffer.c
libavformat/Makefile
tests/fate/indeo.mak
tests/ref/acodec/g722
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 7 Jan 2012 23:08:52 +0000 (00:08 +0100)]
g723_1: Fix "libavcodec/g723_1.c:988:8: warning: assignment from incompatible pointer type [enabled by default]"
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 7 Jan 2012 22:59:14 +0000 (23:59 +0100)]
dca: Fix uninitialized variable warnings.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 7 Jan 2012 22:05:20 +0000 (23:05 +0100)]
ffserver: check chdir() return
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 6 Jan 2012 16:45:21 +0000 (17:45 +0100)]
jpegdec: support ilv=1 grayscale jpeg-ls.
Fixes Ticket851
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 6 Jan 2012 18:03:21 +0000 (19:03 +0100)]
ljpegdec: support non zero MCU for RGB. 2nd try
Fixes Ticket875
Compared to patch 1 this fixes a bright line at the right side.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Reinhard Tartler [Thu, 5 Jan 2012 20:40:18 +0000 (21:40 +0100)]
vorbisdec: Fix decoding bug with channel handling
Fixes Bug: #191
Chromium Bug: #101458
CVE-2011-3895
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
Stefano Sabatini [Thu, 5 Jan 2012 00:04:14 +0000 (01:04 +0100)]
ffprobe: add support to video frame information printing
Add -show_frames option to ffprobe.
Partially based on the work of Thomas Kuehnel <kuehnelth@googlemail.com>
for SOCIS 2011.
The wicked idea of creating a special "packets_and_frames" container for
structured formats (JSON and XML) comes from Clément.
Stefano Sabatini [Sat, 7 Jan 2012 20:39:15 +0000 (21:39 +0100)]
doc/filters.texi: fix typo in volume description
Diego Biurrun [Sat, 7 Jan 2012 19:46:09 +0000 (20:46 +0100)]
cabac: Move code only used within the CABAC test program into the test program.
Diego Biurrun [Sat, 7 Jan 2012 17:37:28 +0000 (18:37 +0100)]
vp56: Drop unnecessary cabac.h #include.
Diego Biurrun [Sat, 7 Jan 2012 20:36:31 +0000 (21:36 +0100)]
h264-test: Initialize AVCodecContext.av_class.
This fixes a segfault on startup.
Also remove a commented-out and completely unused variable.
Diego Biurrun [Sat, 7 Jan 2012 18:17:15 +0000 (19:17 +0100)]
build: Skip compiling network.h and rtsp.h if networking is not enabled.
rtsp.h relies on network.h and the latter conditionally defines fallback OS
structures that rely on configure tests, which are only run if networking
is enabled.
Diego Biurrun [Sat, 7 Jan 2012 18:07:42 +0000 (19:07 +0100)]
cosmetics: drop some pointless parentheses
Andrey Utkin [Sat, 7 Jan 2012 20:38:00 +0000 (22:38 +0200)]
Disable annoying warning without changing behavior
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Diego Biurrun [Fri, 30 Dec 2011 22:14:14 +0000 (23:14 +0100)]
faq: Solutions for common problems with sample paths when running FATE.
Michael Niedermayer [Sat, 7 Jan 2012 14:36:44 +0000 (15:36 +0100)]
lavf: Do not attempt to use frame multi threading when probing.
This fixes various problems with getting stream info. For example playback of the
file of Ticket88. Multithreaded find_stream_info should be reenabled
once it works correctly
This partly reverts
212fd3a1f1121a9db20c478f1fccf15e8bb53c94
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Justin Ruggles [Sat, 7 Jan 2012 16:25:04 +0000 (11:25 -0500)]
avcodec: attempt to clarify the CODEC_CAP_DELAY documentation
Justin Ruggles [Sat, 31 Dec 2011 00:35:45 +0000 (19:35 -0500)]
avcodec: fix avcodec_encode_audio() documentation.
the previous documentation indicated how many bytes are read from the input,
not how many samples are read.
Mike Melanson [Sat, 7 Jan 2012 17:29:35 +0000 (09:29 -0800)]
FATE: xmv-demux test; exercise the XMV demuxer without decoding the perceptual codecs inside.
Code coverage:
libavformat/xmv.c: 3% -> 91%
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Paul B Mahol [Sat, 7 Jan 2012 17:31:31 +0000 (17:31 +0000)]
vqf: recognize more metadata chunks
Do not create tags for non-char chunks.
Create readable tag for DSIZ chunk.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Mike Melanson [Sat, 7 Jan 2012 17:29:32 +0000 (09:29 -0800)]
FATE test: BMV demuxer and associated video and audio decoders.
Code coverage:
libavcodec/bmv.c: 0% -> 75%
libavformat/bmv.c: 0% -> 85%
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Mike Melanson [Sat, 7 Jan 2012 17:29:34 +0000 (09:29 -0800)]
FATE: indeo4 video decoder test.
Code coverage:
libavcodec/indeo4.c: 0% -> 78%
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Mike Melanson [Sat, 7 Jan 2012 17:29:33 +0000 (09:29 -0800)]
FATE: update xxan-wc4 test to a sample with more code coverage.
The previous sample used for this test only contained type 0 frames.
Replace it with a sample that also features type 1 frames.
Code coverage:
libavcodec/xxan.c: 72% -> 89%
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Mike Melanson [Sat, 7 Jan 2012 17:29:30 +0000 (09:29 -0800)]
Change the recent h264_mp4toannexb bitstream filter test to output to an elementary stream rather than a program stream.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Justin Ruggles [Fri, 6 Jan 2012 21:01:07 +0000 (16:01 -0500)]
g722enc: validate AVCodecContext.trellis
Justin Ruggles [Fri, 6 Jan 2012 20:32:44 +0000 (15:32 -0500)]
g722enc: set frame_size, and also handle an odd number of input samples
The fate reference is updated because the previous test skipped a sample in
each encode() call due each input frame having an odd number of samples.
Justin Ruggles [Fri, 6 Jan 2012 04:34:09 +0000 (23:34 -0500)]
g722enc: split encoding into separate functions for trellis vs. no trellis
Carl Eugen Hoyos [Sat, 7 Jan 2012 18:23:21 +0000 (19:23 +0100)]
Cosmetics: Fix indentation.
Found by: Alexander Strasser
Vitor Sessak [Tue, 3 Jan 2012 20:25:59 +0000 (21:25 +0100)]
mpegaudiodec: Use clearer pointer math
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Michael Niedermayer [Fri, 6 Jan 2012 16:34:22 +0000 (17:34 +0100)]
tta: Fix returned error code at EOF
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
Michael Niedermayer [Fri, 6 Jan 2012 16:30:05 +0000 (17:30 +0100)]
tta: fix off be 1 error in the end detection.
Fixes use of uninitialized values.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
Justin Ruggles [Fri, 6 Jan 2012 23:14:24 +0000 (18:14 -0500)]
tta: fix 24-bit decoding.
Decode to the correct output buffer.
Paul B Mahol [Fri, 6 Jan 2012 01:09:06 +0000 (03:09 +0200)]
ipmovie: Add param change side data if the video dimensions have changed
Signed-off-by: Martin Storsjö <martin@martin.st>
Paul B Mahol [Fri, 6 Jan 2012 01:07:31 +0000 (03:07 +0200)]
interplayvideo: Handle changed video dimensions on the fly
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Fri, 6 Jan 2012 01:06:25 +0000 (03:06 +0200)]
libavcodec: Handle param change side data in avcodec_decode_video2, too
Also call avcodec_set_dimensions on dimension param change packets.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Fri, 6 Jan 2012 01:05:27 +0000 (03:05 +0200)]
libavcodec: Move apply_param_change up above avcodec_decode_video2
This is in preparation to calling it from avcodec_decode_video2.
Signed-off-by: Martin Storsjö <martin@martin.st>
Carl Eugen Hoyos [Sat, 7 Jan 2012 12:14:34 +0000 (13:14 +0100)]
Fix OOM error condition in idcin demuxer.
Stefano Sabatini [Fri, 6 Jan 2012 17:45:08 +0000 (18:45 +0100)]
ffprobe: move header and trailer print from probe_file() to main()
Simplify printing from the main() context, in case probe_file() is not
called, as required by the pending -show_version option.
Stefano Sabatini [Sun, 1 Jan 2012 16:18:18 +0000 (17:18 +0100)]
ffprobe: move writer context registration and initialization in main()
Simplify pending changes, as the writer context will be used in the
main() routine.
Stefano Sabatini [Wed, 4 Jan 2012 00:52:58 +0000 (01:52 +0100)]
cmdutils: make this_year extern, so it can be referenced from other .o files
Required by a pending change in ffprobe.
Stefano Sabatini [Fri, 6 Jan 2012 18:08:13 +0000 (19:08 +0100)]
cmdutils: make show_usage() use av_log()
Avoid printing on stdout when show_usage is used in an error message.
Janne Grunau [Fri, 6 Jan 2012 00:21:36 +0000 (01:21 +0100)]
indeo3: check motion vectors for validity
Fixes null pointer dereferences in fuzzed files found by Oana Stratulat.
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
Oana Stratulat [Sat, 7 Jan 2012 01:45:48 +0000 (02:45 +0100)]
ffmpeg: Fix segfault with zzufed 4xm file.
Fixes ticket 885
Signed-off-by: Oana Stratulat <oanaandreeastratulat@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 7 Jan 2012 01:02:13 +0000 (02:02 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
flicvideo: fix invalid reads
vorbis: Avoid some out-of-bounds reads
vqf: add more known extensions
cabac: remove unused function renorm_cabac_decoder
h264: Only use symbols from the SVQ3 decoder under proper conditionals.
add bytestream2_tell() and bytestream2_seek() functions
parsers: initialize MpegEncContext.slice_context_count to 1
spdifenc: use special alignment for DTS-HD length_code
Conflicts:
libavcodec/flicvideo.c
libavcodec/h264.c
libavcodec/mpeg4video_parser.c
libavcodec/vorbis.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 20 Dec 2011 21:06:35 +0000 (22:06 +0100)]
indeo5: Fix null pointer dereference.
Bug found by: Oana Stratulat
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
Janne Grunau [Thu, 5 Jan 2012 21:12:35 +0000 (22:12 +0100)]
electronicarts: check bytes per sample for validity
Prevents division by zero.
Michael Niedermayer [Fri, 6 Jan 2012 20:29:25 +0000 (21:29 +0100)]
ljpeg: Fix bits != 8 or 16 support
Fixes 2nd half of Ticket889
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 6 Jan 2012 20:28:26 +0000 (21:28 +0100)]
ljpeg: Add predictor=0 support.
Fixed first half of ticket889
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 6 Jan 2012 16:34:22 +0000 (17:34 +0100)]
tta: Fix returned error code at EOF
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 6 Jan 2012 16:30:05 +0000 (17:30 +0100)]
tta: fix off be 1 error in the end detection.
Fixes use of uninitialized values.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Laurentiu Ion [Fri, 6 Jan 2012 18:42:00 +0000 (20:42 +0200)]
flicvideo: fix invalid reads
Prevent invalid reads using bytestream2 functions.
Fixes bug #126.
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
Chris Evans [Thu, 5 Jan 2012 20:25:41 +0000 (21:25 +0100)]
vorbis: Avoid some out-of-bounds reads
Fixes Bug: #190
Chromium Bug: #100543
Related to CVE-2011-3893
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
Reimar Döffinger [Fri, 6 Jan 2012 10:51:12 +0000 (11:51 +0100)]
Flush decoders correctly in avformat_find_stream_info().
The decoders should not only be flushed on EOF or error, but also when
e.g. probe size was reached.
It is best to just always flush by default and only disable it
explicitly when we know that we have everything we need.
Fixes trac ticket #879.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Paul B Mahol [Fri, 6 Jan 2012 17:18:07 +0000 (17:18 +0000)]
vqf: add more known extensions
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Diego Biurrun [Tue, 27 Dec 2011 10:37:31 +0000 (11:37 +0100)]
cabac: remove unused function renorm_cabac_decoder
Diego Biurrun [Fri, 6 Jan 2012 00:34:16 +0000 (01:34 +0100)]
h264: Only use symbols from the SVQ3 decoder under proper conditionals.
Fixes --disable-everything --enable-decoder=h264 --disable-optimizations.
Clément Bœsch [Tue, 3 Jan 2012 16:01:24 +0000 (17:01 +0100)]
timecode: more tolerant frame rate check for drop flag.
This fixes some timecode probing in MOV.
Stefano Sabatini [Thu, 5 Jan 2012 09:51:28 +0000 (10:51 +0100)]
ffprobe: exit in case generic options are incompatible with strict XML output
Stefano Sabatini [Thu, 5 Jan 2012 10:00:12 +0000 (11:00 +0100)]
ffprobe: fix NULL pointer dereference in writer_close()
Fix crash.
Stefano Sabatini [Sun, 1 Jan 2012 15:42:35 +0000 (16:42 +0100)]
cmdutils: add print_program_info() used in both show_banner() and show_version()
This also make -version show program configuration and compilation
information, which was previously shown only in the banner.
Justin Ruggles [Thu, 22 Dec 2011 03:32:04 +0000 (22:32 -0500)]
add bytestream2_tell() and bytestream2_seek() functions
Michael Niedermayer [Fri, 6 Jan 2012 01:45:12 +0000 (02:45 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master: (21 commits)
ipmovie: do not read audio packets before the codec is known
truemotion2: check size before GetBitContext initialisation
avio: Only do implicit network initialization for network protocols
avio: Add an URLProtocol flag for indicating that a protocol uses network
adpcm: ADPCM Electronic Arts has always two channels
matroskadec: Fix a bug where a pointer was cached to an array that might later move due to a realloc()
fate: Add missing reference file from
9b4767e4 .
mov: Support MOV_CH_LAYOUT_USE_DESCRIPTIONS for labeled descriptions.
4xm: Prevent buffer overreads.
mjpegdec: parse RSTn to prevent skipping other data in mjpeg_decode_scan
vp3: add fate test for non-zero last coefficient
vp3: fix streams with non-zero last coefficient
swscale: remove unused U/V arguments from yuv2rgb_write().
timer: K&R formatting cosmetics
lavf: cosmetics, reformat av_read_frame().
lavf: refactor av_read_frame() to make it easier to understand.
Report an error if pitch_lag is zero in AMR-NB decoder.
Revert "4xm: Prevent buffer overreads."
4xm: Prevent buffer overreads.
4xm: pass the correct remaining buffer size to decode_i2_frame().
...
Conflicts:
libavcodec/4xm.c
libavcodec/mjpegdec.c
libavcodec/truemotion2.c
libavformat/ipmovie.c
libavformat/mov_chan.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Oana Stratulat [Fri, 6 Jan 2012 01:02:50 +0000 (02:02 +0100)]
ffmpeg: check if number of input and output channels are valid.
Fix Ticket887.