diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-16 01:04:42 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-16 01:04:42 +0200 |
| commit | ba31e59e83ca23b6d456ab3bc2d08bed3772d477 (patch) | |
| tree | 03b2c4b3e8ded2a1c3488c38a7efa8e6cf9028ac /ffmpeg_filter.c | |
| parent | 901f4bb6fc703a8d18ed6c5ff1a33d6da93179f5 (diff) | |
| download | ffmpeg-ba31e59e83ca23b6d456ab3bc2d08bed3772d477.tar.gz | |
ffmpeg: Override r_frame_rate by corrected timebase only for interlaced streams
Fixes Ticket1664
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_filter.c')
| -rw-r--r-- | ffmpeg_filter.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ffmpeg_filter.c b/ffmpeg_filter.c index 0a3b2cd78b..5f9c42cd5b 100644 --- a/ffmpeg_filter.c +++ b/ffmpeg_filter.c @@ -558,7 +558,7 @@ static int configure_input_video_filter(FilterGraph *fg, InputFilter *ifilter, int pad_idx = in->pad_idx; int ret; - if (!ist->framerate.num) { + if (!ist->framerate.num && ist->st->codec->ticks_per_frame>1) { AVRational codec_fr = av_inv_q(ist->st->codec->time_base); codec_fr.den *= ist->st->codec->ticks_per_frame; if(codec_fr.num>0 && codec_fr.den>0 && av_q2d(codec_fr) < av_q2d(fr)*0.7) |