OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
901f4bb
)
ffmpeg: Override r_frame_rate by corrected timebase only for interlaced streams
author
Michael Niedermayer
<michaelni@gmx.at>
Mon, 15 Oct 2012 23:04:42 +0000
(
01:04
+0200)
committer
Michael Niedermayer
<michaelni@gmx.at>
Mon, 15 Oct 2012 23:04:42 +0000
(
01:04
+0200)
Fixes Ticket1664
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
ffmpeg_filter.c
patch
|
blob
|
history
diff --git
a/ffmpeg_filter.c
b/ffmpeg_filter.c
index
0a3b2cd
..
5f9c42c
100644
(file)
--- 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)