It is private to the muxer, no reason to access it from outside.
---
fftools/ffmpeg.h | 3 +--
fftools/ffmpeg_mux.c | 9 ++++++---
fftools/ffmpeg_opt.c | 12 ++++++------
3 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h
index 76c8dfa4c8..6930671f5d 100644
--- a/fftools/ffmpeg.h
+++ b/fftools/ffmpeg.h
@@ -574,7 +574,6 @@ typedef struct OutputFile {
const AVOutputFormat *format;
AVFormatContext *ctx;
- AVDictionary *opts;
int ost_index; /* index of the first stream in output_streams */
int64_t recording_time; ///< desired length of the resulting file in
microseconds == AV_TIME_BASE units
int64_t start_time; ///< start time in microseconds == AV_TIME_BASE
units
@@ -678,7 +677,7 @@ int hw_device_setup_for_filter(FilterGraph *fg);
int hwaccel_decode_init(AVCodecContext *avctx);
-int of_muxer_init(OutputFile *of, uint64_t limit_filesize);
+int of_muxer_init(OutputFile *of, AVDictionary *opts, uint64_t limit_filesize);
/* open the muxer when all the streams are initialized */
int of_check_init(OutputFile *of);
int of_write_trailer(OutputFile *of);
diff --git a/fftools/ffmpeg_mux.c b/fftools/ffmpeg_mux.c
index c3666fbba1..f457ac5239 100644
--- a/fftools/ffmpeg_mux.c
+++ b/fftools/ffmpeg_mux.c
@@ -46,6 +46,8 @@ typedef struct MuxStream {
struct Muxer {
MuxStream *streams;
+ AVDictionary *opts;
+
/* filesize limit expressed in bytes */
uint64_t limit_filesize;
uint64_t final_filesize;
@@ -289,7 +291,7 @@ int of_check_init(OutputFile *of)
return 0;
}
- ret = avformat_write_header(of->ctx, &of->opts);
+ ret = avformat_write_header(of->ctx, &of->mux->opts);
if (ret < 0) {
av_log(NULL, AV_LOG_ERROR,
"Could not write header for output file #%d "
@@ -385,6 +387,7 @@ static void mux_free(Muxer **pmux, int nb_streams)
av_fifo_freep(&ms->muxing_queue);
}
av_freep(&mux->streams);
+ av_dict_free(&mux->opts);
av_freep(pmux);
}
@@ -404,12 +407,11 @@ void of_close(OutputFile **pof)
if (s && s->oformat && !(s->oformat->flags & AVFMT_NOFILE))
avio_closep(&s->pb);
avformat_free_context(s);
- av_dict_free(&of->opts);
av_freep(pof);
}
-int of_muxer_init(OutputFile *of, uint64_t limit_filesize)
+int of_muxer_init(OutputFile *of, AVDictionary *opts, uint64_t limit_filesize)
{
Muxer *mux = av_mallocz(sizeof(*mux));
int ret = 0;
@@ -435,6 +437,7 @@ int of_muxer_init(OutputFile *of, uint64_t limit_filesize)
}
mux->limit_filesize = limit_filesize;
+ mux->opts = opts;
if (strcmp(of->format->name, "rtp"))
want_sdp = 0;
diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c
index 2d16068c4f..e2e1bfd40c 100644
--- a/fftools/ffmpeg_opt.c
+++ b/fftools/ffmpeg_opt.c
@@ -2278,7 +2278,7 @@ static int open_output_file(OptionsContext *o, const char
*filename)
OutputFile *of;
OutputStream *ost;
InputStream *ist;
- AVDictionary *unused_opts = NULL;
+ AVDictionary *unused_opts = NULL, *format_opts = NULL;
const AVDictionaryEntry *e = NULL;
if (o->stop_time != INT64_MAX && o->recording_time != INT64_MAX) {
@@ -2303,7 +2303,7 @@ static int open_output_file(OptionsContext *o, const char
*filename)
of->recording_time = o->recording_time;
of->start_time = o->start_time;
of->shortest = o->shortest;
- av_dict_copy(&of->opts, o->g->format_opts, 0);
+ av_dict_copy(&format_opts, o->g->format_opts, 0);
if (!strcmp(filename, "-"))
filename = "pipe:";
@@ -2325,7 +2325,7 @@ static int open_output_file(OptionsContext *o, const char
*filename)
oc->flags |= AVFMT_FLAG_BITEXACT;
of->bitexact = 1;
} else {
- of->bitexact = check_opt_bitexact(oc, of->opts, "fflags",
+ of->bitexact = check_opt_bitexact(oc, format_opts, "fflags",
AVFMT_FLAG_BITEXACT);
}
@@ -2702,7 +2702,7 @@ loop_end:
/* open the file */
if ((err = avio_open2(&oc->pb, filename, AVIO_FLAG_WRITE,
&oc->interrupt_callback,
- &of->opts)) < 0) {
+ &format_opts)) < 0) {
print_error(filename, err);
exit_program(1);
}
@@ -2710,7 +2710,7 @@ loop_end:
assert_file_overwrite(filename);
if (o->mux_preload) {
- av_dict_set_int(&of->opts, "preload", o->mux_preload*AV_TIME_BASE, 0);
+ av_dict_set_int(&format_opts, "preload", o->mux_preload*AV_TIME_BASE,
0);
}
oc->max_delay = (int)(o->mux_max_delay * AV_TIME_BASE);
@@ -2904,7 +2904,7 @@ loop_end:
exit_program(1);
}
- err = of_muxer_init(of, o->limit_filesize);
+ err = of_muxer_init(of, format_opts, o->limit_filesize);
if (err < 0) {
av_log(NULL, AV_LOG_FATAL, "Error initializing the muxer\n");
exit_program(1);
--
2.33.0
_______________________________________________
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".
