avframe: add AV_FRAME_DATA_MATRIXENCODING side data type.

[ffmpeg] / libavcodec / vp3_parser.c

diff --git a/libavcodec/vp3_parser.c b/libavcodec/vp3_parser.c
index cfe6b3f2a3c6a199696d25f7b88601e884b4d2ea..ef2c55b8ac53bd46f4252a51c15730c33a1e37e6 100644 (file)
--- a/libavcodec/vp3_parser.c
+++ b/libavcodec/vp3_parser.c
@@ -25,7 +25,7 @@ static int parse(AVCodecParserContext *s,
                            const uint8_t **poutbuf, int *poutbuf_size,
                            const uint8_t *buf, int buf_size)
 {
-    if(avctx->codec_id == CODEC_ID_THEORA)
+    if(avctx->codec_id == AV_CODEC_ID_THEORA)
         s->pict_type= (buf[0]&0x40) ? AV_PICTURE_TYPE_P : AV_PICTURE_TYPE_I;
     else
         s->pict_type= (buf[0]&0x80) ? AV_PICTURE_TYPE_P : AV_PICTURE_TYPE_I;
@@ -36,9 +36,7 @@ static int parse(AVCodecParserContext *s,
 }
 
 AVCodecParser ff_vp3_parser = {
-    { CODEC_ID_THEORA, CODEC_ID_VP3,
-      CODEC_ID_VP6,    CODEC_ID_VP6F, CODEC_ID_VP6A },
-    0,
-    NULL,
-    parse,
+    .codec_ids      = { AV_CODEC_ID_THEORA, AV_CODEC_ID_VP3, AV_CODEC_ID_VP6,
+                        AV_CODEC_ID_VP6F,   AV_CODEC_ID_VP6A },
+    .parser_parse   = parse,
 };