ffmpeg | branch: master | Gyan Doshi <gyando...@gmail.com> | Sun Nov 5 21:47:22 2017 +0530| [84556ef05963138cbc39fa1a39b790dffe15ffe8] | committer: Michael Niedermayer
lavu/timecode: clarify error msg for timecode_rate The user-supplied value for timecode_rate in drawtext is rounded to nearest integer. So, a supplied value of 0.49 or lower is rounded to 0. This throws a misleading error message which says "Timecode frame rate must be specified". Changed message to account for values under one. Also noted supported framerates for drop TC. Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=84556ef05963138cbc39fa1a39b790dffe15ffe8 --- doc/filters.texi | 4 +++- libavutil/timecode.c | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index 2ba6e04166..5c6729a484 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -7365,7 +7365,9 @@ format. It can be used with or without text parameter. @var{timecode_rate} option must be specified. @item timecode_rate, rate, r -Set the timecode frame rate (timecode only). +Set the timecode frame rate (timecode only). Value will be rounded to nearest +integer. Minimum value is "1". +Drop-frame timecode is supported for frame rates 30 & 60. @item tc24hmax If set to 1, the output of the timecode option will wrap around at 24 hours. diff --git a/libavutil/timecode.c b/libavutil/timecode.c index c0c67c8478..e9d8504ee7 100644 --- a/libavutil/timecode.c +++ b/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) { _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
