Browse Source

ffmpeg: move stream_copy flags handling after attachments.

tags/n1.1
Nicolas George 13 years ago
parent
commit
951a03b3a8
1 changed files with 11 additions and 12 deletions
  1. +11
    -12
      ffmpeg_opt.c

+ 11
- 12
ffmpeg_opt.c View File

@@ -1615,18 +1615,6 @@ loop_end:
}
}


for (i = nb_output_streams - oc->nb_streams; i < nb_output_streams; i++) { //for all streams of this output file
AVDictionaryEntry *e;
ost = output_streams[i];

if ( ost->stream_copy
&& (e = av_dict_get(o->g->codec_opts, "flags", NULL, AV_DICT_IGNORE_SUFFIX))
&& (!e->key[5] || check_stream_specifier(oc, ost->st, e->key+6)))
if (av_opt_set(ost->st->codec, "flags", e->value, 0) < 0)
exit(1);
}

/* handle attached files */
for (i = 0; i < o->nb_attachments; i++) {
AVIOContext *pb;
@@ -1663,6 +1651,17 @@ loop_end:
avio_close(pb);
}

for (i = nb_output_streams - oc->nb_streams; i < nb_output_streams; i++) { //for all streams of this output file
AVDictionaryEntry *e;
ost = output_streams[i];

if ( ost->stream_copy
&& (e = av_dict_get(o->g->codec_opts, "flags", NULL, AV_DICT_IGNORE_SUFFIX))
&& (!e->key[5] || check_stream_specifier(oc, ost->st, e->key+6)))
if (av_opt_set(ost->st->codec, "flags", e->value, 0) < 0)
exit(1);
}

GROW_ARRAY(output_files, nb_output_files);
if (!(output_files[nb_output_files - 1] = av_mallocz(sizeof(*output_files[0]))))
exit(1);


Loading…
Cancel
Save