virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-04 06:08:26 +02:00
Code Issues Releases Activity
36,632 Commits 37 Branches 400 Tags
Commit Graph

36632 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Justin Ruggles
3f6aa85ed4 avcodec: attempt to clarify the CODEC_CAP_DELAY documentation 2012-01-07 14:33:16 -05:00
Justin Ruggles
07837e4158 avcodec: fix avcodec_encode_audio() documentation. 
the previous documentation indicated how many bytes are read from the input,
not how many samples are read.
 2012-01-07 14:33:15 -05:00
Mike Melanson
15f073ee6d 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>
 2012-01-07 11:21:27 -08:00
Paul B Mahol
49a2aebc00 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>
 2012-01-07 11:14:57 -08:00
Mike Melanson
2907f88aee 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>
 2012-01-07 11:10:58 -08:00
Mike Melanson
9689a1af6d FATE: indeo4 video decoder test. 
Code coverage:
libavcodec/indeo4.c: 0% -> 78%

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2012-01-07 11:09:04 -08:00
Mike Melanson
f93843e9a0 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>
 2012-01-07 11:06:53 -08:00
Mike Melanson
c262404d98 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>
 2012-01-07 11:04:46 -08:00
Justin Ruggles
cf1a259ad6 g722enc: validate AVCodecContext.trellis 2012-01-07 13:38:23 -05:00
Justin Ruggles
77c5b66cbe 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.
 2012-01-07 13:38:23 -05:00
Justin Ruggles
34093ba081 g722enc: split encoding into separate functions for trellis vs. no trellis 2012-01-07 13:38:23 -05:00
Carl Eugen Hoyos
19b945dc2a Cosmetics: Fix indentation. 
Found by: Alexander Strasser
 2012-01-07 19:23:21 +01:00
Vitor Sessak
96219141e2 mpegaudiodec: Use clearer pointer math 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2012-01-07 08:23:27 -08:00
Michael Niedermayer
4b4acc544f tta: Fix returned error code at EOF 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2012-01-07 09:59:15 -05:00
Michael Niedermayer
d8b33a9989 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>
 2012-01-07 09:59:09 -05:00
Justin Ruggles
52e9854a83 tta: fix 24-bit decoding. 
Decode to the correct output buffer.
 2012-01-07 09:44:13 -05:00
Paul B Mahol
75146b8828 ipmovie: Add param change side data if the video dimensions have changed 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-01-07 15:25:41 +02:00
Paul B Mahol
17aa02b9a1 interplayvideo: Handle changed video dimensions on the fly 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-01-07 15:25:38 +02:00
Martin Storsjö
c5d907b6b0 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>
 2012-01-07 15:25:35 +02:00
Martin Storsjö
867f923df4 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>
 2012-01-07 15:25:30 +02:00
Carl Eugen Hoyos
ee884c3023 Fix OOM error condition in idcin demuxer. 2012-01-07 13:14:34 +01:00
Stefano Sabatini
9ecccd6e5a 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.
 2012-01-07 11:08:00 +01:00
Stefano Sabatini
fa7d1c39fd ffprobe: move writer context registration and initialization in main() 
Simplify pending changes, as the writer context will be used in the
main() routine.
 2012-01-07 11:02:13 +01:00
Stefano Sabatini
e869d08cbc cmdutils: make this_year extern, so it can be referenced from other .o files 
Required by a pending change in ffprobe.
 2012-01-07 11:02:13 +01:00
Stefano Sabatini
ceef1ee767 cmdutils: make show_usage() use av_log() 
Avoid printing on stdout when show_usage is used in an error message.
 2012-01-07 11:02:13 +01:00
Janne Grunau
be540e0cb3 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>
 2012-01-07 09:41:11 +01:00
Oana Stratulat
44cc1936be 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>
 2012-01-07 02:46:30 +01:00
Michael Niedermayer
6a56f4e634 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>
 2012-01-07 02:30:27 +01:00
Michael Niedermayer
b18a0cc781 indeo5: Fix null pointer dereference. 
Bug found by: Oana Stratulat

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
 2012-01-07 00:18:42 +01:00
Janne Grunau
73b16198b6 electronicarts: check bytes per sample for validity 
Prevents division by zero.
 2012-01-07 00:18:42 +01:00
Michael Niedermayer
12d8340f16 ljpeg: Fix bits != 8 or 16 support 
Fixes 2nd half of Ticket889

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-07 00:11:43 +01:00
Michael Niedermayer
5152beeba8 ljpeg: Add predictor=0 support. 
Fixed first half of ticket889

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-07 00:11:43 +01:00
Michael Niedermayer
877f6eb5fb tta: Fix returned error code at EOF 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-07 00:08:36 +01:00
Michael Niedermayer
4925b6e784 tta: fix off be 1 error in the end detection. 
Fixes use of uninitialized values.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-07 00:08:36 +01:00
Laurentiu Ion
b348c852aa flicvideo: fix invalid reads 
Prevent invalid reads using bytestream2 functions.
Fixes bug #126.

Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2012-01-06 16:48:27 -05:00
Chris Evans
57cd6d7095 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>
 2012-01-06 19:58:22 +01:00
Reimar Döffinger
4dfb74cd4f 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>
 2012-01-06 19:00:33 +01:00
Paul B Mahol
f86209b43d vqf: add more known extensions 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2012-01-06 09:24:40 -08:00
Diego Biurrun
3aa3fc45fe cabac: remove unused function renorm_cabac_decoder 2012-01-06 13:37:55 +01:00
Diego Biurrun
301fb92131 h264: Only use symbols from the SVQ3 decoder under proper conditionals. 
Fixes --disable-everything --enable-decoder=h264 --disable-optimizations.
 2012-01-06 13:37:53 +01:00
Clément Bœsch
ed14b7242a timecode: more tolerant frame rate check for drop flag. 
This fixes some timecode probing in MOV.
 2012-01-06 12:16:06 +01:00
Stefano Sabatini
c5f4abf698 ffprobe: exit in case generic options are incompatible with strict XML output 2012-01-06 10:43:34 +01:00
Stefano Sabatini
49c207b820 ffprobe: fix NULL pointer dereference in writer_close() 
Fix crash.
 2012-01-06 10:43:34 +01:00
Stefano Sabatini
9ac58ba133 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.
 2012-01-06 10:43:30 +01:00
Justin Ruggles
6e8bf6db48 add bytestream2_tell() and bytestream2_seek() functions 2012-01-05 23:36:36 -05:00
Michael Niedermayer
3edff185ab 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>
 2012-01-06 02:45:12 +01:00
Oana Stratulat
ee4d43ef7a ffmpeg: check if number of input and output channels are valid. 
Fix Ticket887.
 2012-01-06 02:05:50 +01:00
Janne Grunau
f907615f08 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.
 2012-01-06 01:47:45 +01:00
James Zern
95afa0a573 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>
 2012-01-06 01:46:51 +01:00
Michael Niedermayer
c88f0b728c tta: Fix regression of 24bit decoding. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-06 01:46:51 +01:00