[FFmpeg-cvslog] ffmpeg: copy tmcd track timebase parameters

Michael Niedermayer git at videolan.org
Mon Jan 28 02:18:29 CET 2013


ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Thu Jan 17 18:49:46 2013 +0100| [5c316acaa08e3f3aaf8dd7725dae245ce2e1f2d7] | committer: Michael Niedermayer

ffmpeg: copy tmcd track timebase parameters

Fixes part of Ticket2045

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit bee044d7c261a9e488ee14705814361694b9acdb)

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

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

 ffmpeg.c |    6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ffmpeg.c b/ffmpeg.c
index acaa523..75debe9 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);



More information about the ffmpeg-cvslog mailing list