diff options
| author | Anton Khirnov <anton@khirnov.net> | 2024-04-01 07:36:01 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2024-04-09 10:34:18 +0200 |
| commit | 606c71bb117ab32eb91cfa5b8e14594023fb1175 (patch) | |
| tree | 089946306ca1366ae979f091aa96d00b3ff087cf | |
| parent | e903c31fd159a48bd6bbc8cb9cdd45fd67727650 (diff) | |
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.
| -rw-r--r-- | fftools/ffmpeg_enc.c | 3 | ||||
| -rw-r--r-- | fftools/ffmpeg_mux_init.c | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/fftools/ffmpeg_enc.c b/fftools/ffmpeg_enc.c index d1d1526830..618ba193ff 100644 --- a/fftools/ffmpeg_enc.c +++ b/fftools/ffmpeg_enc.c @@ -280,9 +280,6 @@ int enc_open(void *opaque, const AVFrame *frame) break; } 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; if (!enc_ctx->width) { diff --git a/fftools/ffmpeg_mux_init.c b/fftools/ffmpeg_mux_init.c index d79ae1f491..8b03d3b108 100644 --- a/fftools/ffmpeg_mux_init.c +++ b/fftools/ffmpeg_mux_init.c @@ -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); - 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; + if (!strcmp(enc_time_base, "demux")) { q = (AVRational){ ENC_TIME_BASE_DEMUX, 0 }; } else if (!strcmp(enc_time_base, "filter")) { |