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

avconv: move the no streams failure to open_output_file()

Browse Source 
It is a better place for it, there is no reason to wait until
transcode_init().
This commit is contained in:
Anton Khirnov
2015-07-15 15:51:39 +02:00
parent ab7b038906
commit 1959351aec
2 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
avconv.c
View File

@ -1679,16 +1679,6 @@ static int transcode_init(void)
input_streams[j + ifile->ist_index]->start = av_gettime_relative(); input_streams[j + ifile->ist_index]->start = av_gettime_relative();
} }
/* output stream init */
for (i = 0; i < nb_output_files; i++) {
oc = output_files[i]->ctx;
if (!oc->nb_streams && !(oc->oformat->flags & AVFMT_NOSTREAMS)) {
av_dump_format(oc, i, oc->filename, 1);
av_log(NULL, AV_LOG_ERROR, "Output file #%d does not contain any stream\n", i);
return AVERROR(EINVAL);
}
}
/* init complex filtergraphs */ /* init complex filtergraphs */
for (i = 0; i < nb_filtergraphs; i++) for (i = 0; i < nb_filtergraphs; i++)
if ((ret = avfilter_graph_config(filtergraphs[i]->graph, NULL)) < 0) if ((ret = avfilter_graph_config(filtergraphs[i]->graph, NULL)) < 0)

6
avconv_opt.c
View File

@ -1622,6 +1622,12 @@ loop_end:
avio_close(pb); avio_close(pb);
} }
if (!oc->nb_streams && !(oc->oformat->flags & AVFMT_NOSTREAMS)) {
av_dump_format(oc, nb_output_files - 1, oc->filename, 1);
av_log(NULL, AV_LOG_ERROR, "Output file #%d does not contain any stream\n", nb_output_files - 1);
exit_program(1);
}
/* check if all codec options have been used */ /* check if all codec options have been used */
unused_opts = strip_specifiers(o->g->codec_opts); unused_opts = strip_specifiers(o->g->codec_opts);
for (i = of->ost_index; i < nb_output_streams; i++) { for (i = of->ost_index; i < nb_output_streams; i++) {