diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-04 11:41:55 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-04 11:41:55 +0100 |
commit | ab71be091206a2264f3a8862215fc284bb8e6274 (patch) | |
tree | 1634753965d201a33f583097660958548cce3106 /libavcodec/avcodec.h | |
parent | 3fc26d8073a49c96a0704015ce18f5317d87a739 (diff) | |
parent | da6506c607eda585ba4b15430cf3c9a2ce09c3a9 (diff) |
Merge commit 'da6506c607eda585ba4b15430cf3c9a2ce09c3a9'
* 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>
Diffstat (limited to 'libavcodec/avcodec.h')
-rw-r--r-- | libavcodec/avcodec.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 5114c5d1dc..69fae719fe 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -2821,14 +2821,13 @@ typedef struct AVCodecContext { */ int error_rate; +#if FF_API_CODEC_PKT /** - * Current packet as passed into the decoder, to avoid having - * to pass the packet into every function. Currently only valid - * inside lavc and get/release_buffer callbacks. - * - decoding: set by avcodec_decode_*, read by get_buffer() for setting pkt_pts - * - encoding: unused + * @deprecated this field is not supposed to be accessed from outside lavc */ + attribute_deprecated AVPacket *pkt; +#endif /** * VBV delay coded in the last frame (in periods of a 27 MHz clock). |