Port libmpcodec fixes from MPlayer.

[ffmpeg] / libavcodec / jvdec.c

diff --git a/libavcodec/jvdec.c b/libavcodec/jvdec.c
index 61faef6a54c871192c14628fc333a143e1bc28fd..f4941992f6fc19713258843701c30d52be7c13f9 100644 (file)
--- a/libavcodec/jvdec.c
+++ b/libavcodec/jvdec.c
@@ -180,7 +180,7 @@ static int decode_frame(AVCodecContext *avctx,
 
     if (video_size) {
         s->frame.key_frame           = 1;
-        s->frame.pict_type           = FF_I_TYPE;
+        s->frame.pict_type           = AV_PICTURE_TYPE_I;
         s->frame.palette_has_changed = s->palette_has_changed;
         s->palette_has_changed       = 0;
         memcpy(s->frame.data[1], s->palette, AVPALETTE_SIZE);
@@ -205,7 +205,7 @@ static av_cold int decode_close(AVCodecContext *avctx)
 AVCodec ff_jv_decoder = {
     .name           = "jv",
     .long_name      = NULL_IF_CONFIG_SMALL("Bitmap Brothers JV video"),
-    .type           = CODEC_TYPE_VIDEO,
+    .type           = AVMEDIA_TYPE_VIDEO,
     .id             = CODEC_ID_JV,
     .priv_data_size = sizeof(JvContext),
     .init           = decode_init,