mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2025-12-08 06:09:50 +00:00
fftools/ffmpeg_enc: merge -force_key_frames source/source_no_drop
Always use the functionality of the latter, which makes more sense as it avoids losing keyframes due to vsync code dropping frames. Deprecate the 'source_no_drop' value, as it is now redundant.
This commit is contained in:
parent
735b082231
commit
d2c416fdf1
5 changed files with 20 additions and 21 deletions
|
|
@ -2513,8 +2513,12 @@ static int process_forced_keyframes(Muxer *mux, const OptionsContext *o)
|
|||
// parse it only for static kf timings
|
||||
} else if (!strcmp(forced_keyframes, "source")) {
|
||||
ost->kf.type = KF_FORCE_SOURCE;
|
||||
#if FFMPEG_OPT_FORCE_KF_SOURCE_NO_DROP
|
||||
} else if (!strcmp(forced_keyframes, "source_no_drop")) {
|
||||
ost->kf.type = KF_FORCE_SOURCE_NO_DROP;
|
||||
av_log(ost, AV_LOG_WARNING, "The 'source_no_drop' value for "
|
||||
"-force_key_frames is deprecated, use just 'source'\n");
|
||||
ost->kf.type = KF_FORCE_SOURCE;
|
||||
#endif
|
||||
} else {
|
||||
int ret = parse_forced_key_frames(ost, &ost->kf, mux, forced_keyframes);
|
||||
if (ret < 0)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue