aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas George <nicolas.george@normalesup.org>2013-01-01 12:49:55 +0100
committerNicolas George <nicolas.george@normalesup.org>2013-01-01 19:43:20 +0100
commit951a03b3a8f2d9c87de03cb9d7d22d13beaf2826 (patch)
treed52e25d37625005fcede7ae7b37c4e3d1262e7e9
parent10a92775623517203584e6ce9901a34b4d351016 (diff)
downloadffmpeg-951a03b3a8f2d9c87de03cb9d7d22d13beaf2826.tar.gz
ffmpeg: move stream_copy flags handling after attachments.
-rw-r--r--ffmpeg_opt.c23
1 files changed, 11 insertions, 12 deletions
diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c
index 67000d9007..b146d3abb3 100644
--- a/ffmpeg_opt.c
+++ b/ffmpeg_opt.c
@@ -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);