aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-01-17 18:49:46 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-01-28 02:04:36 +0100
commit5c316acaa08e3f3aaf8dd7725dae245ce2e1f2d7 (patch)
tree0fbd05a40d4746114f4293e7a5a932d773afb7cf
parentf4fb841ad13bab66d4fb0c7ff2a94770df7815d8 (diff)
downloadffmpeg-5c316acaa08e3f3aaf8dd7725dae245ce2e1f2d7.tar.gz
ffmpeg: copy tmcd track timebase parameters
Fixes part of Ticket2045 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit bee044d7c261a9e488ee14705814361694b9acdb) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--ffmpeg.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index acaa523170..75debe9022 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -2100,6 +2100,12 @@ static int transcode_init(void)
codec->time_base.num *= icodec->ticks_per_frame;
}
}
+ if ( codec->codec_tag == AV_RL32("tmcd")
+ && icodec->time_base.num < icodec->time_base.den
+ && icodec->time_base.num > 0
+ && 121LL*icodec->time_base.num > icodec->time_base.den) {
+ codec->time_base = icodec->time_base;
+ }
if(ost->frame_rate.num)
codec->time_base = av_inv_q(ost->frame_rate);