[FFmpeg-devel] [PATCH 02/11] Rename remaining url_fseek to avio_seek.

Clément Bœsch ubitux at gmail.com
Mon Nov 14 01:45:01 CET 2011


---
 libavformat/act.c     |    4 ++--
 libavformat/bintext.c |   12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/libavformat/act.c b/libavformat/act.c
index a2e8b9f..a21f2a3 100644
--- a/libavformat/act.c
+++ b/libavformat/act.c
@@ -92,7 +92,7 @@ static int read_header(AVFormatContext *s,
 
     st->codec->codec_id=CODEC_ID_G729;
 
-    url_fseek(pb, 257, SEEK_SET);
+    avio_seek(pb, 257, SEEK_SET);
     msec=get_le16(pb);
     sec=get_byte(pb);
     min=get_le32(pb);
@@ -101,7 +101,7 @@ static int read_header(AVFormatContext *s,
 
     ctx->bytes_left_in_chunk=CHUNK_SIZE;
 
-    url_fseek(pb, 512, SEEK_SET);
+    avio_seek(pb, 512, SEEK_SET);
 
     return 0;
 }
diff --git a/libavformat/bintext.c b/libavformat/bintext.c
index 6dfb960..aa668a0 100644
--- a/libavformat/bintext.c
+++ b/libavformat/bintext.c
@@ -64,7 +64,7 @@ static int next_tag_read(AVFormatContext *avctx, uint64_t *fsize)
     int len;
     uint64_t start_pos = url_fsize(pb) - 256;
 
-    url_fseek(pb, start_pos, SEEK_SET);
+    avio_seek(pb, start_pos, SEEK_SET);
     if (get_buffer(pb, buf, sizeof(next_magic)) != sizeof(next_magic))
         return -1;
     if (memcmp(buf, next_magic, sizeof(next_magic)))
@@ -149,7 +149,7 @@ static int bintext_read_header(AVFormatContext *s,
             predict_width(st->codec, bin->fsize, got_width);
         if (!ap->height)
             calculate_height(st->codec, bin->fsize);
-        url_fseek(pb, 0, SEEK_SET);
+        avio_seek(pb, 0, SEEK_SET);
     }
     return 0;
 };
@@ -203,7 +203,7 @@ static int xbin_read_header(AVFormatContext *s,
     if (!url_is_streamed(pb)) {
         bin->fsize = url_fsize(pb) - 9 - st->codec->extradata_size;
         ff_sauce_read(s, &bin->fsize, NULL, 0);
-        url_fseek(pb, 9 + st->codec->extradata_size, SEEK_SET);
+        avio_seek(pb, 9 + st->codec->extradata_size, SEEK_SET);
     }
 
     return 0;
@@ -248,7 +248,7 @@ static int adf_read_header(AVFormatContext *s,
         ff_sauce_read(s, &bin->fsize, &got_width, 0);
         if (!ap->height)
             calculate_height(st->codec, bin->fsize);
-        url_fseek(pb, 1 + 192 + 4096, SEEK_SET);
+        avio_seek(pb, 1 + 192 + 4096, SEEK_SET);
     }
     return 0;
 }
@@ -291,7 +291,7 @@ static int idf_read_header(AVFormatContext *s,
     st->codec->extradata[0] = 16;
     st->codec->extradata[1] = BINTEXT_PALETTE|BINTEXT_FONT;
 
-    url_fseek(pb, url_fsize(pb) - 4096 - 48, SEEK_SET);
+    avio_seek(pb, avio_size(pb) - 4096 - 48, SEEK_SET);
 
     if (get_buffer(pb, st->codec->extradata + 2 + 48, 4096) < 0)
         return AVERROR(EIO);
@@ -302,7 +302,7 @@ static int idf_read_header(AVFormatContext *s,
     ff_sauce_read(s, &bin->fsize, &got_width, 0);
     if (!ap->height)
         calculate_height(st->codec, bin->fsize);
-    url_fseek(pb, 12, SEEK_SET);
+    avio_seek(pb, 12, SEEK_SET);
     return 0;
 }
 #endif /* CONFIG_IDF_DEMUXER */
-- 
1.7.7.3



More information about the ffmpeg-devel mailing list