[libav-commits] avconv: fix -copyinkf.

Anton Khirnov git at libav.org
Tue Jan 10 16:48:53 CET 2012


Module: libav
Branch: master
Commit: 7b9373db89096dea65a206bb4637db61348776f2

Author:    Anton Khirnov <anton at khirnov.net>
Committer: Anton Khirnov <anton at khirnov.net>
Date:      Tue Jan 10 09:13:32 2012 +0100

avconv: fix -copyinkf.

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

---

 avconv.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

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;



More information about the libav-commits mailing list