Commit 8ec19f84 authored by Stefano Sabatini's avatar Stefano Sabatini Committed by Anton Khirnov
Browse files

cmdutils: add codec_opts parameter to setup_find_stream_info_opts()



Avoid brittle and obfuscating reference to a global.
Signed-off-by: default avatarAnton Khirnov <anton@khirnov.net>
parent ce23ca81
...@@ -806,7 +806,7 @@ AVDictionary *filter_codec_opts(AVDictionary *opts, enum CodecID codec_id, int e ...@@ -806,7 +806,7 @@ AVDictionary *filter_codec_opts(AVDictionary *opts, enum CodecID codec_id, int e
return ret; return ret;
} }
AVDictionary **setup_find_stream_info_opts(AVFormatContext *s) AVDictionary **setup_find_stream_info_opts(AVFormatContext *s, AVDictionary *codec_opts)
{ {
int i; int i;
AVDictionary **opts; AVDictionary **opts;
......
...@@ -170,7 +170,7 @@ AVDictionary *filter_codec_opts(AVDictionary *opts, enum CodecID codec_id, int e ...@@ -170,7 +170,7 @@ AVDictionary *filter_codec_opts(AVDictionary *opts, enum CodecID codec_id, int e
* @return pointer to the created array of dictionaries, NULL if it * @return pointer to the created array of dictionaries, NULL if it
* cannot be created * cannot be created
*/ */
AVDictionary **setup_find_stream_info_opts(AVFormatContext *s); AVDictionary **setup_find_stream_info_opts(AVFormatContext *s, AVDictionary *codec_opts);
/** /**
* Print an error message to stderr, indicating filename and a human * Print an error message to stderr, indicating filename and a human
......
...@@ -3252,7 +3252,7 @@ static int opt_input_file(const char *opt, const char *filename) ...@@ -3252,7 +3252,7 @@ static int opt_input_file(const char *opt, const char *filename)
} }
/* Set AVCodecContext options for avformat_find_stream_info */ /* Set AVCodecContext options for avformat_find_stream_info */
opts = setup_find_stream_info_opts(ic); opts = setup_find_stream_info_opts(ic, codec_opts);
orig_nb_streams = ic->nb_streams; orig_nb_streams = ic->nb_streams;
/* If not enough info to get the stream parameters, we decode the /* If not enough info to get the stream parameters, we decode the
......
...@@ -2343,7 +2343,7 @@ static int decode_thread(void *arg) ...@@ -2343,7 +2343,7 @@ static int decode_thread(void *arg)
if(genpts) if(genpts)
ic->flags |= AVFMT_FLAG_GENPTS; ic->flags |= AVFMT_FLAG_GENPTS;
opts = setup_find_stream_info_opts(ic); opts = setup_find_stream_info_opts(ic, codec_opts);
orig_nb_streams = ic->nb_streams; orig_nb_streams = ic->nb_streams;
err = avformat_find_stream_info(ic, opts); err = avformat_find_stream_info(ic, opts);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment