[FFmpeg-cvslog] avio: deprecate url_fgetc and remove all it uses

[Anton Khirnov]

ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Sun Mar  6 19:59:29 2011 +0100| [1447dc59de9f179a99a91ca9a9d210d918b90486] | committer: Michael Niedermayer

avio: deprecate url_fgetc and remove all it uses

Signed-off-by: Ronald S. Bultje <rsbultje at gmail.com>
(cherry picked from commit e51975392d85e72801193123945a35fb5221248f)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1447dc59de9f179a99a91ca9a9d210d918b90486
---

 libavformat/avio.h    |    6 ++----
 libavformat/aviobuf.c |   10 ++++++----
 libavformat/mpegts.c  |    4 ++--
 libavformat/oggdec.c  |   10 +++++-----
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/libavformat/avio.h b/libavformat/avio.h
index 0d9f19f..20e1dc4 100644
--- a/libavformat/avio.h
+++ b/libavformat/avio.h
@@ -426,6 +426,8 @@ attribute_deprecated int url_fclose(AVIOContext *s);
 attribute_deprecated int64_t url_fseek(AVIOContext *s, int64_t offset, int whence);
 attribute_deprecated int url_fskip(AVIOContext *s, int64_t offset);
 attribute_deprecated int64_t url_ftell(AVIOContext *s);
+#define URL_EOF (-1)
+attribute_deprecated int url_fgetc(AVIOContext *s);
 /**
  * @}
  */
@@ -497,10 +499,6 @@ 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);
 
-#define URL_EOF (-1)
-/** @note return URL_EOF (-1) if EOF */
-int url_fgetc(AVIOContext *s);
-
 /** @warning currently size is limited */
 #ifdef __GNUC__
 int url_fprintf(AVIOContext *s, const char *fmt, ...) __attribute__ ((__format__ (__printf__, 2, 3)));
diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c
index 2905724..b21d3e3 100644
--- a/libavformat/aviobuf.c
+++ b/libavformat/aviobuf.c
@@ -541,6 +541,7 @@ int avio_r8(AVIOContext *s)
     return 0;
 }
 
+#if FF_API_OLD_AVIO
 int url_fgetc(AVIOContext *s)
 {
     if (s->buf_ptr >= s->buf_end)
@@ -549,6 +550,7 @@ int url_fgetc(AVIOContext *s)
         return *s->buf_ptr++;
     return URL_EOF;
 }
+#endif
 
 int avio_read(AVIOContext *s, unsigned char *buf, int size)
 {
@@ -921,16 +923,16 @@ char *url_fgets(AVIOContext *s, char *buf, int buf_size)
     int c;
     char *q;
 
-    c = url_fgetc(s);
-    if (c == EOF)
+    c = avio_r8(s);
+    if (url_feof(s))
         return NULL;
     q = buf;
     for(;;) {
-        if (c == EOF || c == '\n')
+        if (url_feof(s) || c == '\n')
             break;
         if ((q - buf) < buf_size - 1)
             *q++ = c;
-        c = url_fgetc(s);
+        c = avio_r8(s);
     }
     if (buf_size > 0)
         *q = '\0';
diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
index ba8b3c8..1b6f5e3 100644
--- a/libavformat/mpegts.c
+++ b/libavformat/mpegts.c
@@ -1312,8 +1312,8 @@ static int mpegts_resync(AVFormatContext *s)
     int c, i;
 
     for(i = 0;i < MAX_RESYNC_SIZE; i++) {
-        c = url_fgetc(pb);
-        if (c < 0)
+        c = avio_r8(pb);
+        if (url_feof(pb))
             return -1;
         if (c == 0x47) {
             avio_seek(pb, -1, SEEK_CUR);
diff --git a/libavformat/oggdec.c b/libavformat/oggdec.c
index ff6b69a..2eb9e03 100644
--- a/libavformat/oggdec.c
+++ b/libavformat/oggdec.c
@@ -218,8 +218,8 @@ ogg_read_page (AVFormatContext * s, int *str)
             sync[(sp + 2) & 3] == 'g' && sync[(sp + 3) & 3] == 'S')
             break;
 
-        c = url_fgetc (bc);
-        if (c < 0)
+        c = avio_r8(bc);
+        if (url_feof(bc))
             return -1;
         sync[sp++ & 3] = c;
     }while (i++ < MAX_PAGE_SIZE);
@@ -229,15 +229,15 @@ ogg_read_page (AVFormatContext * s, int *str)
         return -1;
     }
 
-    if (url_fgetc (bc) != 0)      /* version */
+    if (avio_r8(bc) != 0)      /* version */
         return -1;
 
-    flags = url_fgetc (bc);
+    flags = avio_r8(bc);
     gp = avio_rl64 (bc);
     serial = avio_rl32 (bc);
     seq = avio_rl32 (bc);
     crc = avio_rl32 (bc);
-    nsegs = url_fgetc (bc);
+    nsegs = avio_r8(bc);
 
     idx = ogg_find_stream (ogg, serial);
     if (idx < 0){