Commit 1b8f4d77 authored by Michael Niedermayer's avatar Michael Niedermayer

ffmpeg: use framerate not fieldrate as filter input.

Fixes a problem described in Ticket1065
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent a63d7213
...@@ -558,6 +558,13 @@ static int configure_input_video_filter(FilterGraph *fg, InputFilter *ifilter, ...@@ -558,6 +558,13 @@ static int configure_input_video_filter(FilterGraph *fg, InputFilter *ifilter,
int pad_idx = in->pad_idx; int pad_idx = in->pad_idx;
int ret; int ret;
if (!ist->framerate.num) {
AVRational codec_fr = av_inv_q(ist->st->codec->time_base);
codec_fr.den *= ist->st->codec->ticks_per_frame;
if(av_q2d(codec_fr) < av_q2d(fr)*0.7)
fr = codec_fr;
}
if (ist->st->codec->codec_type == AVMEDIA_TYPE_SUBTITLE) { if (ist->st->codec->codec_type == AVMEDIA_TYPE_SUBTITLE) {
ret = sub2video_prepare(ist); ret = sub2video_prepare(ist);
if (ret < 0) if (ret < 0)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment