From 32019cddb49c780f56d2e1f0775ae88986357dc1 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Tue, 28 Sep 2004 14:52:24 +0000 Subject: [PATCH] fix assert Originally committed as revision 3532 to svn://svn.ffmpeg.org/ffmpeg/trunk --- ffmpeg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ffmpeg.c b/ffmpeg.c index e7fc901e2b..3da92366f3 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -3311,6 +3311,7 @@ static void prepare_grab(void) has_audio = 0; memset(ap, 0, sizeof(*ap)); memset(vp, 0, sizeof(*vp)); + vp->frame_rate_base= 1; for(j=0;jnb_streams;i++) { @@ -3329,8 +3330,7 @@ static void prepare_grab(void) if (enc->height > vp->height) vp->height = enc->height; - assert(enc->frame_rate_base == DEFAULT_FRAME_RATE_BASE); - if (enc->frame_rate > vp->frame_rate){ + if (vp->frame_rate_base*(int64_t)enc->frame_rate > enc->frame_rate_base*(int64_t)vp->frame_rate){ vp->frame_rate = enc->frame_rate; vp->frame_rate_base = enc->frame_rate_base; }