From 3735396022ce688b586247f098bd0b24155227d1 Mon Sep 17 00:00:00 2001
From: Fabrice Bellard <fabrice@bellard.org>
Date: Mon, 15 Dec 2003 14:45:37 +0000
Subject: [PATCH] make av_read_frame() return buffered frames at EOF

Originally committed as revision 2616 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 libavformat/utils.c | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/libavformat/utils.c b/libavformat/utils.c
index 7100798266..d011cc1b77 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -658,7 +658,7 @@ static void av_destruct_packet_nofree(AVPacket *pkt)
 static int av_read_frame_internal(AVFormatContext *s, AVPacket *pkt)
 {
     AVStream *st;
-    int len, ret;
+    int len, ret, i;
 
     for(;;) {
         /* select current input stream component */
@@ -690,6 +690,7 @@ static int av_read_frame_internal(AVFormatContext *s, AVPacket *pkt)
                 
                 /* return packet if any */
                 if (pkt->size) {
+                got_packet:
                     pkt->duration = 0;
                     pkt->stream_index = st->index;
                     pkt->pts = st->cur_frame_pts;
@@ -707,8 +708,23 @@ static int av_read_frame_internal(AVFormatContext *s, AVPacket *pkt)
         } else {
             /* read next packet */
             ret = av_read_packet(s, &s->cur_pkt);
-            if (ret < 0)
+            if (ret < 0) {
+                if (ret == -EAGAIN)
+                    return ret;
+                /* return the last frames, if any */
+                for(i = 0; i < s->nb_streams; i++) {
+                    st = s->streams[i];
+                    if (st->parser) {
+                        av_parser_parse(st->parser, &st->codec, 
+                                        &pkt->data, &pkt->size, 
+                                        NULL, 0);
+                        if (pkt->size)
+                            goto got_packet;
+                    }
+                }
+                /* no more packets: really terminates parsing */
                 return ret;
+            }
 
             /* convert the packet time stamp units and handle wrapping */
             s->cur_pkt.pts = convert_timestamp_units(s, 
@@ -2052,8 +2068,12 @@ void av_pkt_dump(FILE *f, AVPacket *pkt, int dump_payload)
     fprintf(f, "stream #%d:\n", pkt->stream_index);
     fprintf(f, "  keyframe=%d\n", ((pkt->flags & PKT_FLAG_KEY) != 0));
     fprintf(f, "  duration=%0.3f\n", (double)pkt->duration / AV_TIME_BASE);
-    /* DTS is _always_ valid */
-    fprintf(f, "  dts=%0.3f\n", (double)pkt->dts / AV_TIME_BASE);
+    /* DTS is _always_ valid after av_read_frame() */
+    fprintf(f, "  dts=");
+    if (pkt->dts == AV_NOPTS_VALUE)
+        fprintf(f, "N/A");
+    else
+        fprintf(f, "%0.3f", (double)pkt->dts / AV_TIME_BASE);
     /* PTS may be not known if B frames are present */
     fprintf(f, "  pts=");
     if (pkt->pts == AV_NOPTS_VALUE)