[FFmpeg-cvslog] r22853 - trunk/libavformat/aviobuf.c

cehoyos subversion
Mon Apr 12 17:03:30 CEST 2010


Author: cehoyos
Date: Mon Apr 12 17:03:30 2010
New Revision: 22853

Log:
Do not set pos to an error value.

Patch by Howard Chu, hyc highlandsun com

Modified:
   trunk/libavformat/aviobuf.c

Modified: trunk/libavformat/aviobuf.c
==============================================================================
--- trunk/libavformat/aviobuf.c	Mon Apr 12 15:28:59 2010	(r22852)
+++ trunk/libavformat/aviobuf.c	Mon Apr 12 17:03:30 2010	(r22853)
@@ -743,8 +743,13 @@ int64_t av_url_read_fseek(ByteIOContext 
         return AVERROR(ENOSYS);
     ret = s->read_seek(h, stream_index, timestamp, flags);
     if(ret >= 0) {
+        int64_t pos;
         s->buf_ptr = s->buf_end; // Flush buffer
-        s->pos = s->seek(h, 0, SEEK_CUR);
+        pos = s->seek(h, 0, SEEK_CUR);
+        if (pos >= 0)
+            s->pos = pos;
+        else if (pos != AVERROR(ENOSYS))
+            ret = pos;
     }
     return ret;
 }



More information about the ffmpeg-cvslog mailing list