[SCM] libav/experimental: Fix ffplay to keep calling av_read_frame even if EOF has been reached.

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 17:17:23 UTC 2013


The following commit has been merged in the experimental branch:
commit 27d97fded3319e0ac94e0abcb65a5b96b18e7512
Author: Michael Chinen <mchinen at gmail.com>
Date:   Sat Oct 9 17:50:17 2010 +0000

    Fix ffplay to keep calling av_read_frame even if EOF has been reached.
    
    Patch by Michael Chinen, mchinen gmail
    
    Originally committed as revision 25426 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/ffplay.c b/ffplay.c
index df15f48..9927006 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -2605,7 +2605,7 @@ static int decode_thread(void *arg)
             SDL_Delay(10);
             continue;
         }
-        if(url_feof(ic->pb) || eof) {
+        if(eof) {
             if(is->video_stream >= 0){
                 av_init_packet(pkt);
                 pkt->data=NULL;
@@ -2626,7 +2626,7 @@ static int decode_thread(void *arg)
         }
         ret = av_read_frame(ic, pkt);
         if (ret < 0) {
-            if (ret == AVERROR_EOF)
+            if (ret == AVERROR_EOF || url_feof(ic->pb))
                 eof=1;
             if (url_ferror(ic->pb))
                 break;

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list