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

fftools/ffmpeg: warn about ignored -enc_time_base for subtitles earlier 

Can do it as soon as that option is parsed, no need to postpone it until
opening the encoder.
This commit is contained in:
Anton Khirnov 2024-04-01 07:36:01 +02:00
parent e903c31fd1
commit 606c71bb11
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fftools/ffmpeg_enc.c
View File

@ -280,9 +280,6 @@ int enc_open(void *opaque, const AVFrame *frame)
break; break;
} }
case AVMEDIA_TYPE_SUBTITLE: case AVMEDIA_TYPE_SUBTITLE:
if (ost->enc_timebase.num)
av_log(ost, AV_LOG_WARNING,
"-enc_time_base not supported for subtitles, ignoring\n");
enc_ctx->time_base = AV_TIME_BASE_Q; enc_ctx->time_base = AV_TIME_BASE_Q;
if (!enc_ctx->width) { if (!enc_ctx->width) {

6
fftools/ffmpeg_mux_init.c
View File

@ -1233,8 +1233,12 @@ static int ost_add(Muxer *mux, const OptionsContext *o, enum AVMediaType type,
} }
MATCH_PER_STREAM_OPT(enc_time_bases, str, enc_time_base, oc, st); MATCH_PER_STREAM_OPT(enc_time_bases, str, enc_time_base, oc, st);
if (enc_time_base) { if (enc_time_base && type == AVMEDIA_TYPE_SUBTITLE)
av_log(ost, AV_LOG_WARNING,
"-enc_time_base not supported for subtitles, ignoring\n");
else if (enc_time_base) {
AVRational q; AVRational q;
if (!strcmp(enc_time_base, "demux")) { if (!strcmp(enc_time_base, "demux")) {
q = (AVRational){ ENC_TIME_BASE_DEMUX, 0 }; q = (AVRational){ ENC_TIME_BASE_DEMUX, 0 };
} else if (!strcmp(enc_time_base, "filter")) { } else if (!strcmp(enc_time_base, "filter")) {