summaryrefslogtreecommitdiff
path: root/libavformat/ogg2.c
diff options
context:
space:
mode:
authorAurelien Jacobs <aurel@gnuage.org>2005-05-19 00:06:27 +0000
committerAurelien Jacobs <aurel@gnuage.org>2005-05-19 00:06:27 +0000
commita965c478b2b2fe7d9d0a2c60561bb4ee171a2119 (patch)
tree92bd415fe4020d93d262d7a120ec0b00823cb3b3 /libavformat/ogg2.c
parent3b5ffe7a399a8ff8a600a31ba9b4348e5d2e8b86 (diff)
drop most url_fileno() calls (allows to use ByteIOContext directly in caller apps instead of URLProtocol)
Originally committed as revision 4275 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/ogg2.c')
-rw-r--r--libavformat/ogg2.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/libavformat/ogg2.c b/libavformat/ogg2.c
index 05147f89fb..6f9638b005 100644
--- a/libavformat/ogg2.c
+++ b/libavformat/ogg2.c
@@ -449,7 +449,6 @@ static int
ogg_get_length (AVFormatContext * s)
{
ogg_t *ogg = s->priv_data;
- URLContext *h = url_fileno (&s->pb);
int idx = -1, i;
//FIXME: get the right ctx flag to know if is seekable or not
// if(ogg->f->flags & URL_FLAG_STREAMED)
@@ -460,7 +459,7 @@ ogg_get_length (AVFormatContext * s)
return 0;
ogg_save (s);
- url_seek (h, -MAX_PAGE_SIZE, SEEK_END);
+ url_fseek (&s->pb, -MAX_PAGE_SIZE, SEEK_END);
while (!ogg_read_page (s, &i)){
if (ogg->streams[i].granule != -1 && ogg->streams[i].granule != 0)
@@ -472,7 +471,7 @@ ogg_get_length (AVFormatContext * s)
ogg_gptopts (s, idx, ogg->streams[idx].granule);
}
- ogg->size = url_filesize(h);
+ ogg->size = url_fsize(&s->pb);
ogg_restore (s, 0);
return 0;