virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

fftools/ffmpeg_demux: move InputStream.guess_layout_max to stack

Browse Source 
It is only needed while processing the stream in add_input_streams(), no
reason to store it in the context.
This commit is contained in:
Anton Khirnov
2023-02-11 07:32:35 +01:00
parent 8a7554a574
commit d9079f6700
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
fftools/ffmpeg.h
View File

@@ -388,7 +388,6 @@ typedef struct InputStream {
AVDictionary *decoder_opts; AVDictionary *decoder_opts;
AVRational framerate; /* framerate forced with -r */ AVRational framerate; /* framerate forced with -r */
int top_field_first; int top_field_first;
int guess_layout_max;
int autorotate; int autorotate;

13
fftools/ffmpeg_demux.c
View File

@@ -552,14 +552,14 @@ static const AVCodec *choose_decoder(const OptionsContext *o, AVFormatContext *s
} }
} }
static int guess_input_channel_layout(InputStream *ist) static int guess_input_channel_layout(InputStream *ist, int guess_layout_max)
{ {
AVCodecContext *dec = ist->dec_ctx; AVCodecContext *dec = ist->dec_ctx;
if (dec->ch_layout.order == AV_CHANNEL_ORDER_UNSPEC) { if (dec->ch_layout.order == AV_CHANNEL_ORDER_UNSPEC) {
char layout_name[256]; char layout_name[256];
if (dec->ch_layout.nb_channels > ist->guess_layout_max) if (dec->ch_layout.nb_channels > guess_layout_max)
return 0; return 0;
av_channel_layout_default(&dec->ch_layout, dec->ch_layout.nb_channels); av_channel_layout_default(&dec->ch_layout, dec->ch_layout.nb_channels);
if (dec->ch_layout.order == AV_CHANNEL_ORDER_UNSPEC) if (dec->ch_layout.order == AV_CHANNEL_ORDER_UNSPEC)
@@ -800,11 +800,12 @@ static void add_input_streams(const OptionsContext *o, Demuxer *d)
ist->framerate_guessed = av_guess_frame_rate(ic, st, NULL); ist->framerate_guessed = av_guess_frame_rate(ic, st, NULL);
break; break;
case AVMEDIA_TYPE_AUDIO: case AVMEDIA_TYPE_AUDIO: {
ist->guess_layout_max = INT_MAX; int guess_layout_max = INT_MAX;
MATCH_PER_STREAM_OPT(guess_layout_max, i, ist->guess_layout_max, ic, st); MATCH_PER_STREAM_OPT(guess_layout_max, i, guess_layout_max, ic, st);
guess_input_channel_layout(ist); guess_input_channel_layout(ist, guess_layout_max);
break; break;
}
case AVMEDIA_TYPE_DATA: case AVMEDIA_TYPE_DATA:
case AVMEDIA_TYPE_SUBTITLE: { case AVMEDIA_TYPE_SUBTITLE: {
char *canvas_size = NULL; char *canvas_size = NULL;