From 5829b7d29e34d60aff2319e8b5c296d36c344d23 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Mon, 10 Sep 2012 20:52:40 +0200 Subject: [PATCH] ffmpeg: check timebase validity before considering it to be used for stream copy Signed-off-by: Michael Niedermayer --- ffmpeg.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ffmpeg.c b/ffmpeg.c index 9935a1e6d9..18b7383efe 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -2055,7 +2055,8 @@ static int transcode_init(void) && strcmp(oc->oformat->name, "mov") && strcmp(oc->oformat->name, "mp4") && strcmp(oc->oformat->name, "3gp") && strcmp(oc->oformat->name, "3g2") && strcmp(oc->oformat->name, "psp") && strcmp(oc->oformat->name, "ipod") ) { - if( copy_tb<0 && av_q2d(icodec->time_base)*icodec->ticks_per_frame > av_q2d(ist->st->time_base) + if( copy_tb<0 && icodec->time_base.den + && av_q2d(icodec->time_base)*icodec->ticks_per_frame > av_q2d(ist->st->time_base) && av_q2d(ist->st->time_base) < 1.0/500 || copy_tb==0){ codec->time_base = icodec->time_base;