aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
Commit message (Collapse)AuthorAgeFilesLines
* aacdec: detect faac and skip correct amount of startup samplesMichael Niedermayer2012-09-281-0/+28
| | | | | | This also fixes aac in adts and other containers than mov. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec: Add missing include to version.hjamal2012-09-281-0/+2
| | | | | Reviewed-by: Stefano Sabatini <stefasab@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-09-288-71/+75
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: libopus: Remap channels using libopus' internal remapping. Opus decoder using libopus avcodec: document the use of AVCodecContext.delay for audio decoding vc1dec: add flush function for WMV9 and VC-1 decoders http: Increase buffer sizes to cope with longer URIs nutenc: const correctness for ff_put_v_trace/put_s_trace function arguments h264_refs: Fix debug tprintf argument types golomb: const correctness for get_ue()/get_se() function arguments get_bits: const correctness for get_bits_trace()/get_xbits_trace() arguments Conflicts: Changelog libavcodec/Makefile libavcodec/version.h libavformat/http.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libopus: Remap channels using libopus' internal remapping.Nathan Caldwell2012-09-281-25/+12
| | | | | | | | | | | | | | | | This way we can directly remap channels from Opus' channel order to libav's internal channel order, instead of mapping channels from Opus' order to Vorbis' order then to libav's order. Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * Opus decoder using libopusNicolas George2012-09-284-1/+205
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * avcodec: document the use of AVCodecContext.delay for audio decodingNathan Caldwell2012-09-281-7/+10
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * vc1dec: add flush function for WMV9 and VC-1 decodersKostya Shishkov2012-09-281-0/+2
| | | | | | | | CC: libav-stable@libav.org
| * h264_refs: Fix debug tprintf argument typesDiego Biurrun2012-09-271-2/+2
| |
| * golomb: const correctness for get_ue()/get_se() function argumentsDiego Biurrun2012-09-271-2/+6
| |
| * get_bits: const correctness for get_bits_trace()/get_xbits_trace() argumentsDiego Biurrun2012-09-271-3/+3
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-09-288-67/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: dwt: Drop unused functions spatial_compose{53|97}i() nutdec: Remove unused and broken debug function stub avcodec: Drop long-deprecated imgconvert.h header Add Opus support to the Ogg muxer. Add Opus codec id and codec description. avformat: Identify anonymous AVIO typedef structs. Conflicts: libavcodec/avcodec.h libavcodec/codec_desc.c libavcodec/imgconvert.h libavcodec/version.h libavformat/oggenc.c libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dwt: Drop unused functions spatial_compose{53|97}i()Diego Biurrun2012-09-271-18/+0
| |
| * avcodec: Drop long-deprecated imgconvert.h headerDiego Biurrun2012-09-274-47/+0
| |
| * Add Opus codec id and codec description.Andrew D'Addesio2012-09-273-1/+9
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | mp3dec: ask for 8khz switch point mp3sMichael Niedermayer2012-09-281-0/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mp3dec: Fix possibly exploitable crashMichael Niedermayer2012-09-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | I was sadly unable to find a non fuzzed mp3 that uses the feature that contained the bug (and i searched hard ...), thus while this fixes the security issue. It may or may not fix mixed blocks in 8khz mp3s, i cant say due to lack of samples to test. Security issue exists since: b37d945dd4213cb8e92146571b0374cd45d52286 Reported-by: Dale Curtis <dalecurtis@google.com> (Probably) Found-by: inferno@chromium.org Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpegvideo_enc: reduce QMAT_SHIFT to avoid overflow in dnxhdMichael Niedermayer2012-09-271-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | dsputil_mmx: fix reading prior of the src array in sub_hfyu_median_prediction()Michael Niedermayer2012-09-271-1/+3
| | | | | | | | | | | | This should fix the utvideoenc valgrind failure Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-09-271-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: nutdec: const correctness for get_v_trace/get_s_trace function arguments truemotion2: Request samples for old TM2 headers rtpdec: Remove a useless ff_ prefix from a static symbol rtpdec: Support depacketizing speex rtpenc: Add support for packetizing speex Conflicts: libavformat/rtpdec.c libavformat/sdp.c libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * truemotion2: Request samples for old TM2 headersDiego Biurrun2012-09-261-1/+1
| |
* | Revert "arm/h264: fix overreads in h264_chroma_mc8-and-h264_chroma_mc4"Michael Niedermayer2012-09-261-26/+36
| | | | | | | | | | | | | | | | | | This reverts commit d25f87f5174df5923be7ce0bb89fad08999286ed. This breaks decoding of some h264 files I have tested the original patch with fate but by mistake have forgotten to specify the fate samples so testing was limited to the internal regression tests.
* | ffv1dec: support decoding older 1.3 bitstream variantMichael Niedermayer2012-09-261-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffv1:update copyright yearMichael Niedermayer2012-09-261-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-09-263-4/+8
|\| | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: xsub: feed init_get_bits the whole buffer libfdk-aac: Allow setting VBR modes via a private option libfdk-aac: Warn the user that the VBR modes are unsupported Revert "cbrt_tablegen: Include libm.h" Conflicts: libavcodec/xsubdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * xsub: feed init_get_bits the whole bufferAlexandre Colucci2012-09-251-4/+7
| | | | | | | | | | | | | | | | | | | | | | Do not use rlelen field for buffer size in init_get_bits, it is only the size of the data for the first field. Since it is not reliable, just use the size of the whole buffer. Additional comments add removal of unused rlelen variable by Reimar Döffinger. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * libfdk-aac: Allow setting VBR modes via a private optionMartin Storsjö2012-09-251-2/+4
| | | | | | | | | | | | | | | | This avoids using the global_quality field and QSCALE flag for passing the VBR modes, since the value range of the global_quality field doesn't really map cleanly to this codec's VBR modes. Signed-off-by: Martin Storsjö <martin@martin.st>
| * libfdk-aac: Warn the user that the VBR modes are unsupportedMartin Storsjö2012-09-251-0/+3
| | | | | | | | | | | | | | | | | | These modes were not originally exposed by the library at all. In practice, only a few of them work for each sample rate/profile combination, and they don't work at all for the more uncommon sample rates. Signed-off-by: Martin Storsjö <martin@martin.st>
| * Revert "cbrt_tablegen: Include libm.h"Derek Buitenhuis2012-09-251-1/+0
| | | | | | | | | | | | | | This code runs on the host and should not use libm.h, which is meant for the target. This reverts commit 2768b717987d4e19d2774890d7d84aef531b1d9f.
* | diracyasm: fix win64Michael Niedermayer2012-09-261-2/+2
| | | | | | | | | | | | Fixes Ticket1412 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libx264: fix open GOPMichael Niedermayer2012-09-261-1/+1
| | | | | | | | | | Found-by: relaxed Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mlpdec: supress layout mismatch warnings for 2 ch upmixed monoMichael Niedermayer2012-09-251-0/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mlpdec: discard a 2nd substream if the stream is monoMichael Niedermayer2012-09-251-0/+4
| | | | | | | | | | | | This fixes the rest of Ticket1726 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mlp_parser: dont override existing channel geometry.Michael Niedermayer2012-09-251-0/+2
| | | | | | | | | | | | | | This prevents race conditions And partly fixes Ticket1726 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | arm/h264: fix overreads in h264_chroma_mc8-and-h264_chroma_mc4bruce-wu2012-09-251-36/+26
| | | | | | | | Fixes Ticket1227
* | dnxhdenc: fix speed regressionMichael Niedermayer2012-09-251-0/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpegvideo: factorize ff_dct_encode_init()Michael Niedermayer2012-09-253-12/+19
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | dnxhdenc: remove redundant call to ff_dsputil_init()Michael Niedermayer2012-09-251-1/+0
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec_alloc_frame: dont zero the whole struct twiceMichael Niedermayer2012-09-251-1/+2
| | | | | | | | | | | | cleaning it up is already done in avcodec_get_frame_defaults() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-09-253-15/+26
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: pthread: make sure AVFrame.extended_data is set properly. libfdk-aac: reindent after last commit libfdk-aac: Limit to supported sample rates. cbrt_tablegen: Include libm.h oggparsetheora: make it more robust ogg: prevent NULL pointer deference in theora gptopts Conflicts: libavformat/oggparsetheora.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * pthread: make sure AVFrame.extended_data is set properly.Anton Khirnov2012-09-251-0/+4
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * libfdk-aac: reindent after last commitNathan Caldwell2012-09-251-15/+15
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * libfdk-aac: Limit to supported sample rates.Nathan Caldwell2012-09-251-0/+6
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * cbrt_tablegen: Include libm.hDerek Buitenhuis2012-09-241-0/+1
| | | | | | | | | | | | Needed for cbrtf fallback on systems which lack it. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | Merge commit '7751e4693dd10ec98c20fbd9887233b575034272'Michael Niedermayer2012-09-254-19/+69
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7751e4693dd10ec98c20fbd9887233b575034272': ogg: check that the expected number of headers had been parsed libx264: change default to closed gop to match x264cli Use avcodec_free_frame() to free AVFrames. lavf: use a malloced AVFrame in try_decode_frame(). lavc: add avcodec_free_frame(). lavc: ensure extended_data is set properly on decoding lavc: initialize AVFrame.extended_data in avcodec_get_frame_defaults() lavc: use av_mallocz to allocate AVFrames. lavc: rename the argument of avcodec_alloc_frame/get_frame_defaults Conflicts: doc/APIchanges doc/examples/decoding_encoding.c libavcodec/utils.c libavcodec/version.h libavfilter/src_movie.c libavformat/oggdec.c libavformat/oggdec.h libavformat/oggparsetheora.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libx264: change default to closed gop to match x264cliJohn Van Sickle2012-09-241-0/+1
| | | | | | | | | | | | open-gop can be enabled with "-flags -cgop" Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * Use avcodec_free_frame() to free AVFrames.Anton Khirnov2012-09-241-4/+4
| |
| * lavc: add avcodec_free_frame().Anton Khirnov2012-09-243-2/+29
| | | | | | | | | | Since an AVFrame now has malloced members (extended_data), it must have a destructor.
| * lavc: ensure extended_data is set properly on decodingAnton Khirnov2012-09-241-0/+14
| |
| * lavc: initialize AVFrame.extended_data in avcodec_get_frame_defaults()Anton Khirnov2012-09-241-0/+4
| |
| * lavc: use av_mallocz to allocate AVFrames.Anton Khirnov2012-09-241-1/+1
| | | | | | | | | | Otherwise the frame is uninitialized, so avcodec_get_frame_defaults() cannot determine whether to free extended_data.