[SCM] libav/experimental: reenable test, data is available in this case

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:21:52 UTC 2013


The following commit has been merged in the experimental branch:
commit ba26712b5c37390d68d1419176394a6089141f1d
Author: Baptiste Coudurier <baptiste.coudurier at gmail.com>
Date:   Mon May 26 03:37:01 2008 +0000

    reenable test, data is available in this case
    
    Originally committed as revision 13412 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/ffm.c b/libavformat/ffm.c
index 5c9dd78..45ac817 100644
--- a/libavformat/ffm.c
+++ b/libavformat/ffm.c
@@ -296,11 +296,8 @@ static int ffm_is_avail_data(AVFormatContext *s, int size)
     int len;
 
     len = ffm->packet_end - ffm->packet_ptr;
-    if (!ffm_nopts) {
-        /* XXX: I don't understand this test, so I disabled it for testing */
-        if (size <= len)
-            return 1;
-    }
+    if (size <= len)
+        return 1;
     pos = url_ftell(s->pb);
     if (pos == ffm->write_index) {
         /* exactly at the end of stream */

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list