RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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 <michael@niedermayer.cc>
This commit is contained in:
Gyan Doshi 2017-11-05 21:29:22 +05:30 committed by Michael Niedermayer
parent 1b323c3f9c
commit 84556ef059
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/filters.texi
View File

@ -7365,7 +7365,9 @@ format. It can be used with or without text parameter. @var{timecode_rate}
option must be specified. option must be specified.
@item timecode_rate, rate, r @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 @item tc24hmax
If set to 1, the output of the timecode option will wrap around at 24 hours. If set to 1, the output of the timecode option will wrap around at 24 hours.

2
libavutil/timecode.c
View File

@ -155,7 +155,7 @@ static int check_fps(int fps)
static int check_timecode(void *log_ctx, AVTimecode *tc) static int check_timecode(void *log_ctx, AVTimecode *tc)
{ {
if ((int)tc->fps <= 0) { 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); return AVERROR(EINVAL);
} }
if ((tc->flags & AV_TIMECODE_FLAG_DROPFRAME) && tc->fps != 30 && tc->fps != 60) { if ((tc->flags & AV_TIMECODE_FLAG_DROPFRAME) && tc->fps != 30 && tc->fps != 60) {