summaryrefslogtreecommitdiff
path: root/libavcodec
Commit message (Collapse)AuthorAge
* Fix a few "its" vs "it's" typo.Clément Bœsch2013-02-14
|
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-02-14
|\ | | | | | | | | | | | | | | | | | | | | * qatar/master: doc/platform: Fix 10l typo dsputil: Move STRIDE_ALIGN macro to the only place it is used Conflicts: libavcodec/dsputil.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dsputil: Move STRIDE_ALIGN macro to the only place it is usedDiego Biurrun2013-02-13
| |
* | Adding support for parsing BlockAdditionalVignesh Venkatasubramanian2013-02-14
| | | | | | | | | | | | | | | | | | | | | | Matroska specification lists support for BlockAdditional element which is not supported by ffmpeg's matroska parser. This patch adds grammar definitions for parsing that element (and few other related elements) and then puts the data in AVPacket.side_data with new AVPacketSideDataType AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL. Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | h264: Use mb itself as memcpy anchor and assert the other anchors positionMichael Niedermayer2013-02-14
| | | | | | | | | | | | This makes the code more robust against reordering or fields. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | h264: remove clear_blocks call in threading init.Ronald S. Bultje2013-02-14
| | | | | | | | | | | | | | | | Init code in that if statement goes down from 26716 cycles to 26047 cycles, i.e. the removal of the clear_blocks and smaller memcpy() together save around 670 cycles. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | h264: Reset last_pocs in case of reference or frame number inconsistenciesMichael Niedermayer2013-02-13
| | | | | | | | | | | | | | This prevents faulty increasing of has_b_frames Should fix Ticket 2062 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libvorbisdec: Remove AVFrame from contextMichael Niedermayer2013-02-13
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libvorbisdec: set sample typeMichael Niedermayer2013-02-13
| | | | | | | | | | | | Fixes regression Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libcelt: decode directly to the user-provided AVFrame.Nicolas George2013-02-13
| |
* | mjpegdec: pass nb_components into ljpeg_decode_yuv_scanMichael Niedermayer2013-02-13
| | | | | | | | | | | | | | Fixes null pointer dereference Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | evrcdec: decode directly to the user-provided AVFramePaul B Mahol2013-02-13
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | paf: decode directly to the user-provided AVFramePaul B Mahol2013-02-13
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | vima: decode directly to the user-provided AVFramePaul B Mahol2013-02-13
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge commit '1647da89dd8ac09a55c111589f7a30d7e6b87d90'Michael Niedermayer2013-02-13
|\| | | | | | | | | | | | | | | | | | | * commit '1647da89dd8ac09a55c111589f7a30d7e6b87d90': lavr: make sure that the mix function is reset even if no mixing will be done lavr: print out the mix matrix in ff_audio_mix_set_matrix() ws-snd1: decode directly to the user-provided AVFrame wmavoice: decode directly to the user-provided AVFrame Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ws-snd1: decode directly to the user-provided AVFrameJustin Ruggles2013-02-12
| |
| * wmavoice: decode directly to the user-provided AVFrameJustin Ruggles2013-02-12
| |
* | Merge commit '205a95f7b5178362874bc1e65eae9866723491c1'Michael Niedermayer2013-02-13
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '205a95f7b5178362874bc1e65eae9866723491c1': wmaenc: alloc/free coded_frame instead of keeping it in the WMACodecContext wma: decode directly to the user-provided AVFrame wmapro: decode directly to the user-provided AVFrame wavpack: decode directly to the user-provided AVFrame Conflicts: libavcodec/wavpack.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * wmaenc: alloc/free coded_frame instead of keeping it in the WMACodecContextJustin Ruggles2013-02-12
| |
| * wma: decode directly to the user-provided AVFrameJustin Ruggles2013-02-12
| |
| * wmapro: decode directly to the user-provided AVFrameJustin Ruggles2013-02-12
| |
| * wavpack: decode directly to the user-provided AVFrameJustin Ruggles2013-02-12
| |
* | Merge commit 'ee6ca11b657515ad736ec0d2b8635e098d0a2680'Michael Niedermayer2013-02-13
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ee6ca11b657515ad736ec0d2b8635e098d0a2680': vorbis: decode directly to the user-provided AVFrame vmdaudio: decode directly to the user-provided AVFrame twinvq: decode directly to the user-provided AVFrame tta: decode directly to the user-provided AVFrame truespeech: decode directly to the user-provided AVFrame Conflicts: libavcodec/tta.c libavcodec/twinvq.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vorbis: decode directly to the user-provided AVFrameJustin Ruggles2013-02-12
| |
| * vmdaudio: decode directly to the user-provided AVFrameJustin Ruggles2013-02-12
| |
| * twinvq: decode directly to the user-provided AVFrameJustin Ruggles2013-02-12
| |
| * tta: decode directly to the user-provided AVFrameJustin Ruggles2013-02-12
| |
| * truespeech: decode directly to the user-provided AVFrameJustin Ruggles2013-02-12
| |
* | Merge commit '4a2b26fc1b1ad123eba473a20e270f2b0ba92bca'Michael Niedermayer2013-02-13
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4a2b26fc1b1ad123eba473a20e270f2b0ba92bca': tak: decode directly to the user-provided AVFrame smackaud: decode directly to the user-provided AVFrame sipr: decode directly to the user-provided AVFrame shorten: decode directly to the user-provided AVFrame Conflicts: libavcodec/shorten.c libavcodec/takdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * tak: decode directly to the user-provided AVFrameJustin Ruggles2013-02-12
| |
| * smackaud: decode directly to the user-provided AVFrameJustin Ruggles2013-02-12
| |
| * sipr: decode directly to the user-provided AVFrameJustin Ruggles2013-02-12
| |
| * shorten: decode directly to the user-provided AVFrameJustin Ruggles2013-02-12
| |
* | Merge commit '5d5c248c3df30fa91a8dde639618c985b9a11c53'Michael Niedermayer2013-02-13
|\| | | | | | | | | | | | | | | | | | | | | * commit '5d5c248c3df30fa91a8dde639618c985b9a11c53': s302m: decode directly to the user-provided AVFrame ra288: decode directly to the user-provided AVFrame ra144: decode directly to the user-provided AVFrame ralf: decode directly to the user-provided AVFrame qdm2: decode directly to the user-provided AVFrame Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * s302m: decode directly to the user-provided AVFrameJustin Ruggles2013-02-12
| |
| * ra288: decode directly to the user-provided AVFrameJustin Ruggles2013-02-12
| |
| * ra144: decode directly to the user-provided AVFrameJustin Ruggles2013-02-12
| |
| * ralf: decode directly to the user-provided AVFrameJustin Ruggles2013-02-12
| |
| * qdm2: decode directly to the user-provided AVFrameJustin Ruggles2013-02-12
| |
* | Merge commit '1b9b6d6e5ea556b6d307f9d473f54f6406fdc3c8'Michael Niedermayer2013-02-13
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1b9b6d6e5ea556b6d307f9d473f54f6406fdc3c8': qcelp: decode directly to the user-provided AVFrame pcm-bluray: decode directly to the user-provided AVFrame nellymoser: decode directly to the user-provided AVFrame mpc7/8: decode directly to the user-provided AVFrame mpegaudio: decode directly to the user-provided AVFrame mlp/truehd: decode directly to the user-provided AVFrame Conflicts: libavcodec/mpc7.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * qcelp: decode directly to the user-provided AVFrameJustin Ruggles2013-02-12
| |
| * pcm-bluray: decode directly to the user-provided AVFrameJustin Ruggles2013-02-12
| |
| * nellymoser: decode directly to the user-provided AVFrameJustin Ruggles2013-02-12
| |
| * mpc7/8: decode directly to the user-provided AVFrameJustin Ruggles2013-02-12
| |
| * mpegaudio: decode directly to the user-provided AVFrameJustin Ruggles2013-02-12
| |
| * mlp/truehd: decode directly to the user-provided AVFrameJustin Ruggles2013-02-12
| |
* | Merge commit '86bfcfcf2364bc837b7bb582c66a8a15a332414f'Michael Niedermayer2013-02-13
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '86bfcfcf2364bc837b7bb582c66a8a15a332414f': mace: decode directly to the user-provided AVFrame libspeex: decode directly to the user-provided AVFrame libopus: decode directly to the user-provided AVFrame libopencore-amr: decode directly to the user-provided AVFrame libgsm: decode directly to the user-provided AVFrame Conflicts: libavcodec/libopusdec.c libavcodec/mace.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mace: decode directly to the user-provided AVFrameJustin Ruggles2013-02-12
| |
| * libspeex: decode directly to the user-provided AVFrameJustin Ruggles2013-02-12
| |
| * libopus: decode directly to the user-provided AVFrameJustin Ruggles2013-02-12
| |