Commit 59245e0c authored by Anton Khirnov's avatar Anton Khirnov

avconv: set the encoding/decoding_needed flags earlier

This will be useful in the following commits.
parent 56c2f377
...@@ -1774,10 +1774,6 @@ static int transcode_init(void) ...@@ -1774,10 +1774,6 @@ static int transcode_init(void)
goto dump_format; goto dump_format;
} }
if (ist)
ist->decoding_needed = 1;
ost->encoding_needed = 1;
set_encoder_id(output_files[ost->file_index], ost); set_encoder_id(output_files[ost->file_index], ost);
/* /*
......
...@@ -1621,6 +1621,17 @@ loop_end: ...@@ -1621,6 +1621,17 @@ loop_end:
} }
av_dict_free(&unused_opts); av_dict_free(&unused_opts);
/* set the encoding/decoding_needed flags */
for (i = of->ost_index; i < nb_output_streams; i++) {
OutputStream *ost = output_streams[i];
ost->encoding_needed = !ost->stream_copy;
if (ost->encoding_needed && ost->source_index >= 0) {
InputStream *ist = input_streams[ost->source_index];
ist->decoding_needed = 1;
}
}
/* check filename in case of an image number is expected */ /* check filename in case of an image number is expected */
if (oc->oformat->flags & AVFMT_NEEDNUMBER) { if (oc->oformat->flags & AVFMT_NEEDNUMBER) {
if (!av_filename_number_test(oc->filename)) { if (!av_filename_number_test(oc->filename)) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment