[FFmpeg-cvslog] r11278 - in trunk/libavformat: asf.c utils.c

[aurel]

Author: aurel
Date: Thu Dec 20 01:25:18 2007
New Revision: 11278

Log:
remove double check of pb->read_seek

Modified:
   trunk/libavformat/asf.c
   trunk/libavformat/utils.c

Modified: trunk/libavformat/asf.c
==============================================================================
--- trunk/libavformat/asf.c	(original)
+++ trunk/libavformat/asf.c	Thu Dec 20 01:25:18 2007
@@ -1050,10 +1050,11 @@ static int asf_read_seek(AVFormatContext
         return -1;
 
     /* Try using the protocol's read_seek if available */
-    if(s->pb && s->pb->read_seek) {
+    if(s->pb) {
         int ret = av_url_read_fseek(s->pb, stream_index, pts, flags);
         if(ret >= 0)
             asf_reset_header(s);
+        if (ret != AVERROR(ENOSYS))
         return ret;
     }
 

Modified: trunk/libavformat/utils.c
==============================================================================
--- trunk/libavformat/utils.c	(original)
+++ trunk/libavformat/utils.c	Thu Dec 20 01:25:18 2007
@@ -2042,7 +2042,7 @@ int av_read_play(AVFormatContext *s)
 {
     if (s->iformat->read_play)
         return s->iformat->read_play(s);
-    if (s->pb && s->pb->read_pause)
+    if (s->pb)
         return av_url_read_fpause(s->pb, 0);
     return AVERROR(ENOSYS);
 }
@@ -2051,7 +2051,7 @@ int av_read_pause(AVFormatContext *s)
 {
     if (s->iformat->read_pause)
         return s->iformat->read_pause(s);
-    if (s->pb && s->pb->read_pause)
+    if (s->pb)
         return av_url_read_fpause(s->pb, 1);
     return AVERROR(ENOSYS);
 }