Merge commit 'aa51b0492bfced6d650fb5ff419e2b13fde6833d'

[ffmpeg] / libavformat / smjpegdec.c

diff --git a/libavformat/smjpegdec.c b/libavformat/smjpegdec.c
index e4c7a9b890f1eaba4ee5c65dc93a8c745ad219aa..99ca2ff8c91071fa6b1870553976830c7a6f8ee3 100644 (file)
--- a/libavformat/smjpegdec.c
+++ b/libavformat/smjpegdec.c
@@ -58,7 +58,7 @@ static int smjpeg_read_header(AVFormatContext *s)
 
     duration = avio_rb32(pb); // in msec
 
-    while (!url_feof(pb)) {
+    while (!avio_feof(pb)) {
         htype = avio_rl32(pb);
         switch (htype) {
         case SMJPEG_TXT:
@@ -141,7 +141,7 @@ static int smjpeg_read_packet(AVFormatContext *s, AVPacket *pkt)
     int64_t pos;
     int ret;
 
-    if (url_feof(s->pb))
+    if (avio_feof(s->pb))
         return AVERROR_EOF;
     pos   = avio_tell(s->pb);
     dtype = avio_rl32(s->pb);