mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-05 15:08:53 +00:00
Code Issues 1 Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into 0.11

Browse source
This commit is contained in:
Tim-Philipp Müller 2011-12-09 12:15:30 +00:00
commit b50bee2617
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gst/matroska/matroska-mux.c
View file

@ -147,10 +147,10 @@ static GstStaticPadTemplate audiosink_templ =
GST_STATIC_CAPS ("audio/mpeg, " GST_STATIC_CAPS ("audio/mpeg, "
"mpegversion = (int) 1, " "mpegversion = (int) 1, "
"layer = (int) [ 1, 3 ], " "layer = (int) [ 1, 3 ], "
"stream-format = (string) { raw }, "
COMMON_AUDIO_CAPS "; " COMMON_AUDIO_CAPS "; "
"audio/mpeg, " "audio/mpeg, "
"mpegversion = (int) { 2, 4 }, " "mpegversion = (int) { 2, 4 }, "
"stream-format = (string) raw, "
COMMON_AUDIO_CAPS "; " COMMON_AUDIO_CAPS "; "
"audio/x-ac3, " "audio/x-ac3, "
COMMON_AUDIO_CAPS "; " COMMON_AUDIO_CAPS "; "