summaryrefslogtreecommitdiff
path: root/libavcodec
Commit message (Collapse)AuthorAge
* Merge commit 'a639ea7f4bc44bf6bfa452675558a342924a66a9'Michael Niedermayer2013-11-17
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a639ea7f4bc44bf6bfa452675558a342924a66a9': escape124: use the AVFrame API properly. qtrle: use the AVFrame API properly. cljr: use the AVFrame API properly. cinepak: use the AVFrame API properly. Conflicts: libavcodec/cinepak.c libavcodec/cljr.c libavcodec/qtrle.c See: 80e9e63c libavcodec/cinepak.c See: 71c378984b0bd5470f67c424a79a4750f84d2d3e Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * escape124: use the AVFrame API properly.Anton Khirnov2013-11-16
| |
| * qtrle: use the AVFrame API properly.Anton Khirnov2013-11-16
| |
| * cljr: use the AVFrame API properly.Anton Khirnov2013-11-16
| |
| * cinepak: use the AVFrame API properly.Anton Khirnov2013-11-16
| |
* | Merge commit 'cec5ce49229d61e4eb1f331a6d0dff3aa24f6655'Michael Niedermayer2013-11-17
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cec5ce49229d61e4eb1f331a6d0dff3aa24f6655': cdxl: remove an unused variable c93: use the AVFrame API properly. bethsoftvid: use the AVFrame API properly. avs: use the AVFrame API properly. Conflicts: libavcodec/bethsoftvideo.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cdxl: remove an unused variableAnton Khirnov2013-11-16
| |
| * c93: use the AVFrame API properly.Anton Khirnov2013-11-16
| |
| * bethsoftvid: use the AVFrame API properly.Anton Khirnov2013-11-16
| |
| * avs: use the AVFrame API properly.Anton Khirnov2013-11-16
| |
* | Merge commit '6139f481ac9feb1bee4e7d04789fb15d7f24ebbf'Michael Niedermayer2013-11-17
|\| | | | | | | | | | | | | | | | | | | | | * commit '6139f481ac9feb1bee4e7d04789fb15d7f24ebbf': asvenc: use the AVFrame API properly. a64multienc: use the AVFrame API properly. Conflicts: libavcodec/vaapi_mpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * asvenc: use the AVFrame API properly.Anton Khirnov2013-11-16
| |
| * a64multienc: use the AVFrame API properly.Anton Khirnov2013-11-16
| |
* | Merge commit 'b9fb59d2ab05fdfe89d3fb0d7ecbbd91e560f57d'Michael Niedermayer2013-11-17
|\| | | | | | | | | | | | | * commit 'b9fb59d2ab05fdfe89d3fb0d7ecbbd91e560f57d': lavc: deprecate avcodec_alloc_frame(). Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: deprecate avcodec_alloc_frame().Anton Khirnov2013-11-16
| |
* | Merge commit '5b9c3b4505206143d85398c1410949319fa1180f'Michael Niedermayer2013-11-16
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5b9c3b4505206143d85398c1410949319fa1180f': Replace all instances of avcodec_alloc_frame() with av_frame_alloc(). Conflicts: doc/examples/decoding_encoding.c doc/examples/muxing.c ffmpeg.c libavcodec/alacenc.c libavcodec/libopenjpegenc.c libavcodec/libvpxenc.c libavcodec/pcm.c libavcodec/xbmenc.c libavcodec/xwdenc.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Replace all instances of avcodec_alloc_frame() with av_frame_alloc().Anton Khirnov2013-11-16
| |
* | Merge commit '2ff302cb6ba1f159905888026c8a1d7dd8319acf'Michael Niedermayer2013-11-16
|\| | | | | | | | | | | | | * commit '2ff302cb6ba1f159905888026c8a1d7dd8319acf': lavc: update coded_frame doxy. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: update coded_frame doxy.Anton Khirnov2013-11-16
| | | | | | | | It is not used during decoding anymore.
* | Merge commit 'b068660ffa73f226cc03a67e214b8540fc1e11c4'Michael Niedermayer2013-11-16
|\| | | | | | | | | | | | | | | | | | | * commit 'b068660ffa73f226cc03a67e214b8540fc1e11c4': lavc: deprecate CODEC_CAP_NEG_LINESIZES Conflicts: libavcodec/avcodec.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: deprecate CODEC_CAP_NEG_LINESIZESAnton Khirnov2013-11-16
| | | | | | | | It was never used in any codec since it was added 3 years ago.
| * lavc: VP9 decoderRonald S. Bultje2013-11-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Originally written by Ronald S. Bultje <rsbultje@gmail.com> and Clément Bœsch <u@pkh.me> Further contributions by: Anton Khirnov <anton@khirnov.net> Diego Biurrun <diego@biurrun.de> Luca Barbato <lu_zero@gentoo.org> Martin Storsjö <martin@martin.st> Signed-off-by: Luca Barbato <lu_zero@gentoo.org> Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | avcodec/vp9: assert on sane size in update_size().Clément Bœsch2013-11-16
| | | | | | | | | | | | | | | | | | w and h are both read as uint16 + 1 so this can not happen. A similar change was introduced in 97962b2 / 72ca830, with the av_log()+AVERROR_INVALIDDATA form, suggesting it could be triggerable somehow. Change suggested by Ronald S. Bultje.
* | avcodec/vp9: remove some reset-to-zero from vp9_decode_free().Clément Bœsch2013-11-16
| | | | | | | | | | | | | | | | | | | | | | | | Those should not be necessary. Original change by one of these developers: Anton Khirnov <anton@khirnov.net> Diego Biurrun <diego@biurrun.de> Luca Barbato <lu_zero@gentoo.org> Martin Storsjö <martin@martin.st> See 97962b2 / 72ca830
* | avcodec/vp9: add a never triggerable assert.Clément Bœsch2013-11-16
| | | | | | | | | | | | | | | | | | vp8_rac_get_tree() is called with a tree of size 3, so the returned value can not be outside [0;3]. All of the [0;3] cases are handled in the switch, so the assert should not be triggerable by any means. A similar change was introduced in 97962b2 / 72ca830, with the av_log()+AVERROR_INVALIDDATA form, suggesting it could be triggerable somehow. This assert might help static analyzer, or simply the reader.
* | vp9: Ensure that the arithmetic coder values are read in the right orderMartin Storsjö2013-11-16
| | | | | | | | | | | | | | | | | | The operands of an addition can be evaluated in any order, since the addition isn't a sequence point. The only operators that have a defined evaluation order are &&, ||, ?: and the sequence operator ','. This fixes fate-vp9 on ARM RVCT.
* | avcodec/vp9: make last_invisible local.Clément Bœsch2013-11-16
| | | | | | | | | | | | | | | | | | | | Original change by one of these developers: Anton Khirnov <anton@khirnov.net> Diego Biurrun <diego@biurrun.de> Luca Barbato <lu_zero@gentoo.org> Martin Storsjö <martin@martin.st> See 97962b2 / 72ca830
* | avcodec/x86/vp9dsp: use EXTERNAL_* macros.Clément Bœsch2013-11-16
| | | | | | | | | | | | | | | | | | | | | | | | Original fix by one of these developers: Anton Khirnov <anton@khirnov.net> Diego Biurrun <diego@biurrun.de> Luca Barbato <lu_zero@gentoo.org> Martin Storsjö <martin@martin.st> See 97962b2 / 72ca830 Personnal guess is Diego Biurrun.
* | avcodec: Fix duration error after seek operationwangxingchao2013-11-16
| | | | | | | | | | | | | | | | | | After seek, s->duration need recalculation, AVCodecParserContext need be set again. Without the fix, the first audio packet would be dropped after compute_pkt_fields() as the final pts/dts become invalid. Signed-off-by: wangxingchao <wangxingchao@xiaomi.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/vp9: fix "initialize" typo.Clément Bœsch2013-11-15
| | | | | | | | | | | | | | | | | | | | Originally spotted and fixed by one of these developers: Anton Khirnov <anton@khirnov.net> Diego Biurrun <diego@biurrun.de> Luca Barbato <lu_zero@gentoo.org> Martin Storsjö <martin@martin.st> See 97962b2 / 72ca830
* | Merge commit '458446acfa1441d283dacf9e6e545beb083b8bb0'Michael Niedermayer2013-11-15
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '458446acfa1441d283dacf9e6e545beb083b8bb0': lavc: Edge emulation with dst/src linesize Conflicts: libavcodec/cavs.c libavcodec/h264.c libavcodec/hevc.c libavcodec/mpegvideo_enc.c libavcodec/mpegvideo_motion.c libavcodec/rv34.c libavcodec/svq3.c libavcodec/vc1dec.c libavcodec/videodsp.h libavcodec/videodsp_template.c libavcodec/vp3.c libavcodec/vp8.c libavcodec/wmv2.c libavcodec/x86/videodsp.asm libavcodec/x86/videodsp_init.c Changes to the asm are not merged, they are left for volunteers or in their absence for later. The changes this merge introduces are reordering of the function arguments See: face578d56c2d1375e40d5e2a28acc122132bc55 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: Edge emulation with dst/src linesizeRonald S. Bultje2013-11-15
| | | | | | | | | | | | Allow supporting files for which the image stride is smaller than the maximum block size + number of subpel mc taps, e.g. a 64x64 VP9 file or a 16x16 VP8 file with -fflags +emu_edge.
* | Merge commit '3cbe1126530449336e2ce59b194bdb8c4eb4abb4'Michael Niedermayer2013-11-15
|\| | | | | | | | | | | | | | | | | | | * commit '3cbe1126530449336e2ce59b194bdb8c4eb4abb4': dv: Split DV data table declarations into their own header Conflicts: libavcodec/dvdata.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dv: Split DV data table declarations into their own headerDiego Biurrun2013-11-15
| | | | | | | | | | | | This is necessary to avoid target config settings bleeding into the host compilation process with hardcoded tables and the DV VLC tables no longer present as static tables in a header file.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-11-14
|\| | | | | | | | | | | | | * qatar/master: h264: free the tables and uninitialize the context on flush Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: free the tables and uninitialize the context on flushAnton Khirnov2013-11-14
| | | | | | | | | | Prevents referencing empty frames when the first packet after the flush does not contain a frame.
| * mpeg12dec: Remove outdated UV swapping code for VCR2Diego Biurrun2013-11-14
| |
* | Merge commit '669fe505952f3d8175b1ad6971033a8e8120523b'Michael Niedermayer2013-11-14
|\| | | | | | | | | | | | | | | | | | | | | * commit '669fe505952f3d8175b1ad6971033a8e8120523b': twinvq: consume block_align+1 packets as full ones Conflicts: libavcodec/twinvq.c See: 2e7a1fdd6d51aec59931ce7b278b12faa66f98fd Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * twinvq: consume block_align+1 packets as full onesKostya Shishkov2013-11-14
| | | | | | | | | | | | They can be produced by VQF. Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit '1afa8a7568ba57ad0cd2923f6e641e10d32cded4'Michael Niedermayer2013-11-14
|\| | | | | | | | | | | | | | | | | | | * commit '1afa8a7568ba57ad0cd2923f6e641e10d32cded4': twinvq: support multiple frames per packet Conflicts: libavcodec/twinvq.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * twinvq: support multiple frames per packetKostya Shishkov2013-11-14
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit 'ddb839e9286594ff7a862a956402106fca7055c9'Michael Niedermayer2013-11-14
|\| | | | | | | | | | | | | * commit 'ddb839e9286594ff7a862a956402106fca7055c9': metasound: add missing modes Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * metasound: add missing modesKostya Shishkov2013-11-14
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit '7b9780e7bf9d86e3e4e9606a971bb2d0d718bac2'Michael Niedermayer2013-11-14
|\| | | | | | | | | | | | | * commit '7b9780e7bf9d86e3e4e9606a971bb2d0d718bac2': mpeg12dec: Remove unused swap_uv member from Mpeg1Context Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpeg12dec: Remove unused swap_uv member from Mpeg1ContextDiego Biurrun2013-11-14
| |
* | Merge commit 'cce3e0a49f0dd030262c28d9c53de0bd2fd909c4'Michael Niedermayer2013-11-14
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cce3e0a49f0dd030262c28d9c53de0bd2fd909c4': Move av_fast_{m,re}alloc from lavc to lavu. Conflicts: libavcodec/avcodec.h libavcodec/utils.c libavutil/mem.c libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Move av_fast_{m,re}alloc from lavc to lavu.Anton Khirnov2013-11-14
| |
* | avcodec/mpegvideo_enc: Fix possibly exploitable security issue with -bfMichael Niedermayer2013-11-14
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'aa241229891173b0357eee04e6ca78f806cc9c0c'Michael Niedermayer2013-11-14
|\| | | | | | | | | | | | | | | | | | | * commit 'aa241229891173b0357eee04e6ca78f806cc9c0c': lavc: deprecate FF_MAX_B_FRAMES Conflicts: libavcodec/options_table.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: deprecate FF_MAX_B_FRAMESAnton Khirnov2013-11-14
| | | | | | | | | | | | We should not arbitrarily decide the maximum B-frame number for all encoders supported by Libav, each encoder should be able to set its own limits.
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-18 10:58:32 +0000