aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-04-2244-836/+129
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-2214-24/+76
| | | | | | | | | | | | | | 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>
| * Remove lowres video decodingMans Rullgard2012-04-2132-744/+55
| | | | | | | | | | | | | | 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.
* | 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>
* | 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>
* | 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>
* | 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-217-65/+71
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * 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
| |
| * 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>
* | 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>
* | 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.
* | 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-204-2/+63
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-204-2/+63
| | | | | | | | Fixes jittery video playback of rm files with cook audio.
* | indeo3: Fix reallocation code so that it doesnt become inconsistent.Michael Niedermayer2012-04-201-12/+10
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ac3dec: Check number of output channels.Michael Niedermayer2012-04-201-0/+4
| | | | | | | | | | | | | | Fixes out of array write. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avsdec: Set dimensions instead of relying on the demuxer.Michael Niedermayer2012-04-201-0/+1
| | | | | | | | | | | | | | This fixes out of array writes. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffv1: add optional per slice CRCs to detect undamaged slices.Michael Niedermayer2012-04-201-1/+22
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffv1: move most fields from the frame header to the slice headers with ffv1.3Michael Niedermayer2012-04-201-6/+100
| | | | | | | | | | | | This will allow decoding a single undamaged slice even if all others are lost Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffv1: refactor slice decoding init loop so that the first is less a special caseMichael Niedermayer2012-04-201-15/+18
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffv1: clear slice state in decode_slice()Michael Niedermayer2012-04-201-2/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffv1: split clear_slice_state() out so individual slices can be cleared.Michael Niedermayer2012-04-201-4/+10
| | | | | | | | | | | | This allows us to clear outside of the main thread for example. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffv1: split init_slice_state() out so individual slices can be initedMichael Niedermayer2012-04-201-7/+14
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffv1: Add a CRC check to the global header with version 1.3Michael Niedermayer2012-04-201-1/+14
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-04-192-6/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: dv: Initialize encoder tables during encoder init. dv: Replace some magic numbers by the appropriate #define. FATE: pass the decoded output format and audio source file to enc_dec_pcm FATE: specify the input format when decoding in enc_dec_pcm() x86inc: support AVX abstraction for 2-operand instructions configure: detect PGI compiler and set suitable flags avconv: check for an incompatible changing channel layout avio: make AVIOContext.av_class pointer to const nutdec: add malloc check and fix const to non-const conversion warnings Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dv: Initialize encoder tables during encoder init.Diego Biurrun2012-04-191-2/+2
| |
| * dv: Replace some magic numbers by the appropriate #define.Diego Biurrun2012-04-191-4/+4
| |
* | mlpdec: set channel variables after checking themMichael Niedermayer2012-04-191-8/+13
| | | | | | | | | | | | | | This fixes out of array reads Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Make targa-in-mov QuickTime-compatible for more colour-spaces.Carl Eugen Hoyos2012-04-191-0/+3
| | | | | | | | See ticket #1228.
* | Print unexpected length of flicvideo extradata.Carl Eugen Hoyos2012-04-191-1/+1
| |
* | h263dec: Check for width/height changes on frame skips too.Michael Niedermayer2012-04-191-1/+1
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | error_concealment: Check that the reference is not NULLMichael Niedermayer2012-04-191-0/+4
| | | | | | | | | | | | | | | | | | | | | | In normal picture decoding this does not need to be checked but as error concealment is run in the case of errors the availability of references is less certain. This may be fixed differently at some point so that all references are always filled in before the EC code, in which case this should then be changed to an assert() Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | error_concealment: make sure mbaff flags are 0 as interlaced is not supported.Michael Niedermayer2012-04-191-1/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | error_concealment: switch asserts mostly to av_asserts.Michael Niedermayer2012-04-191-4/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | vc1dec: check that coded slice positions and interlacing match.Michael Niedermayer2012-04-191-0/+4
| | | | | | | | | | | | | | This fixes out of array writes Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>