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

fftools/ffmpeg: store the output file index in OutputFile

Browse Source 
Use it to simplify check_init_output_file(). Will allow further
simplifications in the following commits.
This commit is contained in:
Anton Khirnov 2021-12-11 13:22:36 +01:00
parent 16aea9a38b
commit b1a984cb49
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fftools/ffmpeg.c
View File

@ -2947,7 +2947,7 @@ static int compare_int64(const void *a, const void *b)
} }
/* open the muxer when all the streams are initialized */ /* open the muxer when all the streams are initialized */
static int check_init_output_file(OutputFile *of, int file_index) static int check_init_output_file(OutputFile *of)
{ {
int ret, i; int ret, i;
@ -2962,13 +2962,13 @@ static int check_init_output_file(OutputFile *of, int file_index)
av_log(NULL, AV_LOG_ERROR, av_log(NULL, AV_LOG_ERROR,
"Could not write header for output file #%d " "Could not write header for output file #%d "
"(incorrect codec parameters ?): %s\n", "(incorrect codec parameters ?): %s\n",
file_index, av_err2str(ret)); of->index, av_err2str(ret));
return ret; return ret;
} }
//assert_avoptions(of->opts); //assert_avoptions(of->opts);
of->header_written = 1; of->header_written = 1;
av_dump_format(of->ctx, file_index, of->ctx->url, 1); av_dump_format(of->ctx, of->index, of->ctx->url, 1);
nb_output_dumped++; nb_output_dumped++;
if (sdp_filename || want_sdp) { if (sdp_filename || want_sdp) {
@ -3571,7 +3571,7 @@ static int init_output_stream(OutputStream *ost, AVFrame *frame,
ost->initialized = 1; ost->initialized = 1;
ret = check_init_output_file(output_files[ost->file_index], ost->file_index); ret = check_init_output_file(output_files[ost->file_index]);
if (ret < 0) if (ret < 0)
return ret; return ret;
@ -3674,7 +3674,7 @@ static int transcode_init(void)
for (i = 0; i < nb_output_files; i++) { for (i = 0; i < nb_output_files; i++) {
oc = output_files[i]->ctx; oc = output_files[i]->ctx;
if (oc->oformat->flags & AVFMT_NOSTREAMS && oc->nb_streams == 0) { if (oc->oformat->flags & AVFMT_NOSTREAMS && oc->nb_streams == 0) {
ret = check_init_output_file(output_files[i], i); ret = check_init_output_file(output_files[i]);
if (ret < 0) if (ret < 0)
goto dump_format; goto dump_format;
} }

2
fftools/ffmpeg.h
View File

@ -577,6 +577,8 @@ typedef struct OutputStream {
} OutputStream; } OutputStream;
typedef struct OutputFile { typedef struct OutputFile {
int index;
AVFormatContext *ctx; AVFormatContext *ctx;
AVDictionary *opts; AVDictionary *opts;
int ost_index; /* index of the first stream in output_streams */ int ost_index; /* index of the first stream in output_streams */

1
fftools/ffmpeg_opt.c
View File

@ -2314,6 +2314,7 @@ static int open_output_file(OptionsContext *o, const char *filename)
of = ALLOC_ARRAY_ELEM(output_files, nb_output_files); of = ALLOC_ARRAY_ELEM(output_files, nb_output_files);
of->index = nb_output_files - 1;
of->ost_index = nb_output_streams; of->ost_index = nb_output_streams;
of->recording_time = o->recording_time; of->recording_time = o->recording_time;
of->start_time = o->start_time; of->start_time = o->start_time;