[FFmpeg-cvslog] avi: Use the correct data type

Luca Barbato git at videolan.org
Mon Dec 7 16:00:30 CET 2015


ffmpeg | branch: master | Luca Barbato <lu_zero at gentoo.org> | Sat Nov 28 14:43:17 2015 +0100| [d017ed878a45171f2f6c69fb9d76401c3c494110] | committer: Luca Barbato

avi: Use the correct data type

avio_tell returns an int64_t.

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

 libavformat/avidec.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/libavformat/avidec.c b/libavformat/avidec.c
index 659bfa7..43c178f 100644
--- a/libavformat/avidec.c
+++ b/libavformat/avidec.c
@@ -367,6 +367,7 @@ static int avi_read_header(AVFormatContext *s)
     int avih_width      = 0, avih_height = 0;
     int amv_file_format = 0;
     uint64_t list_end   = 0;
+    int64_t pos;
     int ret;
 
     avi->stream_index = -1;
@@ -759,12 +760,12 @@ static int avi_read_header(AVFormatContext *s)
             }
             break;
         case MKTAG('i', 'n', 'd', 'x'):
-            i = avio_tell(pb);
+            pos = avio_tell(pb);
             if (pb->seekable && !(s->flags & AVFMT_FLAG_IGNIDX) &&
                 read_braindead_odml_indx(s, 0) < 0 &&
                 (s->error_recognition & AV_EF_EXPLODE))
                 goto fail;
-            avio_seek(pb, i + size, SEEK_SET);
+            avio_seek(pb, pos + size, SEEK_SET);
             break;
         case MKTAG('v', 'p', 'r', 'p'):
             if (stream_index < (unsigned)s->nb_streams && size > 9 * 4) {



More information about the ffmpeg-cvslog mailing list