X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Frv34_parser.c;h=ec6d3a5644a82f68de446fbde3e5906c5867af97;hb=b805482b1fba1d82fbe47023a24c9261f18979b6;hp=4c1d2e396e5d05416e4f4caac5f8d5428d840f7d;hpb=5511ad14fe1cc871a5a256bf801db09cf1cc35f5;p=ffmpeg

diff --git a/libavcodec/rv34_parser.c b/libavcodec/rv34_parser.c
index 4c1d2e396e5..ec6d3a5644a 100644
--- a/libavcodec/rv34_parser.c
+++ b/libavcodec/rv34_parser.c
@@ -27,7 +27,7 @@
 #include "parser.h"
 #include "libavutil/intreadwrite.h"
 
-typedef struct {
+typedef struct RV34ParseContext {
     ParseContext pc;
     int64_t key_dts;
     int key_pts;
@@ -52,7 +52,7 @@ static int rv34_parse(AVCodecParserContext *s,
     }
 
     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 {
@@ -76,17 +76,17 @@ static int rv34_parse(AVCodecParserContext *s,
     return buf_size;
 }
 
-#ifdef CONFIG_RV30_PARSER
+#if CONFIG_RV30_PARSER
 AVCodecParser ff_rv30_parser = {
-    .codec_ids      = { CODEC_ID_RV30 },
+    .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_ids      = { CODEC_ID_RV40 },
+    .codec_ids      = { AV_CODEC_ID_RV40 },
     .priv_data_size = sizeof(RV34ParseContext),
     .parser_parse   = rv34_parse,
 };