---
fftools/cmdutils.c | 30 +++++++++++++++++++++---------
fftools/cmdutils.h | 8 +++-----
fftools/ffmpeg_demux.c | 6 +++++-
fftools/ffplay.c | 6 +++++-
fftools/ffprobe.c | 6 +++++-
5 files changed, 39 insertions(+), 17 deletions(-)
diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c
index 9ec00add30..e2fa08c116 100644
--- a/fftools/cmdutils.c
+++ b/fftools/cmdutils.c
@@ -645,8 +645,8 @@ static void add_opt(OptionParseContext *octx, const
OptionDef *opt,
g->opts[g->nb_opts - 1].val = val;
}
-static void init_parse_context(OptionParseContext *octx,
- const OptionGroupDef *groups, int nb_groups)
+static int init_parse_context(OptionParseContext *octx,
+ const OptionGroupDef *groups, int nb_groups)
{
static const OptionGroupDef global_group = { "global" };
int i;
@@ -656,13 +656,15 @@ static void init_parse_context(OptionParseContext *octx,
octx->nb_groups = nb_groups;
octx->groups = av_calloc(octx->nb_groups, sizeof(*octx->groups));
if (!octx->groups)
- report_and_exit(AVERROR(ENOMEM));
+ return AVERROR(ENOMEM);
for (i = 0; i < octx->nb_groups; i++)
octx->groups[i].group_def = &groups[i];
octx->global_opts.group_def = &global_group;
octx->global_opts.arg = "";
+
+ return 0;
}
void uninit_parse_context(OptionParseContext *octx)
@@ -694,13 +696,17 @@ int split_commandline(OptionParseContext *octx, int argc,
char *argv[],
const OptionDef *options,
const OptionGroupDef *groups, int nb_groups)
{
+ int ret;
int optindex = 1;
int dashdash = -2;
/* perform system-dependent conversions for arguments list */
prepare_app_arguments(&argc, &argv);
- init_parse_context(octx, groups, nb_groups);
+ ret = init_parse_context(octx, groups, nb_groups);
+ if (ret < 0)
+ return ret;
+
av_log(NULL, AV_LOG_DEBUG, "Splitting the commandline.\n");
while (optindex < argc) {
@@ -950,21 +956,27 @@ AVDictionary *filter_codec_opts(AVDictionary *opts, enum
AVCodecID codec_id,
return ret;
}
-AVDictionary **setup_find_stream_info_opts(AVFormatContext *s,
- AVDictionary *codec_opts)
+int setup_find_stream_info_opts(AVFormatContext *s,
+ AVDictionary *codec_opts,
+ AVDictionary ***dst)
{
int i;
AVDictionary **opts;
+ *dst = NULL;
+
if (!s->nb_streams)
- return NULL;
+ return 0;
+
opts = av_calloc(s->nb_streams, sizeof(*opts));
if (!opts)
- report_and_exit(AVERROR(ENOMEM));
+ return AVERROR(ENOMEM);
+
for (i = 0; i < s->nb_streams; i++)
opts[i] = filter_codec_opts(codec_opts,
s->streams[i]->codecpar->codec_id,
s, s->streams[i], NULL);
- return opts;
+ *dst = opts;
+ return 0;
}
void *grow_array(void *array, int elem_size, int *size, int new_size)
diff --git a/fftools/cmdutils.h b/fftools/cmdutils.h
index 0115940225..f54f3322ef 100644
--- a/fftools/cmdutils.h
+++ b/fftools/cmdutils.h
@@ -364,12 +364,10 @@ AVDictionary *filter_codec_opts(AVDictionary *opts, enum
AVCodecID codec_id,
* contained in s.
* Each dictionary will contain the options from codec_opts which can
* be applied to the corresponding stream codec context.
- *
- * @return pointer to the created array of dictionaries.
- * Calls exit() on failure.
*/
-AVDictionary **setup_find_stream_info_opts(AVFormatContext *s,
- AVDictionary *codec_opts);
+int setup_find_stream_info_opts(AVFormatContext *s,
+ AVDictionary *codec_opts,
+ AVDictionary ***dst);
/**
* Print an error message to stderr, indicating filename and a human
diff --git a/fftools/ffmpeg_demux.c b/fftools/ffmpeg_demux.c
index 9e7f13a2b4..a43c39b843 100644
--- a/fftools/ffmpeg_demux.c
+++ b/fftools/ffmpeg_demux.c
@@ -1482,9 +1482,13 @@ int ifile_open(const OptionsContext *o, const char
*filename)
choose_decoder(o, ic, ic->streams[i], HWACCEL_NONE,
AV_HWDEVICE_TYPE_NONE);
if (o->find_stream_info) {
- AVDictionary **opts = setup_find_stream_info_opts(ic,
o->g->codec_opts);
+ AVDictionary **opts;
int orig_nb_streams = ic->nb_streams;
+ ret = setup_find_stream_info_opts(ic, o->g->codec_opts, &opts);
+ if (ret < 0)
+ return ret;
+
/* If not enough info to get the stream parameters, we decode the
first frames to get it. (used in mpeg case for example) */
ret = avformat_find_stream_info(ic, opts);
diff --git a/fftools/ffplay.c b/fftools/ffplay.c
index 51cde0d208..99700dc6f2 100644
--- a/fftools/ffplay.c
+++ b/fftools/ffplay.c
@@ -2773,9 +2773,13 @@ static int read_thread(void *arg)
av_format_inject_global_side_data(ic);
if (find_stream_info) {
- AVDictionary **opts = setup_find_stream_info_opts(ic, codec_opts);
+ AVDictionary **opts;
int orig_nb_streams = ic->nb_streams;
+ err = setup_find_stream_info_opts(ic, codec_opts, &opts);
+ if (err < 0)
+ report_and_exit(err);
+
err = avformat_find_stream_info(ic, opts);
for (i = 0; i < orig_nb_streams; i++)
diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c
index 1ff76ce809..91a3be660b 100644
--- a/fftools/ffprobe.c
+++ b/fftools/ffprobe.c
@@ -3372,9 +3372,13 @@ static int open_input_file(InputFile *ifile, const char
*filename,
av_log(NULL, AV_LOG_WARNING, "Option %s skipped - not known to
demuxer.\n", t->key);
if (find_stream_info) {
- AVDictionary **opts = setup_find_stream_info_opts(fmt_ctx, codec_opts);
+ AVDictionary **opts;
int orig_nb_streams = fmt_ctx->nb_streams;
+ err = setup_find_stream_info_opts(fmt_ctx, codec_opts, &opts);
+ if (err < 0)
+ report_and_exit(err);
+
err = avformat_find_stream_info(fmt_ctx, opts);
for (i = 0; i < orig_nb_streams; i++)
--
2.40.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
