Merge remote-tracking branch 'origin/master' into 0.11
This commit is contained in:
commit
b50bee2617
@ -147,10 +147,10 @@ static GstStaticPadTemplate audiosink_templ =
|
||||
GST_STATIC_CAPS ("audio/mpeg, "
|
||||
"mpegversion = (int) 1, "
|
||||
"layer = (int) [ 1, 3 ], "
|
||||
"stream-format = (string) { raw }, "
|
||||
COMMON_AUDIO_CAPS "; "
|
||||
"audio/mpeg, "
|
||||
"mpegversion = (int) { 2, 4 }, "
|
||||
"stream-format = (string) raw, "
|
||||
COMMON_AUDIO_CAPS "; "
|
||||
"audio/x-ac3, "
|
||||
COMMON_AUDIO_CAPS "; "
|
||||
|
Loading…
x
Reference in New Issue
Block a user