Postpone API-incompatible changes until the next bump.

[ffmpeg] / libavcodec / rv34_parser.c

diff --git a/libavcodec/rv34_parser.c b/libavcodec/rv34_parser.c
index c2563a5fdc48aed9b0b3304f34a851b4ab555832..8af74431c0b191ef318c2da15387cba3f3efd457 100644 (file)
--- a/libavcodec/rv34_parser.c
+++ b/libavcodec/rv34_parser.c
@@ -43,7 +43,6 @@ static int rv34_parse(AVCodecParserContext *s,
                       const uint8_t *buf, int buf_size)
 {
     RV34ParseContext *pc = s->priv_data;
-    int off;
     int type, pts, hdr;
 
     if (buf_size < 13 + *buf * 8) {
@@ -52,9 +51,8 @@ static int rv34_parse(AVCodecParserContext *s,
         return buf_size;
     }
 
-    off = AV_RL32(buf + 5);
     hdr = AV_RB32(buf + 9 + *buf * 8);
-    if (avctx->codec_id == CODEC_ID_RV30) {
+    if (avctx->codec_id == AV_CODEC_ID_RV30) {
         type = (hdr >> 27) & 3;
         pts  = (hdr >>  7) & 0x1FFF;
     } else {
@@ -78,20 +76,18 @@ static int rv34_parse(AVCodecParserContext *s,
     return buf_size;
 }
 
-#ifdef CONFIG_RV30_PARSER
+#if CONFIG_RV30_PARSER
 AVCodecParser ff_rv30_parser = {
-    { CODEC_ID_RV30 },
-    sizeof(RV34ParseContext),
-    NULL,
-    rv34_parse,
+    .codec_ids      = { AV_CODEC_ID_RV30 },
+    .priv_data_size = sizeof(RV34ParseContext),
+    .parser_parse   = rv34_parse,
 };
 #endif
 
-#ifdef CONFIG_RV40_PARSER
+#if CONFIG_RV40_PARSER
 AVCodecParser ff_rv40_parser = {
-    { CODEC_ID_RV40 },
-    sizeof(RV34ParseContext),
-    NULL,
-    rv34_parse,
+    .codec_ids      = { AV_CODEC_ID_RV40 },
+    .priv_data_size = sizeof(RV34ParseContext),
+    .parser_parse   = rv34_parse,
 };
 #endif