diff options
| author | Wim Taymans <wim.taymans@collabora.co.uk> | 2012-02-10 16:46:50 +0100 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@collabora.co.uk> | 2012-02-10 16:46:50 +0100 |
| commit | 1119f6ee4103990ccc55d521be08bdce10737c8e (patch) | |
| tree | d2b9a31d43d6a1f832951a9c984127e27622211a /ext/faad | |
| parent | 9fcfa6046d0e8e8ec89c32d7091b747088265d70 (diff) | |
| parent | 1cbd755a2cd45531076c7b19ef194b77d5575cb0 (diff) | |
| download | gstreamer-plugins-bad-1119f6ee4103990ccc55d521be08bdce10737c8e.tar.gz | |
Merge branch 'master' into 0.11
Conflicts:
ext/chromaprint/gstchromaprint.c
ext/mpeg2enc/Makefile.am
ext/voaacenc/gstvoaacenc.c
gst/dvbsuboverlay/gstdvbsuboverlay.c
gst/mpegtsdemux/mpegtsbase.c
gst/sdp/gstsdpdemux.c
gst/videoparsers/gsth264parse.c
sys/d3dvideosink/d3dvideosink.c
tests/examples/camerabin/gst-camera-perf.c
tests/examples/camerabin/gst-camerabin-test.c
tests/examples/camerabin2/gst-camerabin2-test.c
tests/examples/mxf/mxfdemux-structure.c
tests/examples/scaletempo/demo-main.c
Diffstat (limited to 'ext/faad')
| -rw-r--r-- | ext/faad/gstfaad.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ext/faad/gstfaad.c b/ext/faad/gstfaad.c index 8fa344724..94ac0a781 100644 --- a/ext/faad/gstfaad.c +++ b/ext/faad/gstfaad.c @@ -91,7 +91,8 @@ GST_DEBUG_CATEGORY_STATIC (faad_debug); static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, GST_PAD_ALWAYS, - GST_STATIC_CAPS ("audio/mpeg, " "mpegversion = (int) { 2, 4 }") + GST_STATIC_CAPS ("audio/mpeg, " "mpegversion = (int) 2; " + "audio/mpeg, mpegversion = (int) 4, stream-format = (string) { raw, adts }") ); #define STATIC_RAW_CAPS(format) \ |