virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-02 03:06:28 +02:00
Code Issues Releases Activity
36,445 Commits 37 Branches 400 Tags 460 MiB
ad8e3304f7
Commit Graph

36445 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
ad8e3304f7 lavf: use avg_frame_rate and packet number to exit find_stream_info 
qatar does this too but clobbers the AVPacket.duration by approximate
values.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-05 00:49:45 +01:00
Michael Niedermayer
1171d938af lavf: revert commit bb99ae3ae9 
Author: Michael Niedermayer <michaelni@gmx.at>
	Date:   Thu Nov 3 22:38:10 2011 +0100

	    lavf: fix null pointer dereference in rdt

	    Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This is no longer needed and causes various problems with RTSP

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-05 00:23:24 +01:00
Michael Niedermayer
ff7f198d7f vorbis: make sure ch is non zero before calling vorbis_residue_decode 
This possibly makes part of the CVE-2011-3895 fix unneeded.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-04 21:58:08 +01:00
Chris Evans
f74ce3a60d vorbis: An additional defense in the Vorbis codec. 
BUG=101458
Review URL: http://codereview.chromium.org/8414025

Fixes second part of CVE-2011-3895

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-04 21:58:08 +01:00
Chris Evans
68226ed9ec vorbis: Fix decoder bug. 
BUG=101458
Review URL: http://codereview.chromium.org/8413019

This fixes part of 2011-3895

bigned-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-04 21:58:08 +01:00
Michael Niedermayer
405e99bdfd vorbisdec: Make sure blocksize is not set to an invalid value. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-04 21:58:08 +01:00
Michael Niedermayer
6fcf2bb8af vorbis: Fix last quarter of CVE-2011-3893 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-04 21:58:08 +01:00
Chris Evans
7149fce2ca ogg: Avoid the possibility to read out-of-bounds of a static global array in Vorbis 
decoding.

BUG=100543
Review URL: http://codereview.chromium.org/8365014
This fixes 25% of CVE-2011-3893

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-04 21:58:08 +01:00
Chris Evans
f35e037c93 mkv: Fix a bug where a pointer was cached to an array that might later move due to 
a realloc()

BUG=100492
Review URL: http://codereview.chromium.org/8366004
Fixes: 1 of 2 for CVE-2011-3893

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-04 21:58:08 +01:00
Philippe Saint-Pierre
f0f2babca2 Fix possible infinite loop decoding als. 
Reviewed-by: Thilo Borgmann
 2012-01-04 21:00:06 +01:00
Andrew Ryan
4452d58c72 Insert missing newline at end of error log message in mov demuxer. 2012-01-04 19:49:21 +01:00
Carl Eugen Hoyos
84ce58faf5 Replace deprecated FF_I_TYPE with AV_PICTURE_TYPE_I in v308 and yuv4. 
Found-by: Paul B Mahol
 2012-01-04 19:45:46 +01:00
Carl Eugen Hoyos
17edc370b2 yuv4 libquicktime packed 4:2:0 encoder and decoder. 
Reviewed-by: Derek Buitenhuis
Reviewed-by: Paul B Mahol
 2012-01-04 15:37:59 +01:00
Carl Eugen Hoyos
2754514787 v308 Quicktim Uncompressed 4:4:4 encoder and decoder. 
Reviewed-by: Derek Buitenhuis
Reviewed-by: Paul B Mahol
 2012-01-04 15:37:59 +01:00
Carl Eugen Hoyos
64e4f4836a Add decoder for Avid 1:1 10-bit RGB Packer (AVrp). 
Fixes ticket #525.

Reviewed-by: Paul B Mahol
 2012-01-04 15:37:58 +01:00
Clément Bœsch
dc7ad85c40 doc: use @command{} for commands. 2012-01-04 13:21:08 +01:00
Clément Bœsch
837126568c doc: use @code{} for --{enable,disable}-options. 2012-01-04 13:21:08 +01:00
Michael Niedermayer
15b219fae9 jpegdec: Fix vlc table check for progressive jpegs. 
Fixes Ticket834

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-04 05:03:15 +01:00
Michael Niedermayer
6072a19b4f lavf: Fix try_decode_frame() so it doesnt loop infinitely. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-04 04:08:46 +01:00
Michael Niedermayer
f37174bc19 electronicarts: Pass error through ea_read_header(). 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-04 04:02:22 +01:00
Oana Stratulat
0d3a51e5d2 electronicarts: Fix division by zero. Fixes Ticket #793 
Signed-off-by: Oana Stratulat <oanaandreeastratulat@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-04 02:39:49 +01:00
Michael Niedermayer
ad1c8dd673 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  fate: add dxtory test
  adx_parser: rewrite.
  adxdec: Validate channel count to fix a division by zero.
  adxdec: Do not require extradata.
  cmdutils: K&R reformatting cosmetics
  alacdec: implement the 2-pass prediction type.
  alacenc: implement the 2-pass prediction type.
  alacenc: do not generate invalid multi-channel ALAC files
  alacdec: fill in missing or guessed info about the extradata format.
  utvideo: proper median prediction for interlaced videos
  lavu: bump lavu minor for av_popcount64
  dca: K&R formatting cosmetics
  dct: K&R formatting cosmetics
  lavf: flush decoders in avformat_find_stream_info().
  win32: detect number of CPUs using affinity
  Add av_popcount64
  snow: Restore three mistakenly removed casts.

Conflicts:
	cmdutils.c
	doc/APIchanges
	libavcodec/adx_parser.c
	libavcodec/adxdec.c
	libavcodec/alacenc.c
	libavutil/avutil.h
	tests/fate/screen.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-04 01:12:34 +01:00
Stefano Sabatini
d6da16dca5 ffprobe: add support to option -show_error 2012-01-04 01:06:28 +01:00
Stefano Sabatini
55ed19bf3b ffprobe: remove unused variable in show_format() 2012-01-04 01:06:11 +01:00
Stefano Sabatini
4c5c0609c1 ffprobe: reindent after the last commit 2012-01-04 01:06:03 +01:00
Stefano Sabatini
90347dabc8 ffprobe: change order of operations in probe_file() 
This is required by a pending patch, also fixes a memleak due to the
writer context not being closed in case of open_input_file() failure.
 2012-01-04 01:05:56 +01:00
Stefano Sabatini
c972f91d5b ffprobe: prefer av_log to fprintf(stderr) 2012-01-04 01:05:51 +01:00
Michael Niedermayer
6429269096 wmall: remove ;; 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-03 23:52:28 +01:00
Michael Niedermayer
dde545c697 Merge remote-tracking branch 'shariman/wmall' 
* shariman/wmall:
  Fix audio output
  Suppress dumping of residues buffer
  Use quantizer value read from bitstream
  Cosmetics: Remove two empty lines and realign some code
  Reset acfilter_prevvalues buffer in clear_codec_buffers()
  Fix AC filter buffers and AC filter reversion

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-03 23:45:48 +01:00
Oana Stratulat
fd16f56798 fate: add dxtory test 
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
 2012-01-03 23:16:29 +01:00
Carl Eugen Hoyos
001567c767 Set bits_per_coded_sample when encoding Y41P. 
This allows mplayer -vc bt411 to decode files
encoded with FFmpeg.

Reviewed-by: Paul B Mahol
 2012-01-03 23:05:54 +01:00
Jean First
efaf448888 rtsp: Fix compiler warning for uninitialized variable. 
Reviewed-by: Martin Storsjö
 2012-01-03 23:01:28 +01:00
Michael Niedermayer
b024209b1f adx_parser: rewrite. 
The previous code ended in multiple different infinite
loops. See stl_ten_1_big.sfd as example with and without zzuf

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2012-01-03 16:28:17 -05:00
Justin Ruggles
6fd075f180 adxdec: Validate channel count to fix a division by zero. 2012-01-03 16:28:17 -05:00
Michael Niedermayer
4f1a787744 adxdec: Do not require extradata. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2012-01-03 16:28:17 -05:00
Aneesh Dogra
cbaef7d16e cmdutils: K&R reformatting cosmetics 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2012-01-03 21:10:09 +01:00
Justin Ruggles
e49d21306a alacdec: implement the 2-pass prediction type. 
The reference encoder does not generate any streams using this, but the
reference decoder can handle it, so we should as well.
 2012-01-03 13:15:24 -05:00
Justin Ruggles
bb63475aec alacenc: implement the 2-pass prediction type. 
This isn't used by the reference encoder, but it is supported by the decoder.
 2012-01-03 13:15:23 -05:00
Justin Ruggles
149e1b0468 alacenc: do not generate invalid multi-channel ALAC files 2012-01-03 13:15:23 -05:00
Justin Ruggles
e76c7b856f alacdec: fill in missing or guessed info about the extradata format. 
Now that there is official documentation from Apple about this, we don't have
to guess anymore.
 2012-01-03 13:15:23 -05:00
Kostya Shishkov
490dcda6b6 utvideo: proper median prediction for interlaced videos 2012-01-03 17:08:49 +01:00
Janne Grunau
c04a954da6 lavu: bump lavu minor for av_popcount64 
Add it to doc/APIchanges and update and correct other entries.
 2012-01-03 15:42:26 +01:00
Shitiz Garg
f37b4efe03 dca: K&R formatting cosmetics 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2012-01-03 15:25:54 +01:00
Aneesh Dogra
2e70b2de58 dct: K&R formatting cosmetics 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2012-01-03 15:25:51 +01:00
Anton Khirnov
212fd3a1f1 lavf: flush decoders in avformat_find_stream_info(). 
This means that avformat_find_stream_info() now works properly with
multiple threads, so there's no need to force thread count to 1.
 2012-01-03 14:58:21 +01:00
Daniel Verkamp
02e8f4272c win32: detect number of CPUs using affinity 
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
 2012-01-03 14:25:57 +01:00
Daniel Verkamp
b73ec05473 Add av_popcount64 
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
 2012-01-03 14:25:43 +01:00
Piotr Bandurski
912e75169b Support 8bpp grayscale Sun Rasterfile images. 
Fixes ticket #865.
 2012-01-03 13:24:50 +01:00
Diego Biurrun
418f066f8c snow: Restore three mistakenly removed casts. 2012-01-03 10:27:45 +01:00
Michael Bradshaw
2ba3416362 Added yuva420p decoding support for libopenjpeg 
Signed-off-by: Michael Bradshaw <mbradshaw@sorensonmedia.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-03 06:21:01 +01:00