[FFmpeg-cvslog] ffmpeg: Override r_frame_rate by corrected timebase only for interlaced streams

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Oct 16 01:04:42 2012 +0200| [ba31e59e83ca23b6d456ab3bc2d08bed3772d477] | committer: Michael Niedermayer

ffmpeg: Override r_frame_rate by corrected timebase only for interlaced streams

Fixes Ticket1664

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ba31e59e83ca23b6d456ab3bc2d08bed3772d477
---

 ffmpeg_filter.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ffmpeg_filter.c b/ffmpeg_filter.c
index 0a3b2cd..5f9c42c 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)