Deprecate avctx.coded_frame

[ffmpeg] / libavcodec / rawenc.c

diff --git a/libavcodec/rawenc.c b/libavcodec/rawenc.c
index f435333fef60501166165d439c2845f66c2a9377..cc55b3a875d1eaea65bb7feddba3527ecab01406 100644 (file)
--- a/libavcodec/rawenc.c
+++ b/libavcodec/rawenc.c
@@ -29,13 +29,19 @@
 #include "internal.h"
 #include "libavutil/pixdesc.h"
 #include "libavutil/intreadwrite.h"
+#include "libavutil/internal.h"
 
-static av_cold int raw_init_encoder(AVCodecContext *avctx)
+static av_cold int raw_encode_init(AVCodecContext *avctx)
 {
-    avctx->coded_frame            = avctx->priv_data;
+    const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(avctx->pix_fmt);
+
+#if FF_API_CODED_FRAME
+FF_DISABLE_DEPRECATION_WARNINGS
     avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I;
     avctx->coded_frame->key_frame = 1;
-    avctx->bits_per_coded_sample = av_get_bits_per_pixel(&av_pix_fmt_descriptors[avctx->pix_fmt]);
+FF_ENABLE_DEPRECATION_WARNINGS
+#endif
+    avctx->bits_per_coded_sample = av_get_bits_per_pixel(desc);
     if(!avctx->codec_tag)
         avctx->codec_tag = avcodec_pix_fmt_to_codec_tag(avctx->pix_fmt);
     return 0;
@@ -56,7 +62,7 @@ static int raw_encode(AVCodecContext *avctx, AVPacket *pkt,
         return ret;
 
     if(avctx->codec_tag == AV_RL32("yuv2") && ret > 0 &&
-       avctx->pix_fmt   == PIX_FMT_YUYV422) {
+       avctx->pix_fmt   == AV_PIX_FMT_YUYV422) {
         int x;
         for(x = 1; x < avctx->height*avctx->width*2; x += 2)
             pkt->data[x] ^= 0x80;
@@ -68,10 +74,9 @@ static int raw_encode(AVCodecContext *avctx, AVPacket *pkt,
 
 AVCodec ff_rawvideo_encoder = {
     .name           = "rawvideo",
+    .long_name      = NULL_IF_CONFIG_SMALL("raw video"),
     .type           = AVMEDIA_TYPE_VIDEO,
-    .id             = CODEC_ID_RAWVIDEO,
-    .priv_data_size = sizeof(AVFrame),
-    .init           = raw_init_encoder,
+    .id             = AV_CODEC_ID_RAWVIDEO,
+    .init           = raw_encode_init,
     .encode2        = raw_encode,
-    .long_name = NULL_IF_CONFIG_SMALL("raw video"),
 };