libvpxenc: Support forcing keyframes

[ffmpeg] / avconv_opt.c

diff --git a/avconv_opt.c b/avconv_opt.c
index 0eb601b460d4e887ab9ac022d44a9c0e96264e53..0ea2f45d7ec7d2dadb6d5acabe2db5dd2f2e9bf0 100644 (file)
--- a/avconv_opt.c
+++ b/avconv_opt.c
@@ -30,10 +30,10 @@
 #include "libavfilter/avfilter.h"
 #include "libavfilter/avfiltergraph.h"
 
-#include "libavutil/audioconvert.h"
 #include "libavutil/avassert.h"
 #include "libavutil/avstring.h"
 #include "libavutil/avutil.h"
+#include "libavutil/channel_layout.h"
 #include "libavutil/intreadwrite.h"
 #include "libavutil/fifo.h"
 #include "libavutil/mathematics.h"
@@ -276,6 +276,7 @@ static int opt_attach(void *optctx, const char *opt, const char *arg)
 
 /**
  * Parse a metadata specifier passed as 'arg' parameter.
+ * @param arg  metadata string to parse
  * @param type metadata type is written here -- g(lobal)/s(tream)/c(hapter)/p(rogram)
  * @param index for type c/p, chapter/program index is written here
  * @param stream_spec for type s, the stream specifier is written here
@@ -350,6 +351,8 @@ static int copy_metadata(char *outspec, char *inspec, AVFormatContext *oc, AVFor
             METADATA_CHECK_INDEX(index, context->nb_programs, "program")\
             meta = &context->programs[index]->metadata;\
             break;\
+        case 's':\
+            break; /* handled separately below */ \
         default: av_assert0(0);\
         }\