diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-21 02:12:59 +0300 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-21 02:17:15 +0300 |
| commit | 495eee01238b1282c6b61a021ee9fa5f42b6f108 (patch) | |
| tree | 965dc2f6cc35ea87f9eb2df863750c92ed43f1ac /libavcodec/avcodec.h | |
| parent | 809780ca425afbb1892cbd6957ca2f1cd7d64396 (diff) | |
| parent | 40cf1bbacc6220a0aa6bed5c331871d43f9ce370 (diff) | |
Merge commit '40cf1bbacc6220a0aa6bed5c331871d43f9ce370'
* commit '40cf1bbacc6220a0aa6bed5c331871d43f9ce370':
Deprecate avctx.coded_frame
Conflicts:
ffmpeg.c
libavcodec/a64multienc.c
libavcodec/asvenc.c
libavcodec/cljrenc.c
libavcodec/dpxenc.c
libavcodec/gif.c
libavcodec/mpegvideo_enc.c
libavcodec/nvenc.c
libavcodec/proresenc_kostya.c
libavcodec/pthread_frame.c
libavcodec/rawenc.c
libavcodec/sunrastenc.c
libavcodec/tiffenc.c
libavcodec/version.h
libavcodec/xbmenc.c
libavcodec/xwdenc.c
libavdevice/v4l2.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/avcodec.h')
| -rw-r--r-- | libavcodec/avcodec.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index cc2f3cce4d..6cfbea4324 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -2773,12 +2773,16 @@ typedef struct AVCodecContext { int lowres; #endif +#if FF_API_CODED_FRAME /** * the picture in the bitstream * - encoding: Set by libavcodec. * - decoding: unused + * + * @deprecated use the quality factor packet side data instead */ - AVFrame *coded_frame; + attribute_deprecated AVFrame *coded_frame; +#endif /** * thread count |