aboutsummaryrefslogtreecommitdiffstats
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2004-09-28 14:52:24 +0000
committerMichael Niedermayer <michaelni@gmx.at>2004-09-28 14:52:24 +0000
commit32019cddb49c780f56d2e1f0775ae88986357dc1 (patch)
treec9375eecb4730180d29b172dba486a066d387de5 /ffmpeg.c
parent30667f42f5c57914a3c0735b56e173b5a0865958 (diff)
downloadffmpeg-32019cddb49c780f56d2e1f0775ae88986357dc1.tar.gz
fix assert
Originally committed as revision 3532 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'ffmpeg.c')
-rw-r--r--ffmpeg.c4
1 files 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;j<nb_output_files;j++) {
oc = output_files[j];
for(i=0;i<oc->nb_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;
}