[FFmpeg-cvslog] smush: read subversion for version==1 too.

Michael Niedermayer git at videolan.org
Sun Sep 9 02:41:41 CEST 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Sep  9 02:36:57 2012 +0200| [59fdf543d515d208a9913c67d0df5a3a095976f4] | committer: Michael Niedermayer

smush: read subversion for version==1 too.

This avoids a gcc warning, otherwise it should have no effect.
its a bit more consistent too

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=59fdf543d515d208a9913c67d0df5a3a095976f4
---

 libavformat/smush.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/smush.c b/libavformat/smush.c
index d9a58c6..b164c75 100644
--- 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);



More information about the ffmpeg-cvslog mailing list