lavf/utils: add error check in av_read_frame()
authorStefano Sabatini <stefasab@gmail.com>
Sun, 23 Sep 2012 22:33:15 +0000 (00:33 +0200)
committerStefano Sabatini <stefasab@gmail.com>
Sun, 23 Sep 2012 22:41:13 +0000 (00:41 +0200)
In particular, fix crash when the input file contains no packets (e.g. an
ffmeta input).

libavformat/utils.c

index 6603483..4f3529a 100644 (file)
@@ -1409,11 +1409,18 @@ int av_read_frame(AVFormatContext *s, AVPacket *pkt)
     AVStream *st;
 
     if (!genpts) {
-        ret = s->packet_buffer ? read_from_packet_buffer(&s->packet_buffer,
-                                                          &s->packet_buffer_end,
-                                                          pkt) :
-                                  read_frame_internal(s, pkt);
-        goto return_packet;
+        while (1) {
+            ret = s->packet_buffer ?
+                read_from_packet_buffer(&s->packet_buffer, &s->packet_buffer_end, pkt) :
+                read_frame_internal(s, pkt);
+            if (ret < 0) {
+                if (ret == AVERROR(EAGAIN))
+                    continue;
+                else
+                    return ret;
+            }
+            goto return_packet;
+        }
     }
 
     for (;;) {