aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-04-2252-841/+219
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * ARM: allow runtime masking of CPU featuresMans Rullgard2012-04-2220-25/+164
| | | | | | | | | | | | | | 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>
| * dsputil: remove unused functionsMans Rullgard2012-04-211-62/+0
| | | | | | | | | | | | These functions were left unused by the lowres removal. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * mov: Treat keyframe indexes as 1-origin if starting at non-zero.Yusuke Nakamura2012-04-211-1/+1
| | | | | | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * mov: Take stps entries into consideration also about key_off.Yusuke Nakamura2012-04-211-1/+1
| | | | | | | | | | | | Splitted files don't start always from a sync sample. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * Remove lowres video decodingMans Rullgard2012-04-2134-755/+56
| | | | | | | | | | | | | | This feature is complex, of questionable utility, and slows down normal decoding. Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Support flicvideo with 904 bytes extradata.Carl Eugen Hoyos2012-04-221-2/+5
| | | | | | | | Fixes ticket #1234.
* | ffmpeg: assert the refcount of decoded framesMichael Niedermayer2012-04-221-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: assert the refcount of allocated frames,Michael Niedermayer2012-04-221-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: assert against creation of cycles in the pools linked list.Michael Niedermayer2012-04-221-0/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: stricter refcount check in unref_buffer()Michael Niedermayer2012-04-221-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpeg12dec: reset data size after parsing extradata.Michael Niedermayer2012-04-221-0/+1
| | | | | | | | | | | | | | | | 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>
* | iff: fix null ptr dereferenceMichael Niedermayer2012-04-221-1/+1
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | audemux: Fix potential integer overflow leading to a division by 0Michael Niedermayer2012-04-221-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | audemux: Check channels isnt 0Michael Niedermayer2012-04-221-0/+5
| | | | | | | | | | | | | | Fixes a division by 0 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | wtvdec: Check that stream private context has been allocated before use.Michael Niedermayer2012-04-221-1/+1
| | | | | | | | | | | | | | This fixes a null ptr dereference with attachments Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mjpegbdec: check SOS/SOF ordering.Michael Niedermayer2012-04-222-5/+8
| | | | | | | | | | | | | | Fixes null ptr dereference Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffv1dec: Require a valid keyframe for decoding non keyframes.Michael Niedermayer2012-04-221-0/+7
| | | | | | | | | | | | | | | | 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>
* | ffmpeg: fix validity test for file index.Nicolas George2012-04-221-2/+2
| | | | | | | | Also fix a typo in the next line.
* | asv1dec: check extradatasize before reading.Michael Niedermayer2012-04-221-2/+1
| | | | | | | | | | | | | | Fixes null ptr dereference Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | indeo5: check against scaleable frames in non scaleable streams.Michael Niedermayer2012-04-221-0/+6
| | | | | | | | | | | | | | Fixes a null ptr dereference. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | smackerdemux: Allocate padding for extradataMichael Niedermayer2012-04-221-1/+1
| | | | | | | | | | | | | | Fixes slight overread. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | svq1dec: Fix overread on very small inputMichael Niedermayer2012-04-221-0/+3
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | wmaprodec: tighter check for num_vec_coeffsMichael Niedermayer2012-04-221-1/+2
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-04-219-77/+79
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * avcodec: remove AVCodecContext.dsp_maskMans Rullgard2012-04-214-15/+8
| | | | | | | | | | | | | | | | This removes all references to AVCodecContext.dsp_mask and marks it for eviction at the next version bump. It has been superseded by av_set_cpu_flag_mask() which, unlike this field, works everywhere. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * avconv: fix a segfault when default encoder for a format doesn't exist.Anton Khirnov2012-04-211-8/+10
| | | | | | | | Fail earlier and with a more descriptive error message.
| * utvideo: general cosmeticsJan Ekström2012-04-201-46/+54
| | | | | | | | | | | | | | | | | | General cosmetics, such as keeping lines under 80 characters, fixing a couple of typos (predition -> prediction) and a general style fix that was pointed out by Derek when I was having my sliced multithreading patch in review by him. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * aac: Handle HE-AACv2 when sniffing a channel order.Alex Converse2012-04-201-0/+7
| |
| * movenc: Support high sample rates in isomedia formats by setting the sample ↵Alex Converse2012-04-201-12/+7
| | | | | | | | | | | | rate field in stsd to 0. Libisomediafile appears to always set this field to zero.
| * xxan: Remove write-only variable in xan_decode_frame_type0().Diego Biurrun2012-04-201-4/+1
| | | | | | | | libavcodec/xxan.c:293:13: warning: variable ‘corr_end’ set but not used
| * ivi_common: Initialize a variable at declaration in ff_ivi_decode_blocks().Diego Biurrun2012-04-201-4/+2
| | | | | | | | This simplifies the code a bit and avoids an uninitialized variable warning.
* | Support broken v210 files with 64 byte padding.Carl Eugen Hoyos2012-04-212-5/+13
| | | | | | | | | | | | Fixes ticket #743. Reviewed-by: Paul B Mahol
* | dnxhddec: check that the indicated bit depth matches the tables.Michael Niedermayer2012-04-211-0/+4
| | | | | | | | | | | | | | Fixes crash Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | xldec: move buffer size check up, it can be done before allocating a frameMichael Niedermayer2012-04-211-5/+5
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | xldec: Check that width is a multiple of 4Michael Niedermayer2012-04-211-0/+5
| | | | | | | | | | | | | | Fixes out of array reads Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | xmvdemux: prefer av_freep() to deallocate audio stream structs.Michael Niedermayer2012-04-211-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | xmvdemux: dont let current_stream become invalid.Michael Niedermayer2012-04-211-1/+1
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | cook: check subacket countMichael Niedermayer2012-04-211-0/+5
| | | | | | | | | | | | | | Fixes out of array writes. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | wmalossless: Ensure that last frame is not written again if nothing was ↵Jakub Stachowski2012-04-211-0/+2
| | | | | | | | | | | | | | decoded in current packet. Reviewed-by: Mashiat Sarker Shakkhar <mashiat.sarker@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffprobe: do not try to decode empty packets.Nicolas George2012-04-211-1/+1
| | | | | | | | Fixes sporadic decode failures and trac ticket #997.
* | lavfi/setfield: remove stray argument in av_log()Stefano Sabatini2012-04-211-1/+1
| | | | | | | | | | | | Fix warning: libavfilter/vf_setfield.c: In function ‘init’: libavfilter/vf_setfield.c:64:20: warning: too many arguments for format [-Wformat-extra-args]
* | lavfi/setfield: rename variable top_field_first to modeStefano Sabatini2012-04-211-12/+19
| | | | | | | | | | The new name better reflects the meaning of the variable, after the recent change.
* | lavfi/setfield: add "progressive" optionTim Nicholson2012-04-213-15/+22
| | | | | | | | | | | | Add "prog" parameter value, and deprecate numeric values. Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
* | Revert "h264: assembly version of get_cabac for x86_64 with PIC (v4)"Michael Niedermayer2012-04-213-125/+25
| | | | | | | | | | | | This broke compilation on darwin, revert until a better solution is found. This reverts commit a812b599b504b39a8021827da89d5e23fb361cc9.
* | fix swr_convert buffering of packed audioAndrew Wason2012-04-211-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | swr_convert is not properly buffering packed input audio when the output is not large enough, and when resampling is not actually needed (same samplerate and no SWR_FLAG_RESAMPLE). buf_set() is only handling the first channel and leaving the others as-is. Sample program to reproduce the problem is here https://gist.github.com/2431768 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | h264: assembly version of get_cabac for x86_64 with PIC (v4)Roland Scheidegger2012-04-213-25/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a hand-optimized assembly version for get_cabac much like the existing one, but it works if the table offsets are RIP-relative. Compared to the non-RIP-relative version this adds 2 lea instructions and it needs one extra register. There is a surprisingly large performance improvement over the c version (more so than the generated assembly seems to suggest) just in get_cabac, I measured roughly 40% faster for get_cabac on a K8. However, overall the difference is not that big, I measured roughly 5% on a test clip on a K8 and a Core2. Hopefully it still compiles on x86 32bit... v2: incorporated feedback from Loren Merritt to avoid rip-relative movs for every table, and got rid of unnecessary @GOTPCREL. v3: apply similar fixes to the the decode_significance functions, and use same macro arguments for non-pic case. v4: prettify inline asm arguments, add a non-fast-cmov version (as I expect the c code to be faster otherwise since both cmov and sbb suck hard on a Prescott, even can't construct the mask with a 64bit shift as that's just as terrible - it's quite difficult to find usable instructions on that chip...). This is tested to work but not on a P4, in theory it _should_ be fast there. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-04-2032-146/+536
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: avcodec: add a cook parser to get subpacket duration FATE: allow lavf tests to alter input parameters FATE: replace the acodec-pcm_s24daud test with an enc_dec_pcm checksum test FATE: replace the acodec-g726 test with 4 new encode/decode tests FATE: replace current g722 encoding tests with an encode/decode test FATE: add a pattern rule for generating asynth wav files FATE: optionally write a WAVE header in audiogen avutil: add audio fifo buffer Conflicts: doc/APIchanges libavcodec/version.h libavutil/avutil.h tests/Makefile tests/codec-regression.sh tests/fate/voice.mak tests/lavf-regression.sh tests/ref/acodec/g722 tests/ref/acodec/g726 tests/ref/acodec/pcm_s24daud tests/ref/lavf/dv_fmt tests/ref/lavf/gxf tests/ref/lavf/mxf tests/ref/lavf/mxf_d10 tests/ref/seek/lavf_dv Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avcodec: add a cook parser to get subpacket durationJustin Ruggles2012-04-205-2/+64
| | | | | | | | Fixes jittery video playback of rm files with cook audio.
| * FATE: allow lavf tests to alter input parametersJustin Ruggles2012-04-206-36/+36
| | | | | | | | Change some lavf tests to avoid resampling and channel mixing.