[SCM] libav/experimental: Dont senselessly fail on rawvideo that isnt 3 files per frame.

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


The following commit has been merged in the experimental branch:
commit c51131290cae3d5f58427db7d7fbf97567722f98
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Mon Mar 22 20:18:42 2010 +0000

    Dont senselessly fail on rawvideo that isnt 3 files per frame.
    
    Originally committed as revision 22637 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/img2.c b/libavformat/img2.c
index 0610ae1..7831673 100644
--- a/libavformat/img2.c
+++ b/libavformat/img2.c
@@ -269,6 +269,8 @@ static int img_read_packet(AVFormatContext *s1, AVPacket *pkt)
             return AVERROR(EIO);
         for(i=0; i<3; i++){
             if (url_fopen(&f[i], filename, URL_RDONLY) < 0) {
+                if(i==1)
+                    break;
                 av_log(s1, AV_LOG_ERROR, "Could not open file : %s\n",filename);
                 return AVERROR(EIO);
             }

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list