aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas George <nicolas.george@normalesup.org>2012-05-23 14:31:30 +0200
committerNicolas George <nicolas.george@normalesup.org>2012-06-03 23:43:57 +0200
commit8b0e173529c821957868acf39e95d92853f3b8e0 (patch)
tree1668d5a55166ddea21269658f6ebce9317f9e4d1
parent48b5bcb3dd42bb0018850f41f7e090418e1b0dfb (diff)
downloadffmpeg-8b0e173529c821957868acf39e95d92853f3b8e0.tar.gz
ffmpeg: use filter time base as codec time base.
-rw-r--r--ffmpeg.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index b226779d63..85ae4f3b70 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -3085,6 +3085,8 @@ static int transcode_init(void)
break;
case AVMEDIA_TYPE_VIDEO:
codec->time_base = (AVRational){ost->frame_rate.den, ost->frame_rate.num};
+ if (ost->filter && !(codec->time_base.num && codec->time_base.den))
+ codec->time_base = ost->filter->filter->inputs[0]->time_base;
if ( av_q2d(codec->time_base) < 0.001 && video_sync_method != VSYNC_PASSTHROUGH
&& (video_sync_method == VSYNC_CFR || (video_sync_method == VSYNC_AUTO && !(oc->oformat->flags & AVFMT_VARIABLE_FPS)))){
av_log(oc, AV_LOG_WARNING, "Frame rate very high for a muxer not efficiently supporting it.\n"