mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-09-20 05:16:38 +00:00
fftools/ffmpeg_opt: drop redundant decoder selection
A decoder is already selected above, in choose_decoder().
This commit is contained in:
parent
a1da77bd71
commit
4f2b946c19
@ -1078,9 +1078,6 @@ static void add_input_streams(OptionsContext *o, AVFormatContext *ic)
|
|||||||
|
|
||||||
switch (par->codec_type) {
|
switch (par->codec_type) {
|
||||||
case AVMEDIA_TYPE_VIDEO:
|
case AVMEDIA_TYPE_VIDEO:
|
||||||
if(!ist->dec)
|
|
||||||
ist->dec = avcodec_find_decoder(par->codec_id);
|
|
||||||
|
|
||||||
// avformat_find_stream_info() doesn't set this for us anymore.
|
// avformat_find_stream_info() doesn't set this for us anymore.
|
||||||
ist->dec_ctx->framerate = st->avg_frame_rate;
|
ist->dec_ctx->framerate = st->avg_frame_rate;
|
||||||
|
|
||||||
@ -1104,8 +1101,6 @@ static void add_input_streams(OptionsContext *o, AVFormatContext *ic)
|
|||||||
case AVMEDIA_TYPE_DATA:
|
case AVMEDIA_TYPE_DATA:
|
||||||
case AVMEDIA_TYPE_SUBTITLE: {
|
case AVMEDIA_TYPE_SUBTITLE: {
|
||||||
char *canvas_size = NULL;
|
char *canvas_size = NULL;
|
||||||
if(!ist->dec)
|
|
||||||
ist->dec = avcodec_find_decoder(par->codec_id);
|
|
||||||
MATCH_PER_STREAM_OPT(fix_sub_duration, i, ist->fix_sub_duration, ic, st);
|
MATCH_PER_STREAM_OPT(fix_sub_duration, i, ist->fix_sub_duration, ic, st);
|
||||||
MATCH_PER_STREAM_OPT(canvas_sizes, str, canvas_size, ic, st);
|
MATCH_PER_STREAM_OPT(canvas_sizes, str, canvas_size, ic, st);
|
||||||
if (canvas_size &&
|
if (canvas_size &&
|
||||||
|
Loading…
Reference in New Issue
Block a user