From: Michael Niedermayer <michaelni@gmx.at>
Date: Tue, 26 Sep 2006 16:09:56 +0000 (+0000)
Subject: simplify seek() failure check
X-Git-Tag: v0.5~11765
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=3b9a913db4d303a0305a80de496b1933cba8980f;p=coroid%2Fffmpeg_saccubus.git

simplify seek() failure check

Originally committed as revision 6339 to svn://svn.ffmpeg.org/ffmpeg/trunk
---

diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c
index e0832c635..ef72c195c 100644
--- a/libavformat/aviobuf.c
+++ b/libavformat/aviobuf.c
@@ -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;
     }