summaryrefslogtreecommitdiff
path: root/libavcodec
Commit message (Collapse)AuthorAge
* Merge commit '4b7f1a7ced0e98f2cc698d896f7ebab8d30eaa09'Michael Niedermayer2014-01-05
|\ | | | | | | | | | | | | | | | | | | | | * commit '4b7f1a7ced0e98f2cc698d896f7ebab8d30eaa09': mlp: Parse TrueHD decoder channel modifiers and set the AVMatrixEncoding for each substream. Conflicts: libavcodec/mlp_parser.h libavcodec/mlpdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mlp: Parse TrueHD decoder channel modifiers and set the AVMatrixEncoding for ↵Tim Walker2014-01-05
| | | | | | | | each substream.
* | Merge commit '30d70e79a6b4ac7f4eb66446a9da275161ef6ea7'Michael Niedermayer2014-01-05
|\| | | | | | | | | | | | | * commit '30d70e79a6b4ac7f4eb66446a9da275161ef6ea7': dcadec: set AV_FRAME_DATA_MATRIXENCODING side data. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dcadec: set AV_FRAME_DATA_MATRIXENCODING side data.Tim Walker2014-01-05
| |
* | Merge commit '6bfdb2de881372048be7fbda643417e1fd3ce93c'Michael Niedermayer2014-01-05
|\| | | | | | | | | | | | | | | | | | | * commit '6bfdb2de881372048be7fbda643417e1fd3ce93c': dcadec: set the output channel mode more accurately. Conflicts: libavcodec/dcadec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dcadec: set the output channel mode more accurately.Tim Walker2014-01-05
| | | | | | | | | | | | When downmixing 2.1 to 2-channel, if the 2.0 portion is Lt/Rt, sum-difference or dual mono, the actual output will be the same (with the LFE either mixed-in or discarded). Also, when downmixing an arbitrary layout to 2-channel, if the bitstream contains custom downmix coefficients targeting Lt/Rt, then the output will be Lt/Rt rather than regular Stereo.
* | Merge commit '5b4797a21db900b7d509660b7a4d49829089b004'Michael Niedermayer2014-01-05
|\| | | | | | | | | | | | | | | | | | | * commit '5b4797a21db900b7d509660b7a4d49829089b004': avframe: add AV_FRAME_DATA_MATRIXENCODING side data type. Conflicts: libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avframe: add AV_FRAME_DATA_MATRIXENCODING side data type.Tim Walker2014-01-05
| | | | | | | | Includes a libavcodec utility function to update a frame's side data.
* | vp9_parse: don't use AVCodecParserContext as av_log context.Ronald S. Bultje2014-01-05
| | | | | | | | | | | | Fixes trac ticket 3273. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '7f29644108c5fbd80f160930b31b78b8704c1a49'Michael Niedermayer2014-01-05
|\| | | | | | | | | | | | | * commit '7f29644108c5fbd80f160930b31b78b8704c1a49': aac: Fix low delay windowing. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * aac: Fix low delay windowing.Alex Converse2014-01-04
| | | | | | | | AAC LD uses a low overlap sine window instead of a KBD window.
* | Merge commit 'b2212dec0f011893ec68eecaa990170fa24050d7'Michael Niedermayer2014-01-05
|\| | | | | | | | | | | | | | | | | | | | | * commit 'b2212dec0f011893ec68eecaa990170fa24050d7': aac: Fix TNS decoding for the 512 sample window family. also temporarily disable fate-aac-er_ad6000np_44_ep0 as this commit causes a mismatch with the reference pcm file The test will be reenabled after all fixes and with a new pcm reference Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * aac: Fix TNS decoding for the 512 sample window family.Alex Converse2014-01-04
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-01-04
|\| | | | | | | | | | | | | * qatar/master: arm: Use the matching endfunc macro instead of the assembler directive directly Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * arm: Use the matching endfunc macro instead of the assembler directive directlyMartin Storsjö2014-01-04
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '2ad4ee345a4216aef3999f57dd14c56128d27a13'Michael Niedermayer2014-01-04
|\| | | | | | | | | | | | | * commit '2ad4ee345a4216aef3999f57dd14c56128d27a13': arm: Add a missing endfunc macro call Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * arm: Add a missing endfunc macro callMartin Storsjö2014-01-04
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | avcodec/rv30: put the rpr check back in init with the max vs bits bug fixedMichael Niedermayer2014-01-04
| | | | | | | | | | | | | | | | Its usefull to know immediatly if extradata is wrong and not just when later the decoder tries to use it. This check was removed by: a6a2282c25abe43e352010a7c3fbc92994c0bc1c Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/rv30: check rpr before use against maximumMichael Niedermayer2014-01-04
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/rv30: cleanup rpr handlingMichael Niedermayer2014-01-04
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/rv10: cleanup rpr handlingMichael Niedermayer2014-01-04
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-01-04
|\| | | | | | | | | | | | | | | | | | | * qatar/master: mpegvideo: remove disabled bfin asm Conflicts: libavcodec/bfin/mpegvideo_bfin.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: remove disabled bfin asmAnton Khirnov2014-01-03
| | | | | | | | It has been disabled as 'broken' over 3 years ago in b716a792
* | Merge commit 'a4d0c6e0503562d4cc8f9f6d02d84d7b32583b15'Michael Niedermayer2014-01-04
|\| | | | | | | | | | | | | | | | | | | * commit 'a4d0c6e0503562d4cc8f9f6d02d84d7b32583b15': mpegvideo: move dct_unquantize functions up to avoid forward declarations Conflicts: libavcodec/mpegvideo.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: move dct_unquantize functions up to avoid forward declarationsAnton Khirnov2014-01-03
| |
* | Merge commit 'aec25b1c4650944d32706bfd40eb02bbd5587303'Michael Niedermayer2014-01-04
|\| | | | | | | | | | | | | | | | | | | | | * commit 'aec25b1c4650944d32706bfd40eb02bbd5587303': mpegvideo: split the encoding-only parts of frame_start() into a separate function Conflicts: libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: split the encoding-only parts of frame_start() into a separate ↵Anton Khirnov2014-01-03
| | | | | | | | | | | | | | function This introduces some code duplication. However, much of it should go away once the decoders stop using MpegEncContext.
* | Merge commit '58312b2472d3a44d7458865c459d59ef2e02bf1a'Michael Niedermayer2014-01-04
|\| | | | | | | | | | | | | * commit '58312b2472d3a44d7458865c459d59ef2e02bf1a': h264: reset data_partitioning if decoding the slice header for NAL_DPA fails Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: reset data_partitioning if decoding the slice header for NAL_DPA failsAnton Khirnov2014-01-03
| | | | | | | | | | | | | | | | If it was set before then we can end up trying to decode a slice without a valid slice header, which can lead to invalid memory access. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC:libav-stable@libav.org
* | Merge commit 'e89aa4bf56e5b5c45f569eb12733519789e057da'Michael Niedermayer2014-01-04
|\| | | | | | | | | | | | | | | | | | | | | * commit 'e89aa4bf56e5b5c45f569eb12733519789e057da': lzw: switch to bytestream2 Conflicts: libavcodec/lzw.c See: 44c4170c52c10e3da3a7ea8e3435ef37c4edc2cc Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lzw: switch to bytestream2Anton Khirnov2014-01-03
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC:libav-stable@libav.org
* | Merge commit '24057c83207d6ea8bfd824155ac37be8a33dfd0c'Michael Niedermayer2014-01-04
|\| | | | | | | | | | | | | * commit '24057c83207d6ea8bfd824155ac37be8a33dfd0c': eacmv: check the framerate before setting it. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * eacmv: check the framerate before setting it.Anton Khirnov2014-01-03
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC:libav-stable@libav.org
* | Merge commit '5569146d48f06564e8fa393424782cceed510916'Michael Niedermayer2014-01-04
|\| | | | | | | | | | | | | | | * commit '5569146d48f06564e8fa393424782cceed510916': adx: check that the offset is not negative See: 30bce34b6719ca99ad72c62e2fba3eade71f1eae Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * adx: check that the offset is not negativeAnton Khirnov2014-01-03
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC:libav-stable@libav.org
* | Merge commit 'a6a2282c25abe43e352010a7c3fbc92994c0bc1c'Michael Niedermayer2014-01-04
|\| | | | | | | | | | | | | | | | | | | | | * commit 'a6a2282c25abe43e352010a7c3fbc92994c0bc1c': rv30: fix extradata size check. Conflicts: libavcodec/rv30.c See: 09c5f990bc7629dfbee8c760fd485936c60a7b40 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rv30: fix extradata size check.Anton Khirnov2014-01-03
| | | | | | | | | | | | | | | | It has been checking the number of bits in the offset instead of the actual offset. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC:libav-stable@libav.org
* | Merge commit 'feded990e3ef9af4a0b827d5b6d8fe86f0b94942'Michael Niedermayer2014-01-04
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'feded990e3ef9af4a0b827d5b6d8fe86f0b94942': mpegvideo: set reference/pict_type on generated reference frames Conflicts: libavcodec/mpegvideo.c The picture type is left at P type as it was explicitly set before Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: set reference/pict_type on generated reference framesAnton Khirnov2014-01-03
| | | | | | | | | | | | | | | | | | Otherwise the generic code will unref them, which can then result in last_picture_ptr == current_picture_ptr, which causes deadlocks at least in rv40. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC:libav-stable@libav.org
* | avcodec/mpegvideo: fix ac/dc_val and coded_block table sizesMichael Niedermayer2014-01-03
| | | | | | | | | | | | | | | | | | | | | | | | With interlaced vc1 it was possible that accesses could happen outside these tables before this. Regression since 017e234c204f8ffb5f85a073231247881be1ac6f Reproduced with a sample from Mateusz "j00ru" Jurczyk and Gynvael Coldwind Fixes (again) : 480i30__codec_WVC1__mode_2__framerate_29.970__type_2__preproc_17.SIGFPE.bfa.390.wmv No releases are affected by this Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/avcodec: document that some video decoders do not support linesizes ↵Michael Niedermayer2014-01-03
| | | | | | | | | | | | | | changing between frames. Omission in the documentation found by: Sebastian Dröge Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | h264: Clear ERContext.cur_pic when unref'ing current picture.Dale Curtis2014-01-02
| | | | | | | | Signed-off-by: Dale Curtis <dalecurtis@chromium.org>
* | avcodec/mace: check buffer sizeMichael Niedermayer2014-01-02
| | | | | | | | | | | | | | Fixes use of uninitialized memory Fixes: msan_uninit-mem_7f9d2775e090_8782_surge-2-8-MAC3.mov Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mp3on4: fail when the header check failsMichael Niedermayer2014-01-02
| | | | | | | | | | | | | | | | | | | | | | It seems the code assumed that when one out of multiple blocks fail some span of time is correct, its not, its some channels that are correct Fixes use of uninitialized memory Fixes: msan_uninit-mem_7f44a03ba3ce_5692_id5_1.mp4 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/aacps: fix number of bands used with ipd/opdMichael Niedermayer2014-01-02
| | | | | | | | | | | | | | Fixes use of uninitialized memory Fixes: msan_uninit-mem_7f861d16355f_1664_File1_fixed.aac Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/iff: ensure that runs with insufficient input dont leave ↵Michael Niedermayer2014-01-02
| | | | | | | | | | | | | | | | | | uninitialized bytes in the output Fixes use of uninitialized memory Fixes: msan_uninit-mem_7fa0dea15eae_8988_test.iff Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | atrac3plus: Add forgotten initialization of an internal structMaxim Poliakovski2014-01-02
| | | | | | | | | | | | This patch also fixes trac ticket 3254. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/vqavideo: use av_mallocz() for decode_buffer()Michael Niedermayer2014-01-01
| | | | | | | | | | | | | | Fixes use of uninitialized memory Fixes: msan_uninit-mem_7f62eaba897d_595_4D6EFA92.VQA Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/binkaudio: clear padding area of packet_bufferMichael Niedermayer2014-01-01
| | | | | | | | | | | | | | Fixes use of uninitialized memory Fixes: msan_uninit-mem_7f0dba198b34_2970_Snd0a3a2ad4.dee Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | dxva2_vc1: signal skipped p framesHendrik Leppkes2014-01-01
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>