]> rtime.felk.cvut.cz Git - frescor/ffmpeg.git/commitdiff
simplify seek() failure check
authormichael <michael@9553f0bf-9b14-0410-a0b8-cfaf0461ba5b>
Tue, 26 Sep 2006 16:09:56 +0000 (16:09 +0000)
committermichael <michael@9553f0bf-9b14-0410-a0b8-cfaf0461ba5b>
Tue, 26 Sep 2006 16:09:56 +0000 (16:09 +0000)
git-svn-id: file:///var/local/repositories/ffmpeg/trunk@6339 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

libavformat/aviobuf.c

index e0832c6359b145baf5931e1631fb4908f47df9a2..ef72c195c13246b151918f9fc300c505e250a498 100644 (file)
@@ -123,9 +123,6 @@ offset_t url_fseek(ByteIOContext *s, offset_t offset, int whence)
         /* can do the seek inside the buffer */
         s->buf_ptr = s->buffer + offset1;
     } else {
-        if (!s->seek)
-            return -EPIPE;
-
 #ifdef CONFIG_MUXERS
         if (s->write_flag) {
             flush_buffer(s);
@@ -136,7 +133,7 @@ offset_t url_fseek(ByteIOContext *s, offset_t offset, int whence)
             s->buf_end = s->buffer;
         }
         s->buf_ptr = s->buffer;
-        if (s->seek(s->opaque, offset, SEEK_SET) == (offset_t)-EPIPE)
+        if (!s->seek || s->seek(s->opaque, offset, SEEK_SET) == (offset_t)-EPIPE)
             return -EPIPE;
         s->pos = offset;
     }