diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-03-06 19:59:29 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-03-08 02:09:17 +0100 |
| commit | 1447dc59de9f179a99a91ca9a9d210d918b90486 (patch) | |
| tree | 7ce2cf8c69a2d7e2bdec786063c43d68955fd55e /libavformat/oggdec.c | |
| parent | de3ef79250f39f04fb194e808933509dc4a7f397 (diff) | |
| download | ffmpeg-1447dc59de9f179a99a91ca9a9d210d918b90486.tar.gz | |
avio: deprecate url_fgetc and remove all it uses
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit e51975392d85e72801193123945a35fb5221248f)
Diffstat (limited to 'libavformat/oggdec.c')
| -rw-r--r-- | libavformat/oggdec.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavformat/oggdec.c b/libavformat/oggdec.c index ff6b69a508..2eb9e03f76 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){ |