ffmpeg.git
8 years agolibswresample: introduce int swr_set_compensation() instead of void swr_compensate()
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>
8 years agofate: add bitexact and idct to x8intra
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>
8 years agocabac: Disable get_cabac_inline_x86() for clang 2.9 on x86_32
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>
8 years agoRevert "Revert commit 599b4c6efddaed33b1667c386b34b07729ba732b"
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.

8 years agolavf: Add forgotten line from 212fd3a1f1121a9db20c478f1fccf15e8bb53c94
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>
8 years agoMerge remote-tracking branch 'qatar/master'
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>
8 years agoljpegdec: Support MCU in ljpeg_decode_yuv_scan()
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>
8 years agobfi: Use bytestream2 functions to prevent buffer overreads.
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>
8 years agodpcm: Fix invalid writes
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>
8 years agoutvideo: frame multithreading.
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>
8 years agoMerge remote-tracking branch 'dilaroga/master'
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>
8 years agoipmovie: Fix passing resolution changes on.
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>
8 years agotta: remove obsolete and useless error message
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>
8 years agoSupport 48bit rgb pam encoding.
Carl Eugen Hoyos [Sun, 8 Jan 2012 19:22:17 +0000 (20:22 +0100)]
Support 48bit rgb pam encoding.

8 years agovda: cosmetic.
Sebastien Zwickert [Sun, 8 Jan 2012 19:22:12 +0000 (20:22 +0100)]
vda: cosmetic.

8 years agovda: removes useless doxygen command.
Sebastien Zwickert [Sun, 8 Jan 2012 19:22:12 +0000 (20:22 +0100)]
vda: removes useless doxygen command.

8 years agovda: uses pthreads directly.
Sebastien Zwickert [Sun, 8 Jan 2012 19:22:12 +0000 (20:22 +0100)]
vda: uses pthreads directly.

8 years agovda: convert 3 byte NAL sizes to 4 byte.
Sebastien Zwickert [Sun, 8 Jan 2012 19:22:12 +0000 (20:22 +0100)]
vda: convert 3 byte NAL sizes to 4 byte.

8 years agoSupport 16bit gray pam encoding.
Carl Eugen Hoyos [Sun, 8 Jan 2012 19:20:29 +0000 (20:20 +0100)]
Support 16bit gray pam encoding.

8 years agoSupport decoding 32bit sunrast images.
Carl Eugen Hoyos [Sun, 8 Jan 2012 19:16:57 +0000 (20:16 +0100)]
Support decoding 32bit sunrast images.

Fixes ticket #895.

8 years agofate: add generic rules for most of the remaining tests/fate/*.mak files.
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.

8 years agoindeo4, swresample: add some missing static/const to tables.
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>
8 years agoAdd wmv8-x8intra fate test.
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>
8 years agoFix incorrect increment in sgidec.c
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>
8 years agolavfi: add audio silencedetect filter.
Clément Bœsch [Tue, 3 Jan 2012 22:47:09 +0000 (23:47 +0100)]
lavfi: add audio silencedetect filter.

8 years agoffprobe: use more meaningful names for writer chapter/section header/footer function
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.

8 years agoffprobe: use "%*" printf syntax in XML_INDENT() in place of a loop
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>
8 years agovorbis: An additional defense in the Vorbis codec.
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>
8 years agofate: enable wc4-xan test, the sample is now on our rsync server.
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>
8 years agoMerge remote-tracking branch 'qatar/master'
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>
8 years agog723_1: Fix "libavcodec/g723_1.c:988:8: warning: assignment from incompatible pointer...
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>
8 years agodca: Fix uninitialized variable warnings.
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>
8 years agoffserver: check chdir() return
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>
8 years agojpegdec: support ilv=1 grayscale jpeg-ls.
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>
8 years agoljpegdec: support non zero MCU for RGB. 2nd try
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>
8 years agovorbisdec: Fix decoding bug with channel handling
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>
8 years agoffprobe: add support to video frame information printing
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.

8 years agodoc/filters.texi: fix typo in volume description
Stefano Sabatini [Sat, 7 Jan 2012 20:39:15 +0000 (21:39 +0100)]
doc/filters.texi: fix typo in volume description

8 years agocabac: Move code only used within the CABAC test program into the test program.
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.

8 years agovp56: Drop unnecessary cabac.h #include.
Diego Biurrun [Sat, 7 Jan 2012 17:37:28 +0000 (18:37 +0100)]
vp56: Drop unnecessary cabac.h #include.

8 years agoh264-test: Initialize AVCodecContext.av_class.
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.

8 years agobuild: Skip compiling network.h and rtsp.h if networking is not enabled.
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.

8 years agocosmetics: drop some pointless parentheses
Diego Biurrun [Sat, 7 Jan 2012 18:07:42 +0000 (19:07 +0100)]
cosmetics: drop some pointless parentheses

8 years agoDisable annoying warning without changing behavior
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>
8 years agofaq: Solutions for common problems with sample paths when running FATE.
Diego Biurrun [Fri, 30 Dec 2011 22:14:14 +0000 (23:14 +0100)]
faq: Solutions for common problems with sample paths when running FATE.

8 years agolavf: Do not attempt to use frame multi threading when probing.
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>
8 years agoavcodec: attempt to clarify the CODEC_CAP_DELAY documentation
Justin Ruggles [Sat, 7 Jan 2012 16:25:04 +0000 (11:25 -0500)]
avcodec: attempt to clarify the CODEC_CAP_DELAY documentation

8 years agoavcodec: fix avcodec_encode_audio() 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.

8 years agoFATE: xmv-demux test; exercise the XMV demuxer without decoding the perceptual codecs...
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>
8 years agovqf: recognize more metadata chunks
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>
8 years agoFATE test: BMV demuxer and associated video and audio decoders.
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>
8 years agoFATE: indeo4 video decoder test.
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>
8 years agoFATE: update xxan-wc4 test to a sample with more code coverage.
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>
8 years agoChange the recent h264_mp4toannexb bitstream filter test to output to an elementary...
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>
8 years agog722enc: validate AVCodecContext.trellis
Justin Ruggles [Fri, 6 Jan 2012 21:01:07 +0000 (16:01 -0500)]
g722enc: validate AVCodecContext.trellis

8 years agog722enc: set frame_size, and also handle an odd number of input samples
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.

8 years agog722enc: split encoding into separate functions for trellis vs. no trellis
Justin Ruggles [Fri, 6 Jan 2012 04:34:09 +0000 (23:34 -0500)]
g722enc: split encoding into separate functions for trellis vs. no trellis

8 years agoCosmetics: Fix indentation.
Carl Eugen Hoyos [Sat, 7 Jan 2012 18:23:21 +0000 (19:23 +0100)]
Cosmetics: Fix indentation.

Found by: Alexander Strasser

8 years agompegaudiodec: Use clearer pointer math
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>
8 years agotta: Fix returned error code at EOF
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>
8 years agotta: fix off be 1 error in the end detection.
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>
8 years agotta: fix 24-bit decoding.
Justin Ruggles [Fri, 6 Jan 2012 23:14:24 +0000 (18:14 -0500)]
tta: fix 24-bit decoding.

Decode to the correct output buffer.

8 years agoipmovie: Add param change side data if the video dimensions have changed
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>
8 years agointerplayvideo: Handle changed video dimensions on the fly
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>
8 years agolibavcodec: Handle param change side data in avcodec_decode_video2, too
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>
8 years agolibavcodec: Move apply_param_change up above avcodec_decode_video2
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>
8 years agoFix OOM error condition in idcin demuxer.
Carl Eugen Hoyos [Sat, 7 Jan 2012 12:14:34 +0000 (13:14 +0100)]
Fix OOM error condition in idcin demuxer.

8 years agoffprobe: move header and trailer print from probe_file() to main()
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.

8 years agoffprobe: move writer context registration and initialization in main()
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.

8 years agocmdutils: make this_year extern, so it can be referenced from other .o files
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.

8 years agocmdutils: make show_usage() use av_log()
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.

8 years agoindeo3: check motion vectors for validity
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>
8 years agoffmpeg: Fix segfault with zzufed 4xm file.
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>
8 years agoMerge remote-tracking branch 'qatar/master'
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>
8 years agoindeo5: Fix null pointer dereference.
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>
8 years agoelectronicarts: check bytes per sample for validity
Janne Grunau [Thu, 5 Jan 2012 21:12:35 +0000 (22:12 +0100)]
electronicarts: check bytes per sample for validity

Prevents division by zero.

8 years agoljpeg: Fix bits != 8 or 16 support
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>
8 years agoljpeg: Add predictor=0 support.
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>
8 years agotta: Fix returned error code at EOF
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>
8 years agotta: fix off be 1 error in the end detection.
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>
8 years agoflicvideo: fix invalid reads
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>
8 years agovorbis: Avoid some out-of-bounds reads
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>
8 years agoFlush decoders correctly in avformat_find_stream_info().
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>
8 years agovqf: add more known extensions
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>
8 years agocabac: remove unused function renorm_cabac_decoder
Diego Biurrun [Tue, 27 Dec 2011 10:37:31 +0000 (11:37 +0100)]
cabac: remove unused function renorm_cabac_decoder

8 years agoh264: Only use symbols from the SVQ3 decoder under proper conditionals.
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.

8 years agotimecode: more tolerant frame rate check for drop flag.
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.

8 years agoffprobe: exit in case generic options are incompatible with strict XML output
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

8 years agoffprobe: fix NULL pointer dereference in writer_close()
Stefano Sabatini [Thu, 5 Jan 2012 10:00:12 +0000 (11:00 +0100)]
ffprobe: fix NULL pointer dereference in writer_close()

Fix crash.

8 years agocmdutils: add print_program_info() used in both show_banner() and show_version()
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.

8 years agoadd bytestream2_tell() and bytestream2_seek() functions
Justin Ruggles [Thu, 22 Dec 2011 03:32:04 +0000 (22:32 -0500)]
add bytestream2_tell() and bytestream2_seek() functions

8 years agoMerge remote-tracking branch 'qatar/master'
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>
8 years agoffmpeg: check if number of input and output channels are valid.
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.

8 years agoparsers: initialize MpegEncContext.slice_context_count to 1
Janne Grunau [Thu, 5 Jan 2012 23:17:37 +0000 (00:17 +0100)]
parsers: initialize MpegEncContext.slice_context_count to 1

The mpeg4 video, H264 and VC-1 parser hold (directly or indirectly)
a MpegEncContext in their private context. Since they do not call the
common mpegvideo init function slice_context_count has explicitly set
to 1.
Prevents a null pointer dereference in the h264 parser and fixes
bug 193.

8 years agolibvpxenc: restore vp8flags for compatibility
James Zern [Thu, 5 Jan 2012 22:24:26 +0000 (14:24 -0800)]
libvpxenc: restore vp8flags for compatibility

removed in 98df93c, this makes the documentation correct again.

Found-by: j@v2v.cc
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agotta: Fix regression of 24bit decoding.
Michael Niedermayer [Thu, 5 Jan 2012 20:20:59 +0000 (21:20 +0100)]
tta: Fix regression of 24bit decoding.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoRevert commit 599b4c6efddaed33b1667c386b34b07729ba732b
Michael Niedermayer [Tue, 3 Jan 2012 15:31:57 +0000 (16:31 +0100)]
Revert commit 599b4c6efddaed33b1667c386b34b07729ba732b

Author: Mans Rullgard <mans@mansr.com>
Date:   Sun Dec 11 21:41:59 2011 +0000

     x86: cabac: replace explicit memory references with "m" operands

     This replaces the explicit offset(reg) memory references with
     "m" operands for the same locations.  As a result, one fewer
     register operand is needed for these inline asm statements.

This change appears to have broken compilation on darwin, and subsequent
fixes by martin (which did not fix compilation) removed the register
advantage, thus this change seems not a good idea to keep.
See: http://fate.ffmpeg.org/log.cgi?time=20120103122446&log=compile&slot=i386-darwin-llvm-gcc-4.2.1

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoFix compilation with --disable-everything --enable-demuxer=mov.
Carl Eugen Hoyos [Fri, 6 Jan 2012 00:40:34 +0000 (01:40 +0100)]
Fix compilation with --disable-everything --enable-demuxer=mov.

8 years agospdifenc: use special alignment for DTS-HD length_code
Anssi Hannula [Fri, 30 Dec 2011 20:48:18 +0000 (22:48 +0200)]
spdifenc: use special alignment for DTS-HD length_code

Align IEC 61937 length_code for DTS-HD so that
(length_code & 0xf) == 0x8. This is reportedly needed with some
receivers.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
8 years agopam: Reject 64bpp rgba.
ami_stuff [Fri, 6 Jan 2012 00:25:54 +0000 (01:25 +0100)]
pam: Reject 64bpp rgba.

Fixes ticket #883