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>
13 years ago
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 .
13 years ago
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>
13 years ago
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>
13 years ago
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>
13 years ago
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>
13 years ago
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>
13 years ago
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>
13 years ago
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>
13 years ago
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>
13 years ago
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>
13 years ago
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>
13 years ago
Michael Niedermayer
8e77c3846e
dcadec: fix global array overread.
...
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Carl Eugen Hoyos
bdeb54e176
Support decoding LOCO_CRGBA.
...
Fixes a part of ticket #1222 .
13 years ago
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>
13 years ago
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>
13 years ago
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>
13 years ago
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>
13 years ago
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>
13 years ago
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>
13 years ago
Michael Niedermayer
fa1b2c8e18
ffv1: attempt to workaround intel CC fate issue.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
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>
13 years ago
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>
13 years ago
Robert Nagy
ed66bbfcb9
lavfi/aresample: properly propagate pts == AV_NOPTS_VALUE;
...
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
13 years ago
Robert Nagy
4d84c7ded6
yadif: fixed missing error handling for poll_frame.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
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>
13 years ago
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>
13 years ago
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>
13 years ago
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>
13 years ago
Anton Khirnov
3b266da3d3
avconv: add support for complex filtergraphs.
13 years ago
Anton Khirnov
560f7774a4
avconv: make filtergraphs global.
...
This is the first step towards supporting complex filtergraphs with more
than one input and/or output.
13 years ago
Anton Khirnov
836ce90566
avconv: move filtered_frame from InputStream to OutputStream.
...
It more properly belongs to output, not input.
13 years ago
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.
13 years ago
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.
13 years ago
Anton Khirnov
9dced85426
avconv: remove a useless variable from OutputStream.
13 years ago
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.
13 years ago
Michael Niedermayer
fefc65675e
tiffdec: check overread for packbits
...
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
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>
13 years ago
Anton Khirnov
7af99a01c4
graphparser: fix the order in which unlabeled input links are returned.
13 years ago
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.
13 years ago
Anton Khirnov
ea9367e921
avconv: don't pass input/output streams to some functions.
...
They are globals, no point in pretending they are not.
13 years ago
Michael Niedermayer
44c4170c52
lzw: check for overread
...
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
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>
13 years ago
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>
13 years ago
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.
13 years ago
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>
13 years ago
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>
13 years ago
Michael Niedermayer
1a974679d0
qdm2: Check vlc_stage3_values index.
...
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Carl Eugen Hoyos
cb8f5194b3
Set bits_per_coded_sample when encoding Microsoft Video-1.
...
Fixes ticket #1193 .
13 years ago
Carl Eugen Hoyos
8cb9f99e9f
Support decoding unaligned rgb24 lagarith.
...
Fixes ticket #1214 .
13 years ago