From c6f6092f2fdf6b3832cd3bdef16e28083c5a910f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Tue, 3 Nov 2015 12:42:52 +0200 Subject: [PATCH] matroska/webmmux: Support Opus in webmmux and VP9 in matroskamux https://bugzilla.gnome.org/show_bug.cgi?id=729950 --- gst/matroska/matroska-mux.c | 2 ++ gst/matroska/webm-mux.c | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/gst/matroska/matroska-mux.c b/gst/matroska/matroska-mux.c index b66924220e..ed8019bcda 100644 --- a/gst/matroska/matroska-mux.c +++ b/gst/matroska/matroska-mux.c @@ -125,6 +125,8 @@ static GstStaticPadTemplate videosink_templ = COMMON_VIDEO_CAPS "; " "video/x-vp8, " COMMON_VIDEO_CAPS "; " + "video/x-vp9, " + COMMON_VIDEO_CAPS "; " "video/x-raw, " "format = (string) { YUY2, I420, YV12, UYVY, AYUV, GRAY8, BGR, RGB }, " COMMON_VIDEO_CAPS "; " diff --git a/gst/matroska/webm-mux.c b/gst/matroska/webm-mux.c index 0ba330fd41..aaf9d1961e 100644 --- a/gst/matroska/webm-mux.c +++ b/gst/matroska/webm-mux.c @@ -70,10 +70,11 @@ static GstStaticPadTemplate webm_videosink_templ = ); static GstStaticPadTemplate webm_audiosink_templ = -GST_STATIC_PAD_TEMPLATE ("audio_%u", + GST_STATIC_PAD_TEMPLATE ("audio_%u", GST_PAD_SINK, GST_PAD_REQUEST, - GST_STATIC_CAPS ("audio/x-vorbis, " COMMON_AUDIO_CAPS) + GST_STATIC_CAPS ("audio/x-vorbis, " COMMON_AUDIO_CAPS ";" + "audio/x-opus, " COMMON_AUDIO_CAPS) ); static void