Browse Source

avconv: set the encoding/decoding_needed flags earlier

This will be useful in the following commits.
tags/n2.8
Anton Khirnov 10 years ago
parent
commit
59245e0c5e
2 changed files with 11 additions and 4 deletions
  1. +0
    -4
      avconv.c
  2. +11
    -0
      avconv_opt.c

+ 0
- 4
avconv.c View File

@@ -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);


/* /*


+ 11
- 0
avconv_opt.c View File

@@ -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)) {


Loading…
Cancel
Save