[SCM] libav/experimental: remove double check of pb->read_seek

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit fd2982a0a01942091b2f08e17486ff4562f675a6
Author: Aurelien Jacobs <aurel at gnuage.org>
Date:   Thu Dec 20 00:25:18 2007 +0000

    remove double check of pb->read_seek
    
    Originally committed as revision 11278 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/asf.c b/libavformat/asf.c
index 2316ed5..c614cb5 100644
--- a/libavformat/asf.c
+++ b/libavformat/asf.c
@@ -1050,10 +1050,11 @@ static int asf_read_seek(AVFormatContext *s, int stream_index, int64_t pts, int
         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;
     }
 
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 1f105d4..59dc8db 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -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);
 }

-- 
Libav/FFmpeg packaging