Windows Media Audio Lossless decoder

[ffmpeg] / libavcodec / dirac_parser.c

diff --git a/libavcodec/dirac_parser.c b/libavcodec/dirac_parser.c
index aa561f7cedb9eea6a17249d63dd6fc621c6d358e..11d0cf86b2899b0f8f6ee1ccf2178f0e962a9a28 100644 (file)
--- a/libavcodec/dirac_parser.c
+++ b/libavcodec/dirac_parser.c
@@ -194,7 +194,7 @@ static int dirac_combine_frame(AVCodecParserContext *s, AVCodecContext *avctx,
                 avctx->has_b_frames = 1;
         }
         if (avctx->has_b_frames && s->pts == s->dts)
-             s->pict_type = FF_B_TYPE;
+             s->pict_type = AV_PICTURE_TYPE_B;
 
         /* Finally have a complete Dirac data unit */
         *buf      = pc->dirac_unit;
@@ -248,9 +248,8 @@ static void dirac_parse_close(AVCodecParserContext *s)
 }
 
 AVCodecParser ff_dirac_parser = {
-    { CODEC_ID_DIRAC },
-    sizeof(DiracParseContext),
-    NULL,
-    dirac_parse,
-    dirac_parse_close,
+    .codec_ids      = { CODEC_ID_DIRAC },
+    .priv_data_size = sizeof(DiracParseContext),
+    .parser_parse   = dirac_parse,
+    .parser_close   = dirac_parse_close,
 };