[FFmpeg-devel] [PATCH 07/10] avio: rename av_url_read_fseek/fpause to avio_read_* for consistency

[Anton Khirnov]

---
 libavformat/asfdec.c  |    2 +-
 libavformat/avio.h    |    9 ++++++---
 libavformat/aviobuf.c |   15 ++++++++++++---
 libavformat/flvdec.c  |    4 ++--
 libavformat/utils.c   |    4 ++--
 5 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/libavformat/asfdec.c b/libavformat/asfdec.c
index d4d4373..66e2004 100644
--- a/libavformat/asfdec.c
+++ b/libavformat/asfdec.c
@@ -1242,7 +1242,7 @@ static int asf_read_seek(AVFormatContext *s, int stream_index, int64_t pts, int
 
     /* Try using the protocol's read_seek if available */
     if(s->pb) {
-        int ret = av_url_read_fseek(s->pb, stream_index, pts, flags);
+        int ret = avio_read_fseek(s->pb, stream_index, pts, flags);
         if(ret >= 0)
             asf_reset_header(s);
         if (ret != AVERROR(ENOSYS))
diff --git a/libavformat/avio.h b/libavformat/avio.h
index 9eb0a8a..fd66c5d 100644
--- a/libavformat/avio.h
+++ b/libavformat/avio.h
@@ -442,6 +442,9 @@ attribute_deprecated int64_t url_ftell(AVIOContext *s);
 attribute_deprecated int64_t url_fsize(AVIOContext *s);
 attribute_deprecated int url_feof(AVIOContext *s);
 attribute_deprecated int url_ferror(AVIOContext *s);
+attribute_deprecated int av_url_read_fpause(AVIOContext *h, int pause);
+attribute_deprecated int64_t av_url_read_fseek(AVIOContext *h, int stream_index,
+                                               int64_t timestamp, int flags);
 /**
  * @}
  */
@@ -547,9 +550,9 @@ int avio_feof(AVIOContext *s);
 
 int avio_ferror(AVIOContext *s);
 
-int av_url_read_fpause(AVIOContext *h, int pause);
-int64_t av_url_read_fseek(AVIOContext *h, int stream_index,
-                          int64_t timestamp, int flags);
+int     avio_read_fpause(AVIOContext *h, int pause);
+int64_t avio_read_fseek( AVIOContext *h, int stream_index,
+                         int64_t timestamp, int flags);
 
 #define URL_EOF (-1)
 /** @note return URL_EOF (-1) if EOF */
diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c
index cd2ab69..a52735f 100644
--- a/libavformat/aviobuf.c
+++ b/libavformat/aviobuf.c
@@ -376,6 +376,15 @@ int url_ferror(AVIOContext *s)
 {
     return avio_ferror(s);
 }
+
+int av_url_read_fpause(AVIOContext *s, int pause)
+{
+    return avio_read_fpause(s, pause);
+}
+int64_t av_url_read_fseek(AVIOContext *s, int stream_index, int64_t timestamp, int flags)
+{
+    return avio_read_fseek(s, stream_index, timestamp, flags);
+}
 #endif
 
 int avio_put_str(AVIOContext *s, const char *str)
@@ -934,15 +943,15 @@ int url_fget_max_packet_size(AVIOContext *s)
     return s->max_packet_size;
 }
 
-int av_url_read_fpause(AVIOContext *s, int pause)
+int avio_read_fpause(AVIOContext *s, int pause)
 {
     if (!s->read_pause)
         return AVERROR(ENOSYS);
     return s->read_pause(s->opaque, pause);
 }
 
-int64_t av_url_read_fseek(AVIOContext *s, int stream_index,
-                          int64_t timestamp, int flags)
+int64_t avio_read_fseek(AVIOContext *s, int stream_index,
+                        int64_t timestamp, int flags)
 {
     URLContext *h = s->opaque;
     int64_t ret;
diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c
index ea23a8c..9609a70 100644
--- a/libavformat/flvdec.c
+++ b/libavformat/flvdec.c
@@ -461,7 +461,7 @@ leave:
 static int flv_read_seek(AVFormatContext *s, int stream_index,
     int64_t ts, int flags)
 {
-    return av_url_read_fseek(s->pb, stream_index, ts, flags);
+    return avio_read_fseek(s->pb, stream_index, ts, flags);
 }
 
 #if 0 /* don't know enough to implement this */
@@ -482,7 +482,7 @@ static int flv_read_seek2(AVFormatContext *s, int stream_index,
             ts = av_rescale_rnd(ts, 1000, AV_TIME_BASE,
                 flags & AVSEEK_FLAG_BACKWARD ? AV_ROUND_DOWN : AV_ROUND_UP);
         }
-        ret = av_url_read_fseek(s->pb, stream_index, ts, flags);
+        ret = avio_read_fseek(s->pb, stream_index, ts, flags);
     }
 
     if (ret == AVERROR(ENOSYS))
diff --git a/libavformat/utils.c b/libavformat/utils.c
index f83e720..741c3df 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -2549,7 +2549,7 @@ int av_read_play(AVFormatContext *s)
     if (s->iformat->read_play)
         return s->iformat->read_play(s);
     if (s->pb)
-        return av_url_read_fpause(s->pb, 0);
+        return avio_read_fpause(s->pb, 0);
     return AVERROR(ENOSYS);
 }
 
@@ -2558,7 +2558,7 @@ int av_read_pause(AVFormatContext *s)
     if (s->iformat->read_pause)
         return s->iformat->read_pause(s);
     if (s->pb)
-        return av_url_read_fpause(s->pb, 1);
+        return avio_read_fpause(s->pb, 1);
     return AVERROR(ENOSYS);
 }
 
-- 
1.7.2.3