mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2025-02-18 04:47:12 +00:00
fftools/ffmpeg_opt: Apply copyinkf for all stream types
The earlier code has ignored it for all stream types except video and subtitles, probably because audio was presumed to only consist of keyframes. Yet this assumption is not true for e.g. TrueHD. Reviewed-by: Jan Ekström <jeebjp@gmail.com> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
parent
c72b5be9e3
commit
f497731260
@ -1611,6 +1611,9 @@ static OutputStream *new_output_stream(OptionsContext *o, AVFormatContext *oc, e
|
|||||||
if (!ost->muxing_queue)
|
if (!ost->muxing_queue)
|
||||||
exit_program(1);
|
exit_program(1);
|
||||||
|
|
||||||
|
MATCH_PER_STREAM_OPT(copy_initial_nonkeyframes, i,
|
||||||
|
ost->copy_initial_nonkeyframes, oc, st);
|
||||||
|
|
||||||
return ost;
|
return ost;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1917,8 +1920,6 @@ static OutputStream *new_video_stream(OptionsContext *o, AVFormatContext *oc, in
|
|||||||
ost->last_frame = av_frame_alloc();
|
ost->last_frame = av_frame_alloc();
|
||||||
if (!ost->last_frame)
|
if (!ost->last_frame)
|
||||||
exit_program(1);
|
exit_program(1);
|
||||||
} else {
|
|
||||||
MATCH_PER_STREAM_OPT(copy_initial_nonkeyframes, i, ost->copy_initial_nonkeyframes, oc ,st);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (ost->stream_copy)
|
if (ost->stream_copy)
|
||||||
@ -2046,8 +2047,6 @@ static OutputStream *new_subtitle_stream(OptionsContext *o, AVFormatContext *oc,
|
|||||||
|
|
||||||
subtitle_enc->codec_type = AVMEDIA_TYPE_SUBTITLE;
|
subtitle_enc->codec_type = AVMEDIA_TYPE_SUBTITLE;
|
||||||
|
|
||||||
MATCH_PER_STREAM_OPT(copy_initial_nonkeyframes, i, ost->copy_initial_nonkeyframes, oc, st);
|
|
||||||
|
|
||||||
if (!ost->stream_copy) {
|
if (!ost->stream_copy) {
|
||||||
char *frame_size = NULL;
|
char *frame_size = NULL;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user