From: Anton Khirnov <anton@khirnov.net>
Date: Tue, 10 Jan 2012 08:13:32 +0000 (+0100)
Subject: avconv: fix -copyinkf.
X-Git-Tag: v0.8b2~16
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7b9373db89096dea65a206bb4637db61348776f2;p=platform%2Fupstream%2Flibav.git

avconv: fix -copyinkf.

This option only applies to streamcopy, but is currently processed only
when encoding.
---

diff --git a/avconv.c b/avconv.c
index 16f22f4..d6860c6 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;