aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/pnmenc.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2015-07-21 01:12:59 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2015-07-21 01:17:15 +0200
commit495eee01238b1282c6b61a021ee9fa5f42b6f108 (patch)
tree965dc2f6cc35ea87f9eb2df863750c92ed43f1ac /libavcodec/pnmenc.c
parent809780ca425afbb1892cbd6957ca2f1cd7d64396 (diff)
parent40cf1bbacc6220a0aa6bed5c331871d43f9ce370 (diff)
downloadffmpeg-495eee01238b1282c6b61a021ee9fa5f42b6f108.tar.gz
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/pnmenc.c')
-rw-r--r--libavcodec/pnmenc.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/pnmenc.c b/libavcodec/pnmenc.c
index 9f9d9f5eb0..05460ea855 100644
--- a/libavcodec/pnmenc.c
+++ b/libavcodec/pnmenc.c
@@ -120,8 +120,12 @@ static int pnm_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
static av_cold int pnm_encode_init(AVCodecContext *avctx)
{
+#if FF_API_CODED_FRAME
+FF_DISABLE_DEPRECATION_WARNINGS
avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I;
avctx->coded_frame->key_frame = 1;
+FF_ENABLE_DEPRECATION_WARNINGS
+#endif
return 0;
}