libx265: Use the repeat headers flag when not using global headers

[ffmpeg] / cmdutils.c

diff --git a/cmdutils.c b/cmdutils.c
index d6eb981205b0650be4d9317e9b5b2a2e0d67e516..69a11bdd4fb33ccdc1420e15edb7c47c8ce84098 100644 (file)
--- a/cmdutils.c
+++ b/cmdutils.c
@@ -20,6 +20,7 @@
  */
 
 #include <string.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <errno.h>
 #include <math.h>
@@ -57,7 +58,7 @@
 struct SwsContext *sws_opts;
 AVDictionary *format_opts, *codec_opts, *resample_opts;
 
-static const int this_year = 2013;
+static const int this_year = 2014;
 
 void init_opts(void)
 {
@@ -1529,6 +1530,12 @@ int check_stream_specifier(AVFormatContext *s, AVStream *st, const char *spec)
                     return 1;
         }
         return 0;
+    } else if (*spec == 'i' && *(spec + 1) == ':') {
+        int stream_id;
+        char *endptr;
+        spec += 2;
+        stream_id = strtol(spec, &endptr, 0);
+        return stream_id == st->id;
     } else if (!*spec) /* empty specifier, matches everything */
         return 1;