OSDN Git Service
Michael Niedermayer [Thu, 26 Apr 2012 11:58:58 +0000 (13:58 +0200)]
swr-test: remove unneeded hack to test planar formats.
planar formats are now chosen like any other parameter.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 26 Apr 2012 11:05:17 +0000 (13:05 +0200)]
swr-test: improve output
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 26 Apr 2012 10:17:29 +0000 (12:17 +0200)]
swr-test: print channel layout, instead of just channel counts
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 26 Apr 2012 10:14:28 +0000 (12:14 +0200)]
swr-test: Use randomized collision free hypercube corner enumeration to select tests.
This way the user can specify how many or few tests should run while
still providing good coverage over the whole parameter set.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 26 Apr 2012 08:56:36 +0000 (10:56 +0200)]
swr-test: use formats array
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 26 Apr 2012 08:35:45 +0000 (10:35 +0200)]
swr-test: remove 0 terminator in layouts for consistency
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 26 Apr 2012 07:57:02 +0000 (09:57 +0200)]
swr-test: add rates tables containing a new set of sample rates.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 26 Apr 2012 07:55:14 +0000 (09:55 +0200)]
swr-test: indent
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 26 Apr 2012 07:54:01 +0000 (09:54 +0200)]
swr-test: add sorted formats table from avr
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 26 Apr 2012 02:35:30 +0000 (04:35 +0200)]
ffv1: add examples of supported slices counts
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 25 Apr 2012 23:35:22 +0000 (01:35 +0200)]
swr: pass resample parameters from the user to the resampler.
doxy and names stolen from avr
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 25 Apr 2012 23:14:48 +0000 (01:14 +0200)]
swr: Add longer more descriptive alternative AVOptions.
They match avresample where it supports the same fields.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 25 Apr 2012 23:03:32 +0000 (01:03 +0200)]
swr: Capitalize help texts for AVOptions
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 25 Apr 2012 23:00:43 +0000 (01:00 +0200)]
swr: align options a little
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 25 Apr 2012 22:46:58 +0000 (00:46 +0200)]
swr: set AV_OPT_FLAG_AUDIO_PARAM for the AVOptions
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 25 Apr 2012 20:01:59 +0000 (22:01 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
FATE: use updated reference for aac-latm_stereo_to_51
avconv: use libavresample
Add libavresample
FATE: avoid channel mixing in lavf-dv_fmt
Conflicts:
Changelog
Makefile
cmdutils.c
configure
doc/APIchanges
ffmpeg.c
tests/lavf-regression.sh
tests/ref/lavf/dv_fmt
tests/ref/seek/lavf_dv
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 25 Apr 2012 16:04:45 +0000 (18:04 +0200)]
ffv1: remove clear_state(), it has become unused
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 25 Apr 2012 16:02:43 +0000 (18:02 +0200)]
ffv1: move clear_state() to clear_slice_state() in encoding threads
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 25 Apr 2012 15:51:17 +0000 (17:51 +0200)]
ffv1: indent
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 25 Apr 2012 15:50:55 +0000 (17:50 +0200)]
ffv1: move init_slice_state() into the decoder threads.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 25 Apr 2012 13:01:32 +0000 (15:01 +0200)]
ffv1: Remove slice count field with 1.3 and just count slices.
This field was problematic because in case of damaged slices it can be
lost
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 25 Apr 2012 12:59:15 +0000 (14:59 +0200)]
ffv1: store slice size with all slices in 1.3
This simplifies handling by removing a special case.
Its also needed to make the next change possible.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 25 Apr 2012 10:05:06 +0000 (12:05 +0200)]
ffv1: add 1 status byte to slices in in case crcs are stored too.
This will allow storing of information about corrected and uncorrectable
errors.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 25 Apr 2012 10:01:44 +0000 (12:01 +0200)]
ffv1: Always store slice size when error reobustness is enabled.
This simplifies finding slices within a damaged bitstream.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 25 Apr 2012 09:21:30 +0000 (11:21 +0200)]
ffv1: include solution hint in the slice error message
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Justin Ruggles [Mon, 23 Apr 2012 18:03:25 +0000 (14:03 -0400)]
FATE: use updated reference for aac-latm_stereo_to_51
This uses correct stereo to 5.1 upmixing via libavresample.
Justin Ruggles [Thu, 5 Apr 2012 18:06:28 +0000 (14:06 -0400)]
avconv: use libavresample
Justin Ruggles [Fri, 23 Mar 2012 21:42:17 +0000 (17:42 -0400)]
Add libavresample
This is a new library for audio sample format, channel layout, and sample rate
conversion.
Michael Niedermayer [Tue, 24 Apr 2012 21:44:56 +0000 (23:44 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avconv: fix a segfault on -c copy with -filter_complex.
isom: Support more DTS codec identifiers.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 24 Apr 2012 21:28:37 +0000 (23:28 +0200)]
ffv1: support vlc mode in 1.3
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 24 Apr 2012 21:27:47 +0000 (23:27 +0200)]
ffv1: move the decoder side ac->vlc switch to decode_slice()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 24 Apr 2012 21:05:16 +0000 (23:05 +0200)]
ffv1: allow selecting 1.3 by using -level
Note, 1.3 is not finalized and the bitstream will still change
do not use it yet. This option is just to make playing with it
easier, otherwise one would have to edit the source
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 24 Apr 2012 20:54:50 +0000 (22:54 +0200)]
ffv1: move ac->vlc switch to encode_slice()
This will allow us to use vlc coding in 1.3 too
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Justin Ruggles [Tue, 24 Apr 2012 19:50:20 +0000 (15:50 -0400)]
FATE: avoid channel mixing in lavf-dv_fmt
This partially reverts
acb1730218f1c614dc8ca3ba45d9de1e05059515
which would only have needed to change the checksums if channel mixing had
been properly avoided. This changes the output file size reference and the
seek test reference back to the previous values.
Reimar Döffinger [Tue, 24 Apr 2012 18:18:57 +0000 (20:18 +0200)]
parseutils: reliably detect out-of-range alpha.
This should fix the FATE test on ARM (not tested),
but it should also detect alpha values like 2^128
reliably as invalid which would be another out-of-range
case with implementation-dependant behaviour.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Michael Niedermayer [Tue, 24 Apr 2012 16:44:51 +0000 (18:44 +0200)]
ffmpeg: Fix initial dts for streamcopy, if the input packets lack dts.
Fixes Ticket1138
Based on a patch by: Eelco Lempsink <eml@tupil.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Tue, 24 Apr 2012 15:23:43 +0000 (17:23 +0200)]
Add missing newline in shorten decoder.
Nicolas George [Mon, 23 Apr 2012 14:55:11 +0000 (16:55 +0200)]
avfiltergraph: fix format selection.
The old code had two bugs:
For audio filters, the format was not set.
For video filters, if several links reference the same format list,
the same format must be selected in the end. This is done by
setting formats->format_count to 1: the other links sharing
the reference will therefore have only one choice.
If the heuristic does not pick the first format, the selected format
must also be moved to the first position.
Nicolas George [Tue, 24 Apr 2012 08:52:55 +0000 (10:52 +0200)]
ffmpeg: do not report EOF as an error.
Not all processing goes through filters,
so processing can continue even when
all filtergraphs have reached EOF on all sinks.
Michael Niedermayer [Tue, 24 Apr 2012 08:40:46 +0000 (10:40 +0200)]
mpc8: print error messages on maxband(s) errors
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 24 Apr 2012 08:40:00 +0000 (10:40 +0200)]
mpc8: make maxband check less picky.
Fixes Ticket1245
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Sat, 21 Apr 2012 05:03:06 +0000 (07:03 +0200)]
avconv: fix a segfault on -c copy with -filter_complex.
Michael Niedermayer [Mon, 23 Apr 2012 22:19:55 +0000 (00:19 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
matroska: Clear prev_pkt between seeks.
avutil: change default buffer size alignment for sample buffer functions
audemux: Add a sanity check for the number of channels
Remove libdirac decoder.
matroska: Add incremental parsing of clusters.
avconv: fix off by one check in complex_filter
mpegts: Try seeking back even for nonseekable protocols
swscale: K&R formatting cosmetics (part III)
Conflicts:
configure
doc/general.texi
doc/platform.texi
ffmpeg.c
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/libdirac.h
libavcodec/libdiracdec.c
libavformat/au.c
libavformat/mpegts.c
libswscale/input.c
tests/ref/seek/lavf_mkv
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Nicolas George [Mon, 23 Apr 2012 21:27:16 +0000 (23:27 +0200)]
avfiltergraph: free the sink_links heap.
Reimar Döffinger [Mon, 23 Apr 2012 21:21:55 +0000 (23:21 +0200)]
Get rid of tests/data/asynth-%.sw rule.
This also avoids an issue with parallel make in some
cases never building asynth-16000-1.sw.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Michael Niedermayer [Mon, 23 Apr 2012 19:40:02 +0000 (21:40 +0200)]
indeo4: check quant_mat more fully.
quant_mats valid range depends on the block size.
This fixes a global array overread.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Reimar Döffinger [Sun, 22 Apr 2012 17:14:01 +0000 (19:14 +0200)]
Simplify asynth sample generation.
One rule can be used to generate all asynth files.
Requires renaming the mapchan files though.
Also switch to using the .wav variants for mapchan
while changing the name anyway, this allows getting rid
of the explicitly specified format.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Yusuke Nakamura [Fri, 20 Jan 2012 18:56:05 +0000 (03:56 +0900)]
isom: Support more DTS codec identifiers.
DTS LBR identifier ('dtse') is not included since libavcodec doesn't support it yet.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Dale Curtis [Mon, 23 Apr 2012 16:15:31 +0000 (16:15 +0000)]
matroska: Clear prev_pkt between seeks.
The new incremental parser doesn't always clear prev_pkt,
however the packet queue is cleared when seeking. Which leads
to a use-after-free.
Verified using Valgrind.
Signed-off-by: Dale Curtis <dalecurtis@chromium.org>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
Justin Ruggles [Tue, 10 Apr 2012 14:53:55 +0000 (10:53 -0400)]
avutil: change default buffer size alignment for sample buffer functions
Aligning nb_samples will give both correct plane pointer alignment and enough
padding for SIMD-optimized functions.
Michael Niedermayer [Mon, 23 Apr 2012 17:41:46 +0000 (19:41 +0200)]
h264: some fields in SEIs are longer than 25 bits thus use get_bits_long()
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Nicolas George [Mon, 23 Apr 2012 12:12:23 +0000 (14:12 +0200)]
print_options: warn that the files are generated.
Nicolas George [Mon, 16 Apr 2012 13:58:21 +0000 (15:58 +0200)]
parseutils: add av_parse_time() test.
Nicolas George [Mon, 16 Apr 2012 13:57:18 +0000 (15:57 +0200)]
parseutils: make av_parse_time() check for failure.
Until now, av_parse_time() would accept "1:00" as "1"
and silently ignore ":00".
This patch also includes a few cosmetic changes.
Nicolas George [Mon, 16 Apr 2012 10:17:51 +0000 (12:17 +0200)]
parseutils: add FATE test.
Nicolas George [Thu, 19 Apr 2012 16:44:55 +0000 (18:44 +0200)]
ffmpeg: directly request frames from filters.
It allows ffmpeg filtering logic to work with filters
that do not implement the poll_frame method,
such as split or tile.
Nicolas George [Thu, 19 Apr 2012 15:08:27 +0000 (17:08 +0200)]
buffersink: add AV_BUFFERSINK_FLAG_NO_REQUEST.
Nicolas George [Thu, 19 Apr 2012 14:31:20 +0000 (16:31 +0200)]
vsrc_buffer: count the number of failed requests.
Nicolas George [Tue, 17 Apr 2012 16:31:25 +0000 (18:31 +0200)]
vsrc_buffer: return EAGAIN if no frame is available.
This is not an erroneous condition, do not print a warning.
Nicolas George [Wed, 18 Apr 2012 09:02:22 +0000 (11:02 +0200)]
avfiltergraph: add avfilter_graph_request_oldest().
Keep a heap of all sink links ordered by timestamps.
Nicolas George [Thu, 19 Apr 2012 10:43:33 +0000 (12:43 +0200)]
avfilter: add a pointer from links to graph.
Nicolas George [Tue, 17 Apr 2012 16:26:44 +0000 (18:26 +0200)]
avfilter: document request_frame return codes.
Nicolas George [Sat, 21 Apr 2012 10:05:23 +0000 (12:05 +0200)]
lavf: print a warning if probesize seems not enough.
Michael Niedermayer [Mon, 23 Apr 2012 01:29:48 +0000 (03:29 +0200)]
vp8: fix crash due to skiped update_dimensions().
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 23 Apr 2012 07:33:55 +0000 (10:33 +0300)]
audemux: Add a sanity check for the number of channels
Fixes a division by 0.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Martin Storsjö <martin@martin.st>
Diego Biurrun [Sat, 14 Apr 2012 12:54:03 +0000 (14:54 +0200)]
Remove libdirac decoder.
libschroedinger is the preferred way to decode Dirac video.
Dale Curtis [Thu, 19 Apr 2012 18:12:24 +0000 (11:12 -0700)]
matroska: Add incremental parsing of clusters.
Reduces the amount of upfront data required for cluster parsing
thus decreasing latency on seek and startup.
The change in the seek-lavf_mkv FATE test is due to incremental
parsing no longer reading as much data as the old parser and
thus not having that additional data to generate index entries
based on keyframes. Index entries are added correctly as the
file is parsed.
All FATE tests pass and Chrome has been using this patch for ~6
months without issue.
Currently incremental parsing is not supported for files with
SSA tracks since they require merging packets between clusters.
In this case the code falls back to non-incremental parsing.
Signed-off-by: Aaron Colwell <acolwell@chromium.org>
Signed-off-by: Dale Curtis <dalecurtis@chromium.org>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Luca Barbato [Sun, 22 Apr 2012 23:37:54 +0000 (16:37 -0700)]
avconv: fix off by one check in complex_filter
nb_input_files is already an invalid index.
Martin Storsjö [Sat, 21 Apr 2012 19:48:34 +0000 (22:48 +0300)]
mpegts: Try seeking back even for nonseekable protocols
The mpegts demuxer reads 5 KB at startup just for discovering
the packet size. Since the default avio buffer size is 32 KB,
the seek back to the start will in most cases be within the
avio buffer, and will in most cases succeed even if the actual
protocol isn't seekable.
This makes the demuxer startup faster/with less data when
reading data from a non-seekable input, by not skipping
the first few KB.
If it fails, don't warn if the protocol isn't seekable, making
it behave as before in the failure case.
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Sun, 22 Apr 2012 19:37:54 +0000 (21:37 +0200)]
lowres2 support.
The new lowres support is limited to decoders where lowres decoding
is possible in high quality.
I was not able to measure any speed difference, but if one is found
the 2-3 lines that might affect speed can be made compile time conditional
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 22 Apr 2012 20:26:42 +0000 (22:26 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
ARM: allow runtime masking of CPU features
dsputil: remove unused functions
mov: Treat keyframe indexes as 1-origin if starting at non-zero.
mov: Take stps entries into consideration also about key_off.
Remove lowres video decoding
Conflicts:
ffmpeg.c
ffplay.c
libavcodec/arm/vp8dsp_init_arm.c
libavcodec/libopenjpegdec.c
libavcodec/mjpegdec.c
libavcodec/mpegvideo.c
libavcodec/utils.c
libavformat/mov.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Sun, 22 Apr 2012 20:07:02 +0000 (22:07 +0200)]
Support flicvideo with 904 bytes extradata.
Fixes ticket #1234.
Michael Niedermayer [Sun, 22 Apr 2012 18:10:00 +0000 (20:10 +0200)]
ffmpeg: assert the refcount of decoded frames
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 22 Apr 2012 18:08:00 +0000 (20:08 +0200)]
ffmpeg: assert the refcount of allocated frames,
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 22 Apr 2012 18:07:04 +0000 (20:07 +0200)]
ffmpeg: assert against creation of cycles in the pools linked list.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 22 Apr 2012 18:05:58 +0000 (20:05 +0200)]
ffmpeg: stricter refcount check in unref_buffer()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 22 Apr 2012 18:03:53 +0000 (20:03 +0200)]
mpeg12dec: reset data size after parsing extradata.
This ended up corrupting data structures and may possibly
lead to a double free.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Sun, 15 Apr 2012 19:33:30 +0000 (21:33 +0200)]
swscale: K&R formatting cosmetics (part III)
Michael Niedermayer [Sun, 22 Apr 2012 14:41:21 +0000 (16:41 +0200)]
iff: fix null ptr dereference
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 22 Apr 2012 13:34:21 +0000 (15:34 +0200)]
audemux: Fix potential integer overflow leading to a division by 0
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 22 Apr 2012 13:32:58 +0000 (15:32 +0200)]
audemux: Check channels isnt 0
Fixes a division by 0
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 22 Apr 2012 13:29:34 +0000 (15:29 +0200)]
wtvdec: Check that stream private context has been allocated before use.
This fixes a null ptr dereference with attachments
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 22 Apr 2012 12:19:18 +0000 (14:19 +0200)]
mjpegbdec: check SOS/SOF ordering.
Fixes null ptr dereference
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 22 Apr 2012 11:56:07 +0000 (13:56 +0200)]
ffv1dec: Require a valid keyframe for decoding non keyframes.
Before this the context could become inconsistent, this lead to a null ptr
dereference.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Mans Rullgard [Sat, 21 Apr 2012 14:31:10 +0000 (15:31 +0100)]
ARM: allow runtime masking of CPU features
This allows masking CPU features with the -cpuflags avconv option
which is useful for testing different optimisations without rebuilding.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Nicolas George [Sun, 22 Apr 2012 10:11:50 +0000 (12:11 +0200)]
ffmpeg: fix validity test for file index.
Also fix a typo in the next line.
Michael Niedermayer [Sun, 22 Apr 2012 10:16:29 +0000 (12:16 +0200)]
asv1dec: check extradatasize before reading.
Fixes null ptr dereference
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 22 Apr 2012 10:09:59 +0000 (12:09 +0200)]
indeo5: check against scaleable frames in non scaleable streams.
Fixes a null ptr dereference.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 22 Apr 2012 09:23:58 +0000 (11:23 +0200)]
smackerdemux: Allocate padding for extradata
Fixes slight overread.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 22 Apr 2012 09:10:17 +0000 (11:10 +0200)]
svq1dec: Fix overread on very small input
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 22 Apr 2012 01:47:53 +0000 (03:47 +0200)]
wmaprodec: tighter check for num_vec_coeffs
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 21 Apr 2012 20:56:07 +0000 (22:56 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avcodec: remove AVCodecContext.dsp_mask
avconv: fix a segfault when default encoder for a format doesn't exist.
utvideo: general cosmetics
aac: Handle HE-AACv2 when sniffing a channel order.
movenc: Support high sample rates in isomedia formats by setting the sample rate field in stsd to 0.
xxan: Remove write-only variable in xan_decode_frame_type0().
ivi_common: Initialize a variable at declaration in ff_ivi_decode_blocks().
Conflicts:
ffmpeg.c
libavcodec/utvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Sat, 21 Apr 2012 20:31:11 +0000 (22:31 +0200)]
Support broken v210 files with 64 byte padding.
Fixes ticket #743.
Reviewed-by: Paul B Mahol
Michael Niedermayer [Sat, 21 Apr 2012 19:39:18 +0000 (21:39 +0200)]
dnxhddec: check that the indicated bit depth matches the tables.
Fixes crash
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 21 Apr 2012 19:30:51 +0000 (21:30 +0200)]
xldec: move buffer size check up, it can be done before allocating a frame
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 21 Apr 2012 19:29:48 +0000 (21:29 +0200)]
xldec: Check that width is a multiple of 4
Fixes out of array reads
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Mans Rullgard [Sat, 21 Apr 2012 18:51:19 +0000 (19:51 +0100)]
dsputil: remove unused functions
These functions were left unused by the lowres removal.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Yusuke Nakamura [Mon, 16 Apr 2012 14:27:45 +0000 (23:27 +0900)]
mov: Treat keyframe indexes as 1-origin if starting at non-zero.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Yusuke Nakamura [Fri, 13 Apr 2012 10:44:34 +0000 (19:44 +0900)]
mov: Take stps entries into consideration also about key_off.
Splitted files don't start always from a sync sample.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Mans Rullgard [Thu, 12 Apr 2012 12:55:49 +0000 (13:55 +0100)]
Remove lowres video decoding
This feature is complex, of questionable utility, and slows down
normal decoding.
Signed-off-by: Mans Rullgard <mans@mansr.com>