[FFmpeg-cvslog] Use AVIOContext.seekable instead of deprecated url_is_streamed.

Clément Bœsch git at videolan.org
Mon Nov 14 07:26:16 CET 2011


ffmpeg | branch: master | Clément Bœsch <ubitux at gmail.com> | Mon Nov 14 01:33:28 2011 +0100| [49651063da054070f11b1387bb50b85b7ffec591] | committer: Clément Bœsch

Use AVIOContext.seekable instead of deprecated url_is_streamed.

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

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

diff --git a/libavformat/bintext.c b/libavformat/bintext.c
index a4f1d67..8c155bd 100644
--- a/libavformat/bintext.c
+++ b/libavformat/bintext.c
@@ -140,7 +140,7 @@ static int bintext_read_header(AVFormatContext *s,
     st->codec->extradata[0] = 16;
     st->codec->extradata[1] = 0;
 
-    if (!url_is_streamed(pb)) {
+    if (pb->seekable) {
         int got_width = 0;
         bin->fsize = avio_size(pb);
         if (ff_sauce_read(s, &bin->fsize, &got_width, 0) < 0)
@@ -200,7 +200,7 @@ static int xbin_read_header(AVFormatContext *s,
     if (avio_read(pb, st->codec->extradata + 2, st->codec->extradata_size - 2) < 0)
         return AVERROR(EIO);
 
-    if (!url_is_streamed(pb)) {
+    if (pb->seekable) {
         bin->fsize = avio_size(pb) - 9 - st->codec->extradata_size;
         ff_sauce_read(s, &bin->fsize, NULL, 0);
         avio_seek(pb, 9 + st->codec->extradata_size, SEEK_SET);
@@ -241,7 +241,7 @@ static int adf_read_header(AVFormatContext *s,
     if (avio_read(pb, st->codec->extradata + 2 + 48, 4096) < 0)
         return AVERROR(EIO);
 
-    if (!url_is_streamed(pb)) {
+    if (pb->seekable) {
         int got_width = 0;
         bin->fsize = avio_size(pb) - 1 - 192 - 4096;
         st->codec->width = 80<<3;
@@ -276,7 +276,7 @@ static int idf_read_header(AVFormatContext *s,
     AVStream *st;
     int got_width = 0;
 
-    if (url_is_streamed(pb))
+    if (!pb->seekable)
         return AVERROR(EIO);
 
     st = init_stream(s, ap);



More information about the ffmpeg-cvslog mailing list