RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
39,896 Commits 37 Branches 400 Tags 265 MiB
Commit Graph

39896 Commits

Author SHA1 Message Date
Michael Niedermayer 052ab20805 ffmpeg: fix regression with jpeg pix fmts 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-17 04:05:01 +02:00
Michael Niedermayer 89f8637979 ffmpeg: fix regression with png 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-17 04:04:56 +02:00
Michael Niedermayer 8a28fa010a ffmpeg: choose_pix_fmt: pass target fmt in 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-17 04:04:49 +02:00
Michael Niedermayer 4778783160 Merge commit '3b266da3d35f3f7a61258b78384dfe920d875d29' 
* commit '3b266da3d35f3f7a61258b78384dfe920d875d29':
  avconv: add support for complex filtergraphs.
  avconv: make filtergraphs global.
  avconv: move filtered_frame from InputStream to OutputStream.
  avconv: don't set output width/height directly from input value.
  avconv: move resample_{width,height,pix_fmt} to InputStream.
  avconv: remove a useless variable from OutputStream.
  avconv: get output pixel format from lavfi.
  graphparser: fix the order in which unlabeled input links are returned.
  avconv: change {input,output}_{streams,files} into arrays of pointers.
  avconv: don't pass input/output streams to some functions.

Conflicts:
	cmdutils.c
	cmdutils.h
	doc/ffmpeg.texi
	ffmpeg.c
	ffplay.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-17 04:03:50 +02:00
Nicolas George dcd207c4cb matroskadec: use av_grow_packet in merge_packets. 
It ensures that the packet is properly padded
and makes the code simpler.

Fixes trac ticket #1223.
 2012-04-16 22:17:24 +02:00
Reimar Döffinger 1a65d50ee7 mem.c: fix wrong comment. 
Overwriting the av_malloc etc. functions is not easily
possible anymore, even for systems that support overriding
symbols in shared libraries in principle.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2012-04-16 22:13:12 +02:00
Reimar Döffinger 071292b8c9 Respect -copyinkf for subtitles. 
Necessary to make it possible to copy teletext streams
(trac issue #531).

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2012-04-16 22:13:12 +02:00
Reimar Döffinger 4a95876f4d Add skip_to_keyframe stream variable. 
This replaces the matroskadec one with the same name.
The advantage is not only easier reuse in other demuxers
but also that we can make the decisions after the parser.
This fixes seeking in files that mark the keyframes incorrectly,
for example the file in track ticket #1003.
The matroska variable is still kept to be able to complain
about such broken files.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2012-04-16 22:13:11 +02:00
Michael Niedermayer 4fa706a4a6 svq3: check the watermark height. 
Fixes division by 0

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-16 18:36:40 +02:00
Michael Niedermayer efe1ba7201 diracdec: check lowdelay bytes. 
Fixes division by zero

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-16 18:36:39 +02:00
Michael Niedermayer a30165c4a8 omadec: make sample rate table large enough to prevent out of array reading. 
The new values lead to error messages when used

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-16 18:36:39 +02:00
Michael Niedermayer c963189bc2 g729dec: initialize pitch_delay_int_prev to the minimum valid value. 
This prevents an out of array read

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-16 18:36:34 +02:00
Michael Niedermayer 31a45014f4 loco: fix 10l typo (missing case) 
Found-by: Clément Bœsch <ubitux@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-16 16:46:53 +02:00
Michael Niedermayer 47f0beadba dsicinav: Check for overread in RLE decode. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-16 16:44:12 +02:00
Michael Niedermayer 71d3c25a7e smacker: Check get_vlc() return values. 
Fixes out of array reads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-16 16:39:02 +02:00
Michael Niedermayer 8e77c3846e dcadec: fix global array overread. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-16 16:27:34 +02:00
Carl Eugen Hoyos bdeb54e176 Support decoding LOCO_CRGBA. 
Fixes a part of ticket #1222.
 2012-04-16 16:19:41 +02:00
Michael Niedermayer 884efd4e09 indeo4: avoid storing invalid values in quant_mat. 
Fixes a global array overread

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-16 15:27:39 +02:00
Michael Niedermayer 474e31c904 4xmdemux: Check chunk size 
Fixes over reading the header array

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-16 15:27:39 +02:00
Michael Niedermayer e74fa25cb9 omadec: check GEOB sizes against buffer size 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-16 13:51:40 +02:00
Michael Niedermayer a10f71c1d6 vc1dec: add missing terminating element to mpeg4_video_profiles 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-16 13:41:17 +02:00
Michael Niedermayer e985cfd18b vc1dec: check end_mb_y / start_mb_y validity 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-16 13:36:11 +02:00
Michael Niedermayer c4ce870967 flvdec: allocate large enough buffer so get_bits() doesnt overread 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-16 12:01:55 +02:00
Michael Niedermayer fa1b2c8e18 ffv1: attempt to workaround intel CC fate issue. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-16 12:01:46 +02:00
Michael Niedermayer 8dfb13ea59 adxdec: Check available space before decoding block. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-16 02:18:10 +02:00
Michael Niedermayer 6d24fe2c3c segafilm: make the loop condition in film_read_packet() match the contents. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-16 02:18:09 +02:00
Robert Nagy ed66bbfcb9 lavfi/aresample: properly propagate pts == AV_NOPTS_VALUE; 
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2012-04-16 01:08:00 +02:00
Robert Nagy 4d84c7ded6 yadif: fixed missing error handling for poll_frame. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-15 23:44:38 +02:00
Michael Niedermayer 3be0c86b97 sws: remove cliping in yuv2rgb code. 
This code should not be needed and it slows things down.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-15 23:38:42 +02:00
Michael Niedermayer 689e59b7ff mov: reset dref_count on realloc to keep values consistent. 
This fixes a potential crash.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-15 23:37:09 +02:00
Michael Niedermayer 35e0496a7b Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  doc: Improve suggested Emacs settings for our coding style.
  utvideo: Remove unused variable 'src_size'
  mov: free memory on header parsing failure
  mov: fix leaking memory with multiple drefs.
  swscale: clip before assigning tables in RGB output functions.
  swscale: fix off-by-one in second coefficient in bilinear filters.

Conflicts:
	libavformat/mov.c
	libswscale/output.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-15 23:31:51 +02:00
Michael Niedermayer 88a97d660d indeo5: check for unsupported luma block type 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-15 21:02:01 +02:00
Anton Khirnov 3b266da3d3 avconv: add support for complex filtergraphs. 2012-04-15 20:32:09 +02:00
Anton Khirnov 560f7774a4 avconv: make filtergraphs global. 
This is the first step towards supporting complex filtergraphs with more
than one input and/or output.
 2012-04-15 20:27:32 +02:00
Anton Khirnov 836ce90566 avconv: move filtered_frame from InputStream to OutputStream. 
It more properly belongs to output, not input.
 2012-04-15 20:24:07 +02:00
Anton Khirnov 6c9eac1998 avconv: don't set output width/height directly from input value. 
Always take it from lavfi. This way we don't need a clearly defined
corresponding input stream.
 2012-04-15 20:23:09 +02:00
Anton Khirnov e77c86629f avconv: move resample_{width,height,pix_fmt} to InputStream. 
This is a more proper place for them, since they store parameters of the
input, not output, stream.
 2012-04-15 20:23:09 +02:00
Anton Khirnov 9dced85426 avconv: remove a useless variable from OutputStream. 2012-04-15 20:22:36 +02:00
Anton Khirnov b7327887ea avconv: get output pixel format from lavfi. 
This way we don't require a clearly defined corresponding input stream.

The result for the xwd test changes because rgb24 is now chosen instead
of bgra.
 2012-04-15 20:22:36 +02:00
Michael Niedermayer fefc65675e tiffdec: check overread for packbits 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-15 20:20:43 +02:00
Thilo Borgmann 2837d8dc27 alsdec: fix number of decoded samples in first sub-block in BGMC mode. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-15 20:20:37 +02:00
Anton Khirnov 7af99a01c4 graphparser: fix the order in which unlabeled input links are returned. 2012-04-15 20:20:03 +02:00
Anton Khirnov 2e21526790 avconv: change {input,output}_{streams,files} into arrays of pointers. 
Right now, they are arrays of structs, reallocated when new
streams/files are added. This makes storing pointers to those structs
harder than necessary.
 2012-04-15 20:20:03 +02:00
Anton Khirnov ea9367e921 avconv: don't pass input/output streams to some functions. 
They are globals, no point in pretending they are not.
 2012-04-15 20:20:03 +02:00
Michael Niedermayer 44c4170c52 lzw: check for overread 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-15 18:21:53 +02:00
Michael Niedermayer a63c813797 pngdec: check bits_per_pixel for palette mode. 
This fixes a out of array read

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-15 18:21:53 +02:00
Michael Niedermayer c7dc19d68f png: make sure the previous frames dimensions match before using it as reference 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-15 18:21:53 +02:00
Nicolas George a9e7e98021 error: ensure error codes are signed negative ints. 
Based on a patch by Robert Nagy <ronag89@gmail.com>.

It makes a difference when the error code is immediately cast
into a larger integer, such as an int64_t.
 2012-04-15 17:58:33 +02:00
Michael Niedermayer 3118e3b137 ff_lag_rac_init: fix signedness error leading to out of array read. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-15 17:01:38 +02:00
Michael Niedermayer 20335598f2 qdm2_fft_decode_tones: fix infinite loop 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-15 17:01:38 +02:00