vorbiscomment: convert metadata before computing the header's length

[ffmpeg] / libavformat / r3d.c

diff --git a/libavformat/r3d.c b/libavformat/r3d.c
index 4f03d7f248543bf5384adbf37c298e0e1a211065..556a32b20eb52b14ac77d52bbec2283fe2b2c352 100644 (file)
--- a/libavformat/r3d.c
+++ b/libavformat/r3d.c
@@ -56,7 +56,7 @@ static int r3d_read_red1(AVFormatContext *s)
 
     if (!st)
         return AVERROR(ENOMEM);
-    st->codec->codec_type = CODEC_TYPE_VIDEO;
+    st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
     st->codec->codec_id = CODEC_ID_JPEG2000;
 
     tmp  = get_byte(s->pb); // major version
@@ -89,7 +89,7 @@ static int r3d_read_red1(AVFormatContext *s)
         AVStream *ast = av_new_stream(s, 1);
         if (!ast)
             return AVERROR(ENOMEM);
-        ast->codec->codec_type = CODEC_TYPE_AUDIO;
+        ast->codec->codec_type = AVMEDIA_TYPE_AUDIO;
         ast->codec->codec_id = CODEC_ID_PCM_S32BE;
         ast->codec->channels = tmp;
         av_set_pts_info(ast, 32, 1, st->time_base.den);
@@ -97,7 +97,7 @@ static int r3d_read_red1(AVFormatContext *s)
 
     get_buffer(s->pb, filename, 257);
     filename[sizeof(filename)-1] = 0;
-    av_metadata_set(&st->metadata, "filename", filename);
+    av_metadata_set2(&st->metadata, "filename", filename, 0);
 
     dprintf(s, "filename %s\n", filename);
     dprintf(s, "resolution %dx%d\n", st->codec->width, st->codec->height);