Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavformat / smush.c

diff --git a/libavformat/smush.c b/libavformat/smush.c
index 79e23747c2e00c9279f4ab071ee65ba162175a3b..b164c7516e90eee5a16f2831b416d862f8b82c1f 100644 (file)
--- a/libavformat/smush.c
+++ b/libavformat/smush.c
@@ -79,7 +79,7 @@ static int smush_read_header(AVFormatContext *ctx)
             return AVERROR_INVALIDDATA;
 
         smush->version = 1;
-        avio_skip(pb, 2); // skip version
+        subversion     = avio_rl16(pb);
         nframes = avio_rl32(pb);
         avio_skip(pb, 2); // skip pad
         width  = avio_rl16(pb);
@@ -135,7 +135,7 @@ static int smush_read_header(AVFormatContext *ctx)
     vst->duration          =
     vst->nb_frames         = nframes;
     vst->codec->codec_type = AVMEDIA_TYPE_VIDEO;
-    vst->codec->codec_id   = CODEC_ID_SANM;
+    vst->codec->codec_id   = AV_CODEC_ID_SANM;
     vst->codec->codec_tag  = 0;
     vst->codec->width      = width;
     vst->codec->height     = height;
@@ -162,7 +162,7 @@ static int smush_read_header(AVFormatContext *ctx)
 
         ast->start_time         = 0;
         ast->codec->codec_type  = AVMEDIA_TYPE_AUDIO;
-        ast->codec->codec_id    = CODEC_ID_VIMA;
+        ast->codec->codec_id    = AV_CODEC_ID_VIMA;
         ast->codec->codec_tag   = 0;
         ast->codec->sample_rate = sample_rate;
         ast->codec->channels    = channels;