Merge remote branch 'qatar/master'

[ffmpeg] / libavcodec / frwu.c

diff --git a/libavcodec/frwu.c b/libavcodec/frwu.c
index 306166bdc535cbab567f40d301c2855504934b2f..08dfbf0c9b272695eec43099cdda7a5066d15f21 100644 (file)
--- a/libavcodec/frwu.c
+++ b/libavcodec/frwu.c
@@ -27,7 +27,7 @@
 static av_cold int decode_init(AVCodecContext *avctx)
 {
     if (avctx->width & 1) {
-        av_log(avctx, AV_LOG_ERROR, "FRWU needs even width\n");
+        av_log(avctx, AV_LOG_ERROR, "frwu needs even width\n");
         return -1;
     }
     avctx->pix_fmt = PIX_FMT_UYVY422;
@@ -61,7 +61,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
     if (avctx->get_buffer(avctx, pic) < 0)
         return -1;
 
-    pic->pict_type = FF_I_TYPE;
+    pic->pict_type = AV_PICTURE_TYPE_I;
     pic->key_frame = 1;
     pic->interlaced_frame = 1;
     pic->top_field_first = 1;
@@ -110,7 +110,7 @@ static av_cold int decode_close(AVCodecContext *avctx)
 }
 
 AVCodec ff_frwu_decoder = {
-    "FRWU",
+    "frwu",
     AVMEDIA_TYPE_VIDEO,
     CODEC_ID_FRWU,
     0,