diff options
| author | trav90 <travawine@protonmail.ch> | 2018-10-01 10:27:24 -0500 |
|---|---|---|
| committer | trav90 <travawine@protonmail.ch> | 2018-10-01 10:27:24 -0500 |
| commit | ebc8d7e3ca8723d815904e6fee6c088c659d6784 (patch) | |
| tree | 9e3115f44e9a09b9c71d40d72c7d5c939b2278e2 /media/ffvpx/libavutil/timecode.c | |
| parent | 8e8fcee4a55de171303ebe526d3cf051522111bf (diff) | |
| download | UXP-ebc8d7e3ca8723d815904e6fee6c088c659d6784.tar UXP-ebc8d7e3ca8723d815904e6fee6c088c659d6784.tar.gz UXP-ebc8d7e3ca8723d815904e6fee6c088c659d6784.tar.lz UXP-ebc8d7e3ca8723d815904e6fee6c088c659d6784.tar.xz UXP-ebc8d7e3ca8723d815904e6fee6c088c659d6784.zip | |
[ffvpx] Update ffvp9/ffvp8 to release 4.0.2
Diffstat (limited to 'media/ffvpx/libavutil/timecode.c')
| -rw-r--r-- | media/ffvpx/libavutil/timecode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/ffvpx/libavutil/timecode.c b/media/ffvpx/libavutil/timecode.c index c0c67c847..60077ba0c 100644 --- a/media/ffvpx/libavutil/timecode.c +++ b/media/ffvpx/libavutil/timecode.c @@ -155,7 +155,7 @@ static int check_fps(int fps) static int check_timecode(void *log_ctx, AVTimecode *tc) { if ((int)tc->fps <= 0) { - av_log(log_ctx, AV_LOG_ERROR, "Timecode frame rate must be specified\n"); + av_log(log_ctx, AV_LOG_ERROR, "Valid timecode frame rate must be specified. Minimum value is 1\n"); return AVERROR(EINVAL); } if ((tc->flags & AV_TIMECODE_FLAG_DROPFRAME) && tc->fps != 30 && tc->fps != 60) { @@ -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; } |