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/avidec.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/avidec.c')
| -rw-r--r-- | libavformat/avidec.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavformat/avidec.c b/libavformat/avidec.c index 8c70649b47..5b260e2542 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -219,7 +219,7 @@ static int read_braindead_odml_indx(AVFormatContext *s, int frame_num) #ifdef DEBUG_SEEK av_log(s, AV_LOG_ERROR, "pos:%"PRId64", len:%X\n", pos, len); #endif - if (url_feof(pb)) + if (avio_feof(pb)) return AVERROR_INVALIDDATA; if (last_pos == pos || pos == base - 8) @@ -237,7 +237,7 @@ static int read_braindead_odml_indx(AVFormatContext *s, int frame_num) avio_rl32(pb); /* size */ duration = avio_rl32(pb); - if (url_feof(pb)) + if (avio_feof(pb)) return AVERROR_INVALIDDATA; pos = avio_tell(pb); @@ -492,7 +492,7 @@ static int avi_read_header(AVFormatContext *s) codec_type = -1; frame_period = 0; for (;;) { - if (url_feof(pb)) + if (avio_feof(pb)) goto fail; tag = avio_rl32(pb); size = avio_rl32(pb); @@ -1111,7 +1111,7 @@ static int avi_sync(AVFormatContext *s, int exit_early) start_sync: memset(d, -1, sizeof(d)); - for (i = sync = avio_tell(pb); !url_feof(pb); i++) { + for (i = sync = avio_tell(pb); !avio_feof(pb); i++) { int j; for (j = 0; j < 7; j++) @@ -1506,7 +1506,7 @@ static int avi_read_idx1(AVFormatContext *s, int size) /* Read the entries and sort them in each stream component. */ for (i = 0; i < nb_index_entries; i++) { - if (url_feof(pb)) + if (avio_feof(pb)) return -1; tag = avio_rl32(pb); @@ -1662,7 +1662,7 @@ static int avi_load_index(AVFormatContext *s) for (;;) { tag = avio_rl32(pb); size = avio_rl32(pb); - if (url_feof(pb)) + if (avio_feof(pb)) break; next = avio_tell(pb) + size + (size & 1); |