summaryrefslogtreecommitdiffstats
path: root/libavcodec/avcodec.h
Commit message (Collapse)AuthorAgeFilesLines
* hevc : add hevc profilegcocherel2013-11-221-0/+5
| | | | | | (cherry picked from commit 0c8dfd8ad6400b33da55a9f4d9aa8d3f5c9d209f) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avpacket: add pack/unpack functions for AVDictionaryBen Boeckel2013-11-201-0/+18
| | | | | | | | | These functions are intended for use with side_data which comes in an AVPacket. Signed-off-by: Ben Boeckel <mathstuf@gmail.com> Reviewed-by: wm4 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec: add side_data type for updated metadataBen Boeckel2013-11-201-0/+7
| | | | | | | | | This type is intended to be used to allow codecs to pass updated metadata to applications. Signed-off-by: Ben Boeckel <mathstuf@gmail.com> Reviewed-by: wm4 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '6f1ec8edf2416441e2348f3a0915c9fee179d7da'Michael Niedermayer2013-11-191-4/+5
|\ | | | | | | | | | | | | * commit '6f1ec8edf2416441e2348f3a0915c9fee179d7da': avcodec.h: include version.h before using version macro Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avcodec.h: include version.h before using version macroVittorio Giovara2013-11-191-4/+5
| |
* | Merge commit 'b9fb59d2ab05fdfe89d3fb0d7ecbbd91e560f57d'Michael Niedermayer2013-11-171-5/+4
|\ \ | |/ | | | | | | | | | | * commit 'b9fb59d2ab05fdfe89d3fb0d7ecbbd91e560f57d': lavc: deprecate avcodec_alloc_frame(). Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: deprecate avcodec_alloc_frame().Anton Khirnov2013-11-161-5/+4
| |
* | Merge commit '2ff302cb6ba1f159905888026c8a1d7dd8319acf'Michael Niedermayer2013-11-161-1/+1
|\ \ | |/ | | | | | | | | | | * commit '2ff302cb6ba1f159905888026c8a1d7dd8319acf': lavc: update coded_frame doxy. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: update coded_frame doxy.Anton Khirnov2013-11-161-1/+1
| | | | | | | | It is not used during decoding anymore.
* | Merge commit 'b068660ffa73f226cc03a67e214b8540fc1e11c4'Michael Niedermayer2013-11-161-3/+3
|\ \ | |/ | | | | | | | | | | | | | | | | * 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-161-1/+3
| | | | | | | | It was never used in any codec since it was added 3 years ago.
* | Merge commit 'cce3e0a49f0dd030262c28d9c53de0bd2fd909c4'Michael Niedermayer2013-11-141-21/+4
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | * 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-141-21/+4
| |
* | Merge commit 'aa241229891173b0357eee04e6ca78f806cc9c0c'Michael Niedermayer2013-11-141-0/+5
|\ \ | |/ | | | | | | | | | | | | | | | | * 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-141-0/+5
| | | | | | | | | | | | 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.
* | Merge commit 'b6094811f9fca66cdf853420696e96fdc3e4987a'Michael Niedermayer2013-11-141-0/+2
|\ \ | |/ | | | | | | | | | | * commit 'b6094811f9fca66cdf853420696e96fdc3e4987a': lavc: move MB_TYPE_* macros from avcodec.h to mpegvideo.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: move MB_TYPE_* macros from avcodec.h to mpegvideo.hAnton Khirnov2013-11-141-0/+2
| | | | | | | | They are mpegvideo-specific and not supposed to be used by callers.
* | Merge commit 'b45c87083de67969c1598cfef41e7c947b137922'Michael Niedermayer2013-11-141-0/+2
|\ \ | |/ | | | | | | | | | | * commit 'b45c87083de67969c1598cfef41e7c947b137922': lavc: schedule unused FF_QSCALE_TYPE_* for removal on next bump Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: schedule unused FF_QSCALE_TYPE_* for removal on next bumpAnton Khirnov2013-11-141-0/+2
| |
* | Merge commit '8941971a8f2e24b9a84fe29f128d13ceb89c0a65'Michael Niedermayer2013-11-141-3/+5
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '8941971a8f2e24b9a84fe29f128d13ceb89c0a65': lavc: make error_rate a private option of mpegvideo encoders Conflicts: libavcodec/options_table.h libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: make error_rate a private option of mpegvideo encodersAnton Khirnov2013-11-141-3/+5
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-11-141-1/+8
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Deprecate obsolete XvMC hardware decoding support Conflicts: libavcodec/mpeg12.c libavcodec/mpeg12dec.c libavcodec/mpegvideo.c libavcodec/options_table.h libavutil/pixdesc.c libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Deprecate obsolete XvMC hardware decoding supportDiego Biurrun2013-11-131-1/+8
| | | | | | | | | | | | | | XvMC has long ago been superseded by newer acceleration APIs, such as VDPAU, and few downstreams still support it. Furthermore XvMC is not implemented within the hwaccel framework, but requires its own specific code in the MPEG-1/2 decoder, which is a maintenance burden.
* | Merge commit 'c7f7bfc9e3a3150ba72bc34366c13fb2210c66ac'Michael Niedermayer2013-11-141-0/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c7f7bfc9e3a3150ba72bc34366c13fb2210c66ac': Remove all Alpha architecture optimizations Conflicts: libavcodec/alpha/asm.h libavcodec/alpha/dsputil_alpha.c libavcodec/alpha/dsputil_alpha.h libavcodec/alpha/dsputil_alpha_asm.S libavcodec/alpha/hpeldsp_alpha.c libavcodec/alpha/hpeldsp_alpha.h libavcodec/alpha/hpeldsp_alpha_asm.S libavcodec/alpha/motion_est_alpha.c libavcodec/alpha/motion_est_mvi_asm.S libavcodec/alpha/mpegvideo_alpha.c libavcodec/alpha/regdef.h libavcodec/alpha/simple_idct_alpha.c We have a qemu based fate alpha client. And various failures on alpha have previously pointed to issues in generic C code. Thus IMHO it makes sense to keep alpha code as long as someone is willing to do the little bit of maintaince it needs Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Remove all Alpha architecture optimizationsDiego Biurrun2013-11-131-0/+2
| | | | | | | | Alpha has been end-of-lifed and no more test machines are available.
* | Merge commit 'cd8f772d0678a90957f4dfd5ce51af9d22e3f212'Michael Niedermayer2013-11-041-6/+16
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * commit 'cd8f772d0678a90957f4dfd5ce51af9d22e3f212': lavc: Add colorimetry values for BT.2020, other non-included ones Conflicts: doc/APIchanges libavcodec/avcodec.h libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: Add colorimetry values for BT.2020, other non-included onesJan Ekström2013-11-041-15/+27
| | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit 'da6506c607eda585ba4b15430cf3c9a2ce09c3a9'Michael Niedermayer2013-11-041-5/+4
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * commit 'da6506c607eda585ba4b15430cf3c9a2ce09c3a9': lavc: move AVCodecContext.pkt to AVCodecInternal Conflicts: libavcodec/internal.h libavcodec/rawdec.c libavcodec/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: move AVCodecContext.pkt to AVCodecInternalAnton Khirnov2013-11-041-5/+4
| | | | | | | | It's a private field, not meant to be accessed from outside lavc.
* | Merge commit '38ecc3702dabbea09230f6d6333f59e74f5d1c12'Michael Niedermayer2013-11-041-4/+4
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '38ecc3702dabbea09230f6d6333f59e74f5d1c12': pthread: store thread contexts in AVCodecInternal instead of AVCodecContext Conflicts: libavcodec/internal.h libavcodec/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * pthread: store thread contexts in AVCodecInternal instead of AVCodecContextAnton Khirnov2013-11-041-4/+4
| | | | | | | | | | | | It's a private field, it should not be visible to callers. Deprecate AVCodecContext.thread_opaque
* | lavc: remove dead FF_API_AVCODEC_OPEN APIStefano Sabatini2013-11-031-34/+0
| |
* | lavc: remove dead FF_API_ALLOC_CONTEXT APIStefano Sabatini2013-11-031-34/+0
| |
* | Merge commit '28240a60c1b5ce276e947ba013271ec009adc078'Michael Niedermayer2013-11-011-0/+2
|\ \ | |/ | | | | | | | | | | * commit '28240a60c1b5ce276e947ba013271ec009adc078': lavc: move FF_ASPECT_EXTENDED from avcodec.h to h263.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: move FF_ASPECT_EXTENDED from avcodec.h to h263.hAnton Khirnov2013-10-311-0/+2
| | | | | | | | It's for internal use only.
* | Merge commit 'eb5920c195d1b0bda81782af4ba0c5982f5225b3'Michael Niedermayer2013-11-011-0/+2
|\ \ | |/ | | | | | | | | | | * commit 'eb5920c195d1b0bda81782af4ba0c5982f5225b3': lavc: deprecate unused FF_BUG_OLD_MSMPEG4 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: deprecate unused FF_BUG_OLD_MSMPEG4Anton Khirnov2013-10-311-0/+2
| |
* | Merge commit '0300962b76644f145b773439989a5cdf1667e162'Michael Niedermayer2013-11-011-0/+2
|\ \ | |/ | | | | | | | | | | * commit '0300962b76644f145b773439989a5cdf1667e162': lavc: schedule FF_BUG_AC_VLC for removal on the next major bump. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: schedule FF_BUG_AC_VLC for removal on the next major bump.Anton Khirnov2013-10-311-0/+2
| | | | | | | | It has been deprecated/unused for about 10 years.
* | avcodec: document that FF_DEBUG_VIS_QP / FF_DEBUG_VIS_MB_TYPE should only be ↵Michael Niedermayer2013-11-011-2/+2
| | | | | | | | | | | | | | | | used through avoptions This preempts ABI issues if their values get reused by the fork for something unrelated Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'f8b2bcd2adab65658ffd45f9f13b032af6600bf8'Michael Niedermayer2013-11-011-0/+2
|\ \ | |/ | | | | | | | | | | | | | | * commit 'f8b2bcd2adab65658ffd45f9f13b032af6600bf8': lavc: deprecate FF_DEBUG_VIS_* leave the AVOptions as they work fine Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: deprecate FF_DEBUG_VIS_*Anton Khirnov2013-10-311-0/+2
| | | | | | | | | | Those flags have no effect since 37045e422903695e610cca6ecb753df643ab9380.
* | avcodec/avcodec.h: move debug_mv to the end of the struct with the next ABI bumpMichael Niedermayer2013-11-011-0/+14
| | | | | | | | | | | | | | This maintains ABI compatibility also add a note that debug_mv must be accessed through AVOptions (for ABI) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'a1504eee41b39f62dbfe0a0ca6b96c2716bf7577'Michael Niedermayer2013-11-011-0/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * commit 'a1504eee41b39f62dbfe0a0ca6b96c2716bf7577': lavc: deprecate AVCodecContext.debug_mv Conflicts: libavcodec/options_table.h Not merged, debug_mv works fine Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: deprecate AVCodecContext.debug_mvAnton Khirnov2013-10-311-3/+4
| | | | | | | | It has been unused since 37045e422903695e610cca6ecb753df643ab9380.
* | Merge commit 'ccc71298456d97f64f539e303c771d04dcb33c53'Michael Niedermayer2013-11-011-0/+5
|\ \ | |/ | | | | | | | | | | * commit 'ccc71298456d97f64f539e303c771d04dcb33c53': lavc: deprecate FF_DEBUG_MV and remove all traces of its use Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: deprecate FF_DEBUG_MV and remove all traces of its useAnton Khirnov2013-10-311-0/+5
| | | | | | | | | | | | It has not been actually used since 37045e422903695e610cca6ecb753df643ab9380, when the broken vismv code was removed.
* | Merge commit '064698d381e1e7790f21b0199a8930ea04e2e942'Michael Niedermayer2013-11-011-0/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '064698d381e1e7790f21b0199a8930ea04e2e942': Add HEVC decoder Conflicts: Changelog libavcodec/Makefile libavcodec/allcodecs.c libavcodec/hevc.c libavcodec/hevc.h libavcodec/hevc_cabac.c libavcodec/hevc_filter.c libavcodec/hevc_mvs.c libavcodec/hevc_parser.c libavcodec/hevc_ps.c libavcodec/hevc_refs.c libavcodec/hevc_sei.c libavcodec/hevcdsp.c libavcodec/hevcdsp_template.c libavcodec/hevcpred.c libavcodec/hevcpred_template.c libavcodec/version.h cosmetics from hevc.h & hevc_ps.c mostly merged, other files left as they where in ffmpeg. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Add HEVC decoderGuillaume Martres2013-10-311-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Initially written by Guillaume Martres <smarter@ubuntu.com> as a GSoC project. Further contributions by the OpenHEVC project and other developers, namely: Mickaël Raulet <mraulet@insa-rennes.fr> Seppo Tomperi <seppo.tomperi@vtt.fi> Gildas Cocherel <gildas.cocherel@laposte.net> Khaled Jerbi <khaled_jerbi@yahoo.fr> Wassim Hamidouche <wassim.hamidouche@insa-rennes.fr> Vittorio Giovara <vittorio.giovara@gmail.com> Jan Ekström <jeebjp@gmail.com> Anton Khirnov <anton@khirnov.net> Martin Storsjö <martin@martin.st> Luca Barbato <lu_zero@gentoo.org> Yusuke Nakamura <muken.the.vfrmaniac@gmail.com> Reimar Döffinger <Reimar.Doeffinger@gmx.de> Diego Biurrun <diego@biurrun.de> Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '7644f5a80787c9b608b82873604805d7e38a6a18'Michael Niedermayer2013-11-011-0/+6
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '7644f5a80787c9b608b82873604805d7e38a6a18': lavc: replace avcodec_set_dimensions with ff_set_dimensions Conflicts: libavcodec/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
OpenPOWER on IntegriCloud