[FFmpeg-cvslog] avutil/timecode: fix starting frame number for 59.94 fps

[Gyan Doshi]

ffmpeg | branch: master | Gyan Doshi <gyandoshi at gmail.com> | Thu Feb 22 18:22:42 2018 +0530| [b6652f5100af48141dadcc45b087cf75eadc145e] | committer: Michael Niedermayer

avutil/timecode: fix starting frame number for 59.94 fps

The existing code for adjusting starting frame number assumes 29.97 as
stream fps.

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

 libavutil/timecode.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavutil/timecode.c b/libavutil/timecode.c
index e9d8504ee7..60077ba0c0 100644
--- a/libavutil/timecode.c
+++ b/libavutil/timecode.c
@@ -214,7 +214,7 @@ int av_timecode_init_from_string(AVTimecode *tc, AVRational rate, const char *st
     tc->start = (hh*3600 + mm*60 + ss) * tc->fps + ff;
     if (tc->flags & AV_TIMECODE_FLAG_DROPFRAME) { /* adjust frame number */
         int tmins = 60*hh + mm;
-        tc->start -= 2 * (tmins - tmins/10);
+        tc->start -= (tc->fps == 30 ? 2 : 4) * (tmins - tmins/10);
     }
     return 0;
 }