summaryrefslogtreecommitdiff
path: root/avconv.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2012-01-10 09:13:32 +0100
committerAnton Khirnov <anton@khirnov.net>2012-01-10 16:47:15 +0100
commit7b9373db89096dea65a206bb4637db61348776f2 (patch)
tree821ed39a76bfeae894371538f4b042ba3146f181 /avconv.c
parent5c7c9a9f3354164c793baf7796c8ed432a184b0c (diff)
avconv: fix -copyinkf.
This option only applies to streamcopy, but is currently processed only when encoding.
Diffstat (limited to 'avconv.c')
-rw-r--r--avconv.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/avconv.c b/avconv.c
index 16f22f4039..d6860c64f3 100644
--- a/avconv.c
+++ b/avconv.c
@@ -3618,13 +3618,13 @@ static OutputStream *new_video_stream(OptionsContext *o, AVFormatContext *oc)
ost->top_field_first = -1;
MATCH_PER_STREAM_OPT(top_field_first, i, ost->top_field_first, oc, st);
- MATCH_PER_STREAM_OPT(copy_initial_nonkeyframes, i, ost->copy_initial_nonkeyframes, oc ,st);
-
#if CONFIG_AVFILTER
MATCH_PER_STREAM_OPT(filters, str, filters, oc, st);
if (filters)
ost->avfilter = av_strdup(filters);
#endif
+ } else {
+ MATCH_PER_STREAM_OPT(copy_initial_nonkeyframes, i, ost->copy_initial_nonkeyframes, oc ,st);
}
return ost;