nvenc: Generate AUD NAL units for better compatiblity

[ffmpeg] / libavcodec / rv34_parser.c

diff --git a/libavcodec/rv34_parser.c b/libavcodec/rv34_parser.c
index ce8604345ea566840a1e38b5043d9fded5e7fc63..ec6d3a5644a82f68de446fbde3e5906c5867af97 100644 (file)
--- 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,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