diff options
| author | James Almer <jamrial@gmail.com> | 2014-08-07 17:12:41 -0300 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-08 00:48:38 +0200 |
| commit | d34ec64a22907173c13e687b815d94618d2dc85b (patch) | |
| tree | d53c26525699660773d9457d65ca980c21823351 /libavformat/gifdec.c | |
| parent | 5c3c67126feb046e25359096225507bf6dfe7b27 (diff) | |
| download | ffmpeg-d34ec64a22907173c13e687b815d94618d2dc85b.tar.gz | |
replace calls to url_feof() with avio_feof()
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/gifdec.c')
| -rw-r--r-- | libavformat/gifdec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/gifdec.c b/libavformat/gifdec.c index 2981bcabbe..7db5a27408 100644 --- a/libavformat/gifdec.c +++ b/libavformat/gifdec.c @@ -84,7 +84,7 @@ static int resync(AVIOContext *pb) int b = avio_r8(pb); if (b != gif87a_sig[i] && b != gif89a_sig[i]) i = -(b != 'G'); - if (url_feof(pb)) + if (avio_feof(pb)) return AVERROR_EOF; } return 0; @@ -234,7 +234,7 @@ parse_keyframe: ret = AVERROR_EOF; } - while (GIF_TRAILER != (block_label = avio_r8(pb)) && !url_feof(pb)) { + while (GIF_TRAILER != (block_label = avio_r8(pb)) && !avio_feof(pb)) { if (block_label == GIF_EXTENSION_INTRODUCER) { if ((ret = gif_read_ext (s)) < 0 ) goto resync; @@ -299,7 +299,7 @@ resync: if ((ret >= 0 && !frame_parsed) || ret == AVERROR_EOF) { /* This might happen when there is no image block * between extension blocks and GIF_TRAILER or EOF */ - if (!gdc->ignore_loop && (block_label == GIF_TRAILER || url_feof(pb)) + if (!gdc->ignore_loop && (block_label == GIF_TRAILER || avio_feof(pb)) && (gdc->total_iter < 0 || ++gdc->iter_count < gdc->total_iter)) return avio_seek(pb, 0, SEEK_SET); return AVERROR_EOF; |