[SCM] libav/experimental: Do not set 0 FPS in VC-1 test stream format demuxer.

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:51:11 UTC 2013


The following commit has been merged in the experimental branch:
commit 9155be47d1e94f392ef8066f911c49e2a19358bc
Author: Kostya Shishkov <kostya.shishkov at gmail.com>
Date:   Tue Sep 15 16:36:53 2009 +0000

    Do not set 0 FPS in VC-1 test stream format demuxer.
    
    Originally committed as revision 19863 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/vc1test.c b/libavformat/vc1test.c
index e55772a..11a4a6f 100644
--- a/libavformat/vc1test.c
+++ b/libavformat/vc1test.c
@@ -73,6 +73,10 @@ static int vc1t_read_header(AVFormatContext *s,
     if(fps == 0xFFFFFFFF)
         av_set_pts_info(st, 32, 1, 1000);
     else{
+        if (!fps) {
+            av_log(s, AV_LOG_ERROR, "Zero FPS specified, defaulting to 1 FPS\n");
+            fps = 1;
+        }
         av_set_pts_info(st, 24, 1, fps);
         st->duration = frames;
     }

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list