OSDN Git Service
Carl Eugen Hoyos [Wed, 18 Apr 2012 20:29:46 +0000 (22:29 +0200)]
Make tiff-in-mov QuickTime-compatible for more colour-spaces.
Fixes ticket #1228.
Michael Niedermayer [Wed, 18 Apr 2012 20:08:28 +0000 (22:08 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
ppc: drop unused function dct_quantize_altivec()
mpegaudiodec: Do not discard mp_decode_frame() return value.
matroska: do not set invalid default duration if frame rate is zero
mkv: use av_reduce instead of av_d2q for framerate estimation
mkv: report average framerate as minimal as well
avcodec_string: Favor AVCodecContext.codec over the default codec.
cook: Make constants passed to AV_BE2NE32C() unsigned to avoid signed overflow.
Conflicts:
libavcodec/cook.c
libavcodec/ppc/mpegvideo_altivec.c
libavcodec/utils.c
libavformat/matroskadec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 18 Apr 2012 19:03:03 +0000 (21:03 +0200)]
h263dec: Prevent dimension changes from leaking on errors in header parsing.
This fixes crashes with frame threads caused by inconsistent context parameters.
Fixes Ticket1207
Found-by: John Villamil
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Mon, 2 Apr 2012 16:03:29 +0000 (16:03 +0000)]
ppc: drop unused function dct_quantize_altivec()
This also allows dropping some PPC-specific ugliness from dsputil.[ch].
Diego Biurrun [Thu, 5 Apr 2012 14:48:33 +0000 (16:48 +0200)]
mpegaudiodec: Do not discard mp_decode_frame() return value.
This fixes the warning:
libavcodec/mpegaudiodec.c:1704:14: warning: variable ‘out_size’ set but not used
Michael Niedermayer [Wed, 18 Apr 2012 14:49:46 +0000 (16:49 +0200)]
diracdec: check xybsep
Fixes division by 0
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 18 Apr 2012 14:42:34 +0000 (16:42 +0200)]
indeo: Make sure the to be used vlc table has been initilaized.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Robert Nagy [Wed, 18 Apr 2012 12:32:27 +0000 (14:32 +0200)]
Reset pts_correction state on codec flush.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 18 Apr 2012 13:21:35 +0000 (15:21 +0200)]
ogm: Fix division by 0
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 18 Apr 2012 13:16:36 +0000 (15:16 +0200)]
h264: reset current_slice on context reinit
This fixes a null pointer dereference
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 18 Apr 2012 11:49:07 +0000 (13:49 +0200)]
lavf: check that the context to avformat_open_input() is valid.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 18 Apr 2012 08:19:45 +0000 (10:19 +0200)]
AVoption doxy: clarify a few needs in relation to AVClass less structs.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Mans Rullgard [Wed, 18 Apr 2012 12:48:20 +0000 (13:48 +0100)]
matroska: do not set invalid default duration if frame rate is zero
If a video track specifies a zero frame rate (invalid but occurs),
this results in a division by zero and subsequent undefined conversion
to integer. Setting the default duration from the frame rate only
if the latter is greater than zero avoids such problems.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Alexander Bokovikov [Wed, 18 Apr 2012 08:32:13 +0000 (10:32 +0200)]
Fix build dependencies for libvo-aac and libopencore-amrnb.
Michael Niedermayer [Wed, 18 Apr 2012 07:43:13 +0000 (09:43 +0200)]
aacdec: drop channel reseting code.
its no longer needed and causes a race with the flv demuxer.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 18 Apr 2012 07:37:38 +0000 (09:37 +0200)]
aacdec: disable new chan_config guessing code from libav.
It causes more problems than it solves.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 18 Apr 2012 07:36:41 +0000 (09:36 +0200)]
aacdec: more verbose overread error message
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Tue, 17 Apr 2012 23:32:07 +0000 (16:32 -0700)]
mkv: use av_reduce instead of av_d2q for framerate estimation
It avoids some rounding errors.
Michael Niedermayer [Tue, 17 Apr 2012 22:50:18 +0000 (00:50 +0200)]
aacdec: reduce difference to alexs version of aacdec.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Tue, 17 Apr 2012 22:47:22 +0000 (15:47 -0700)]
mkv: report average framerate as minimal as well
This is in line with other demuxers and overall seems more correct
than assuming codec time base.
Michael Niedermayer [Tue, 17 Apr 2012 20:18:21 +0000 (22:18 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
aacenc: Fix issues with huge values of bit_rate.
dv_tablegen: Drop unnecessary av_unused attribute from dv_vlc_map_tableinit().
proresenc: multithreaded quantiser search
riff: use bps instead of bits_per_coded_sample in the WAVEFORMATEXTENSIBLE header
avconv: only set the "channels" option when it exists for the specified input format
avplay: update get_buffer to be inline with avconv
aacdec: More robust output configuration.
faac: Fix multi-channel ordering
faac: Add .channel_layouts
rtmp: Support 'rtmp_playpath', an option which overrides the stream identifier
rtmp: Support 'rtmp_app', an option which overrides the name of application
avutil: add better documentation for AVSampleFormat
Conflicts:
libavcodec/aac.h
libavcodec/aacdec.c
libavcodec/aacenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Alex Converse [Tue, 17 Apr 2012 18:32:56 +0000 (11:32 -0700)]
avcodec_string: Favor AVCodecContext.codec over the default codec.
This improves output for formats with more than one AVCodec.
Alex Converse [Tue, 17 Apr 2012 01:48:39 +0000 (18:48 -0700)]
cook: Make constants passed to AV_BE2NE32C() unsigned to avoid signed overflow.
Michael Niedermayer [Tue, 17 Apr 2012 18:02:13 +0000 (20:02 +0200)]
indeo5: dont run the wavelet transform over partially decoded bands.
This fixes a null pointer dereference.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Robert Nagy [Sun, 15 Apr 2012 15:12:02 +0000 (17:12 +0200)]
yadif: Improve pts calculation for is_second.
Tested-by: Robert Nagy <ronag89@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
sebist [Tue, 17 Apr 2012 07:36:27 +0000 (09:36 +0200)]
CrystalHD: Set aspect ratio.
Signed-off-by: sebist <sebok.istvan@gmail.com>
Reviewed-by: Philip Langdale <philipl@overt.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
sebist [Tue, 17 Apr 2012 07:29:27 +0000 (09:29 +0200)]
CrystalHD: fix pStride value.
Signed-off-by: sebist <sebok.istvan@gmail.com>
Reviewed-by: Philip Langdale <philipl@overt.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 17 Apr 2012 17:32:04 +0000 (19:32 +0200)]
nuv: check buffer size before checking content.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 17 Apr 2012 15:42:09 +0000 (17:42 +0200)]
avidec: Dont crash on avi packets that belong to dv streams in dv in avi
Fixes null pointer dereference
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 17 Apr 2012 15:41:03 +0000 (17:41 +0200)]
avidec: document early_exit argument
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 17 Apr 2012 15:12:22 +0000 (17:12 +0200)]
matroskadec: check headerstrip data availability.
Fixes null ptr dereference
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Reimar Döffinger [Fri, 6 Apr 2012 13:25:05 +0000 (15:25 +0200)]
aacenc: Fix issues with huge values of bit_rate.
Do not pointlessly call ff_alloc_packet multiple times,
and fix an infinite loop by clamping the maximum
number of bits to target in the algorithm that does
not use lambda.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Robert Nagy [Sat, 14 Apr 2012 10:09:46 +0000 (12:09 +0200)]
copy pts and format props between lavfi buffer and frame.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 17 Apr 2012 12:44:06 +0000 (14:44 +0200)]
oggdec: Safety check against stream counts being inconsistent in seek()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 17 Apr 2012 12:03:26 +0000 (14:03 +0200)]
oggdec: Recreate streams only in the 1 stream case.
Other cases are not supported and lead to inconsistencies which
can lead to out of array writes.
Reported-by: Dale Curtis <dalecurtis@chromium.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Mon, 16 Apr 2012 16:58:11 +0000 (18:58 +0200)]
dv_tablegen: Drop unnecessary av_unused attribute from dv_vlc_map_tableinit().
Michael Niedermayer [Tue, 17 Apr 2012 10:13:22 +0000 (12:13 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
indeo3: add parens around some macro arguments
h264: use proper PROLOGUE statement for a function using 8 registers.
doc: Update sample Vim config with suitable (function) indentation settings.
dv: Merge dvquant.h into dvdata.c where all other DV tables reside.
dv: Move static tables only used in one place to where they are used.
graphparser: set next to NULL on an entry extracted from inputs list
doc/filters: update documentation.
avconv: flush decoders immediately after an EOF.
avconv: send EOF to vsrc_buffer.
avconv: reindent.
Conflicts:
doc/filters.texi
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Nicolas George [Mon, 16 Apr 2012 11:19:07 +0000 (13:19 +0200)]
fate: libavutil tests do not require SAMPLES.
Nicolas George [Mon, 16 Apr 2012 10:07:48 +0000 (12:07 +0200)]
parseutils: include errors in test output.
Kostya Shishkov [Sun, 15 Apr 2012 06:48:43 +0000 (08:48 +0200)]
proresenc: multithreaded quantiser search
Justin Ruggles [Mon, 16 Apr 2012 16:14:25 +0000 (12:14 -0400)]
riff: use bps instead of bits_per_coded_sample in the WAVEFORMATEXTENSIBLE header
This matches the value for the plain WAVEFORMATEX header.
Also fixes stream copy to WAVE for non-16-bit raw pcm.
Justin Ruggles [Mon, 16 Apr 2012 16:51:24 +0000 (12:51 -0400)]
avconv: only set the "channels" option when it exists for the specified input format
This allows the user to specify an input channel layout without avconv aborting because the
"channels" option was not found.
Michael Niedermayer [Tue, 17 Apr 2012 01:54:49 +0000 (03:54 +0200)]
ffmpeg: make max frames work again, after merge
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 17 Apr 2012 01:24:32 +0000 (03:24 +0200)]
vf_thumbnail: colorspace changed from yv12 to rgb
Not fully investigated but thumbnail supports rgb and not yv12 so
this is better ...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 17 Apr 2012 01:20:37 +0000 (03:20 +0200)]
fate: fix vp8 size change regression
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 17 Apr 2012 01:19:57 +0000 (03:19 +0200)]
vsrc_buffer: fix null ptr segfault
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 17 Apr 2012 01:18:51 +0000 (03:18 +0200)]
avfiltergraph: More advanced heuristic to select colorspace.
This fixes regressions caused by switching from ffmpegs system to avfilters.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 17 Apr 2012 01:21:08 +0000 (03:21 +0200)]
fate: gif: change checksum to bgr8 from rgb8 as thats what gets selected now
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 17 Apr 2012 01:17:19 +0000 (03:17 +0200)]
imgconvert: fix regression with fate-gif colorspaces.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 17 Apr 2012 01:16:40 +0000 (03:16 +0200)]
ffmpeg: fix regression with jpeg pix fmts
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 17 Apr 2012 01:15:54 +0000 (03:15 +0200)]
ffmpeg: fix regression with png
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 17 Apr 2012 01:15:19 +0000 (03:15 +0200)]
ffmpeg: choose_pix_fmt: pass target fmt in
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 17 Apr 2012 02:01:17 +0000 (04:01 +0200)]
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>
Luca Barbato [Mon, 16 Apr 2012 06:08:45 +0000 (23:08 -0700)]
avplay: update get_buffer to be inline with avconv
The buffer must have its dimension, pixel format and aspect ratio
set.
Alex Converse [Tue, 10 Apr 2012 23:27:28 +0000 (16:27 -0700)]
aacdec: More robust output configuration.
Save the old output configuration (if it has been used
successfully) when trying a new configuration. If the new configuration
fails to decode, restore the last successful configuration.
Carl Eugen Hoyos [Wed, 25 Jan 2012 01:51:49 +0000 (02:51 +0100)]
faac: Fix multi-channel ordering
Signed-off-by: Alex Converse <alex.converse@gmail.com>
Alex Converse [Mon, 16 Apr 2012 17:35:11 +0000 (10:35 -0700)]
faac: Add .channel_layouts
Nicolas George [Mon, 16 Apr 2012 16:02:02 +0000 (18:02 +0200)]
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.
Reimar Döffinger [Sun, 15 Apr 2012 20:35:19 +0000 (22:35 +0200)]
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>
Reimar Döffinger [Sun, 15 Apr 2012 19:43:55 +0000 (21:43 +0200)]
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>
Reimar Döffinger [Fri, 13 Apr 2012 22:17:30 +0000 (00:17 +0200)]
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>
Samuel Pitoiset [Sun, 15 Apr 2012 19:50:50 +0000 (21:50 +0200)]
rtmp: Support 'rtmp_playpath', an option which overrides the stream identifier
This option is the stream identifier to play or to publish.
Sometimes the URL parser cannot determine the correct
playpath automatically, so it must be given explicitly
using this option (ie. -rtmp_playpath).
Signed-off-by: Martin Storsjö <martin@martin.st>
Samuel Pitoiset [Sun, 15 Apr 2012 19:49:48 +0000 (21:49 +0200)]
rtmp: Support 'rtmp_app', an option which overrides the name of application
This option is the name of application to connect on the RTMP server.
Sometimes the URL parser cannot determine the app name automatically,
so it must be given explicitly using this option (ie. -rtmp_app).
Signed-off-by: Martin Storsjö <martin@martin.st>
Justin Ruggles [Wed, 11 Apr 2012 16:44:26 +0000 (12:44 -0400)]
avutil: add better documentation for AVSampleFormat
Michael Niedermayer [Mon, 16 Apr 2012 16:26:49 +0000 (18:26 +0200)]
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>
Michael Niedermayer [Mon, 16 Apr 2012 16:22:22 +0000 (18:22 +0200)]
diracdec: check lowdelay bytes.
Fixes division by zero
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 16 Apr 2012 16:13:51 +0000 (18:13 +0200)]
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>
Michael Niedermayer [Mon, 16 Apr 2012 16:07:19 +0000 (18:07 +0200)]
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>
Mans Rullgard [Mon, 16 Apr 2012 14:48:05 +0000 (15:48 +0100)]
indeo3: add parens around some macro arguments
Without these, the expansion contains things like --1 with
some compilers resulting in build errors.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Ronald S. Bultje [Sun, 15 Apr 2012 15:11:55 +0000 (08:11 -0700)]
h264: use proper PROLOGUE statement for a function using 8 registers.
Fixes crashes when using biweight on win64.
Michael Niedermayer [Mon, 16 Apr 2012 14:46:53 +0000 (16:46 +0200)]
loco: fix 10l typo (missing case)
Found-by: Clément Bœsch <ubitux@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 16 Apr 2012 14:44:12 +0000 (16:44 +0200)]
dsicinav: Check for overread in RLE decode.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 16 Apr 2012 14:39:02 +0000 (16:39 +0200)]
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>
Michael Niedermayer [Mon, 16 Apr 2012 14:27:08 +0000 (16:27 +0200)]
dcadec: fix global array overread.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Mon, 16 Apr 2012 14:19:41 +0000 (16:19 +0200)]
Support decoding LOCO_CRGBA.
Fixes a part of ticket #1222.
Michael Niedermayer [Mon, 16 Apr 2012 12:38:40 +0000 (14:38 +0200)]
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>
Michael Niedermayer [Mon, 16 Apr 2012 12:30:33 +0000 (14:30 +0200)]
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>
Michael Niedermayer [Mon, 16 Apr 2012 11:51:40 +0000 (13:51 +0200)]
omadec: check GEOB sizes against buffer size
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 16 Apr 2012 11:40:55 +0000 (13:40 +0200)]
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>
Michael Niedermayer [Mon, 16 Apr 2012 11:35:41 +0000 (13:35 +0200)]
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>
Michael Niedermayer [Mon, 16 Apr 2012 10:01:55 +0000 (12:01 +0200)]
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>
Michael Niedermayer [Mon, 16 Apr 2012 09:51:17 +0000 (11:51 +0200)]
ffv1: attempt to workaround intel CC fate issue.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Tue, 28 Feb 2012 19:44:41 +0000 (20:44 +0100)]
doc: Update sample Vim config with suitable (function) indentation settings.
Diego Biurrun [Wed, 4 Apr 2012 15:32:55 +0000 (17:32 +0200)]
dv: Merge dvquant.h into dvdata.c where all other DV tables reside.
Diego Biurrun [Wed, 4 Apr 2012 15:13:13 +0000 (17:13 +0200)]
dv: Move static tables only used in one place to where they are used.
Anton Khirnov [Sun, 15 Apr 2012 19:08:37 +0000 (21:08 +0200)]
graphparser: set next to NULL on an entry extracted from inputs list
Prevents it from referring to the rest of the list.
Michael Niedermayer [Sun, 15 Apr 2012 23:57:36 +0000 (01:57 +0200)]
adxdec: Check available space before decoding block.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 15 Apr 2012 23:24:04 +0000 (01:24 +0200)]
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>
Robert Nagy [Sun, 15 Apr 2012 23:08:00 +0000 (01:08 +0200)]
lavfi/aresample: properly propagate pts == AV_NOPTS_VALUE;
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
Robert Nagy [Sun, 15 Apr 2012 13:46:37 +0000 (15:46 +0200)]
yadif: fixed missing error handling for poll_frame.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 15 Apr 2012 21:38:42 +0000 (23:38 +0200)]
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>
Michael Niedermayer [Sun, 15 Apr 2012 21:37:09 +0000 (23:37 +0200)]
mov: reset dref_count on realloc to keep values consistent.
This fixes a potential crash.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 15 Apr 2012 20:27:20 +0000 (22:27 +0200)]
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>
Michael Niedermayer [Sun, 15 Apr 2012 19:01:35 +0000 (21:01 +0200)]
indeo5: check for unsupported luma block type
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Tue, 3 Apr 2012 06:32:23 +0000 (08:32 +0200)]
doc/filters: update documentation.
Anton Khirnov [Mon, 2 Apr 2012 18:13:29 +0000 (20:13 +0200)]
avconv: flush decoders immediately after an EOF.
Prevents extensive buffering when overlaying a single picture.
Anton Khirnov [Sun, 1 Apr 2012 17:01:37 +0000 (19:01 +0200)]
avconv: send EOF to vsrc_buffer.
Anton Khirnov [Fri, 30 Mar 2012 20:07:56 +0000 (22:07 +0200)]
avconv: reindent.
Anton Khirnov [Sun, 1 Apr 2012 13:08:33 +0000 (15:08 +0200)]
avconv: add support for complex filtergraphs.
Anton Khirnov [Thu, 29 Mar 2012 06:51:17 +0000 (08:51 +0200)]
avconv: make filtergraphs global.
This is the first step towards supporting complex filtergraphs with more
than one input and/or output.