From 68f8db610871b810ba3ae946538d43a9e7cedf1e Mon Sep 17 00:00:00 2001
From: Vittorio Giovara <vittorio.giovara@gmail.com>
Date: Thu, 1 Dec 2016 12:38:18 -0500
Subject: [PATCH 1/3] avprobe: Allow specifying multiple stream entries to be
 shown

---
 avprobe.c | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/avprobe.c b/avprobe.c
index 8142ce2966..f0c942ad63 100644
--- a/avprobe.c
+++ b/avprobe.c
@@ -1033,6 +1033,8 @@ static int opt_show_format_entry(void *optctx, const char *opt, const char *arg)
 
 static int opt_show_stream_entry(void *optctx, const char *opt, const char *arg)
 {
+    const char *p = arg;
+
     do_show_streams = 1;
     nb_stream_entries_to_show++;
     octx.print_header        = NULL;
@@ -1044,7 +1046,19 @@ static int opt_show_stream_entry(void *optctx, const char *opt, const char *arg)
 
     octx.print_integer = show_stream_entry_integer;
     octx.print_string  = show_stream_entry_string;
-    av_dict_set(&stream_entries_to_show, arg, "", 0);
+
+    while (*p) {
+        char *val = av_get_token(&p, ",");
+        if (!val)
+            return AVERROR(ENOMEM);
+
+        av_dict_set(&stream_entries_to_show, val, "", 0);
+
+        av_free(val);
+        if (*p)
+            p++;
+    }
+
     return 0;
 }
 
@@ -1099,7 +1113,7 @@ static const OptionDef real_options[] = {
     { "show_packets", OPT_BOOL, {&do_show_packets}, "show packets info" },
     { "show_streams", OPT_BOOL, {&do_show_streams}, "show streams info" },
     { "show_stream_entry", HAS_ARG, {.func_arg = opt_show_stream_entry},
-      "show a particular entry from all streams", "entry" },
+      "show a particular entry from all streams (comma separated)", "entry" },
     { "default", HAS_ARG | OPT_AUDIO | OPT_VIDEO | OPT_EXPERT, {.func_arg = opt_default},
       "generic catch all option", "" },
     { NULL, },

From cf1cae58b015427918ecfa507a045aae4cf398fd Mon Sep 17 00:00:00 2001
From: Vittorio Giovara <vittorio.giovara@gmail.com>
Date: Wed, 30 Nov 2016 17:53:38 -0500
Subject: [PATCH 2/3] fate: Add spherical and stereo3d mov tests

---
 tests/fate/mov.mak           | 6 ++++++
 tests/ref/fate/mov-spherical | 4 ++++
 tests/ref/fate/mov-stereo3d  | 1 +
 3 files changed, 11 insertions(+)
 create mode 100644 tests/ref/fate/mov-spherical
 create mode 100644 tests/ref/fate/mov-stereo3d

diff --git a/tests/fate/mov.mak b/tests/fate/mov.mak
index 909e4389d4..57cbb1cac0 100644
--- a/tests/fate/mov.mak
+++ b/tests/fate/mov.mak
@@ -10,6 +10,12 @@ fate-mov-rotation: CMD = probestream rotation $(TARGET_SAMPLES)/mov/displaymatri
 FATE_MOV += fate-mov-sar
 fate-mov-sar: CMD = probestream sample_aspect_ratio $(TARGET_SAMPLES)/mov/displaymatrix.mov
 
+FATE_MOV += fate-mov-spherical
+fate-mov-spherical: CMD = probestream projection,yaw,pitch,roll $(TARGET_SAMPLES)/mov/spherical.mov
+
+FATE_MOV += fate-mov-stereo3d
+fate-mov-stereo3d: CMD = probestream type $(TARGET_SAMPLES)/mov/spherical.mov
+
 $(FATE_MOV): avprobe$(EXESUF)
 FATE_SAMPLES-$(call ALLYES, AVPROBE MOV_DEMUXER) += $(FATE_MOV)
 fate-mov: $(FATE_MOV)
diff --git a/tests/ref/fate/mov-spherical b/tests/ref/fate/mov-spherical
new file mode 100644
index 0000000000..760ae880e8
--- /dev/null
+++ b/tests/ref/fate/mov-spherical
@@ -0,0 +1,4 @@
+equirectangular
+45
+30
+15
diff --git a/tests/ref/fate/mov-stereo3d b/tests/ref/fate/mov-stereo3d
new file mode 100644
index 0000000000..fe909bb197
--- /dev/null
+++ b/tests/ref/fate/mov-stereo3d
@@ -0,0 +1 @@
+2D

From f912fd767e55bbb5a1554bd99bacab007659609c Mon Sep 17 00:00:00 2001
From: Diego Biurrun <diego@biurrun.de>
Date: Thu, 8 Dec 2016 19:47:58 +0100
Subject: [PATCH 3/3] Add missing #includes for standalone
 spherical-information-related headers

---
 libavformat/isom.h    | 3 +++
 libavutil/spherical.h | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/libavformat/isom.h b/libavformat/isom.h
index fa73ad91bb..85b876106f 100644
--- a/libavformat/isom.h
+++ b/libavformat/isom.h
@@ -24,6 +24,9 @@
 #ifndef AVFORMAT_ISOM_H
 #define AVFORMAT_ISOM_H
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include "libavutil/spherical.h"
 #include "libavutil/stereo3d.h"
 
diff --git a/libavutil/spherical.h b/libavutil/spherical.h
index 8ecaefd946..0045eb974a 100644
--- a/libavutil/spherical.h
+++ b/libavutil/spherical.h
@@ -26,6 +26,9 @@
 #ifndef AVUTIL_SPHERICAL_H
 #define AVUTIL_SPHERICAL_H
 
+#include <stddef.h>
+#include <stdint.h>
+
 /**
  * @addtogroup lavu_video
  * @{