[SCM] libav/experimental: return EOF in image2 demuxer

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:49:32 UTC 2013


The following commit has been merged in the experimental branch:
commit e4b8d05d476f34d1b5daba87db190cc06cea5805
Author: Baptiste Coudurier <baptiste.coudurier at gmail.com>
Date:   Thu Jul 30 08:21:11 2009 +0000

    return EOF in image2 demuxer
    
    Originally committed as revision 19538 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/img2.c b/libavformat/img2.c
index ec32f86..a90381d 100644
--- a/libavformat/img2.c
+++ b/libavformat/img2.c
@@ -260,6 +260,8 @@ static int img_read_packet(AVFormatContext *s1, AVPacket *pkt)
         if (s1->loop_input && s->img_number > s->img_last) {
             s->img_number = s->img_first;
         }
+        if (s->img_number > s->img_last)
+            return AVERROR_EOF;
         if (av_get_frame_filename(filename, sizeof(filename),
                                   s->path, s->img_number)<0 && s->img_number > 1)
             return AVERROR(EIO);

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list