mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-09-19 21:06:42 +00:00
fftools/ffmpeg: move output file opts into private context
It is private to the muxer, no reason to access it from outside.
This commit is contained in:
parent
ec00b005f9
commit
52fee96ae9
@ -584,7 +584,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
|
||||
@ -688,7 +687,7 @@ int hw_device_setup_for_filter(FilterGraph *fg);
|
||||
|
||||
int hwaccel_decode_init(AVCodecContext *avctx);
|
||||
|
||||
int of_muxer_init(OutputFile *of, int64_t limit_filesize);
|
||||
int of_muxer_init(OutputFile *of, AVDictionary *opts, int64_t limit_filesize);
|
||||
/* open the muxer when all the streams are initialized */
|
||||
int of_check_init(OutputFile *of);
|
||||
int of_write_trailer(OutputFile *of);
|
||||
|
@ -46,6 +46,8 @@ typedef struct MuxStream {
|
||||
struct Muxer {
|
||||
MuxStream *streams;
|
||||
|
||||
AVDictionary *opts;
|
||||
|
||||
/* filesize limit expressed in bytes */
|
||||
int64_t limit_filesize;
|
||||
int64_t final_filesize;
|
||||
@ -281,7 +283,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 "
|
||||
@ -374,6 +376,7 @@ static void mux_free(Muxer **pmux, int nb_streams)
|
||||
av_fifo_freep2(&ms->muxing_queue);
|
||||
}
|
||||
av_freep(&mux->streams);
|
||||
av_dict_free(&mux->opts);
|
||||
|
||||
av_freep(pmux);
|
||||
}
|
||||
@ -393,12 +396,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, int64_t limit_filesize)
|
||||
int of_muxer_init(OutputFile *of, AVDictionary *opts, int64_t limit_filesize)
|
||||
{
|
||||
Muxer *mux = av_mallocz(sizeof(*mux));
|
||||
int ret = 0;
|
||||
@ -424,6 +426,7 @@ int of_muxer_init(OutputFile *of, int64_t limit_filesize)
|
||||
}
|
||||
|
||||
mux->limit_filesize = limit_filesize;
|
||||
mux->opts = opts;
|
||||
|
||||
if (strcmp(of->format->name, "rtp"))
|
||||
want_sdp = 0;
|
||||
|
@ -2391,7 +2391,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) {
|
||||
@ -2416,7 +2416,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:";
|
||||
@ -2438,7 +2438,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);
|
||||
}
|
||||
|
||||
@ -2819,7 +2819,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);
|
||||
}
|
||||
@ -2827,7 +2827,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);
|
||||
|
||||
@ -3021,7 +3021,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 internal muxing state\n");
|
||||
exit_program(1);
|
||||
|
Loading…
Reference in New Issue
Block a user