Mark Nauwelaerts f189f62b13 Merge branch 'master' into 0.11 ... Conflicts: ext/wavpack/gstwavpackenc.c tests/check/elements/audioiirfilter.c tests/examples/v4l2/probe.c		2012-03-01 11:29:50 +01:00
..
.gitignore
client-H263p-AMR.sh
client-H263p-PCMA.sdp
client-H263p-PCMA.sh
client-H263p.sdp
client-H263p.sh
client-H264-PCMA.sdp
client-H264-PCMA.sh
client-H264.sdp
client-H264.sh
client-PCMA.c
client-PCMA.py
client-PCMA.sdp
client-PCMA.sh
Makefile.am	build: ignore GValueArray deprecation warnings for the time being	2012-02-01 16:40:51 +00:00
server-alsasrc-PCMA.c	Merge branch 'master' into 0.11	2012-03-01 11:29:50 +01:00
server-alsasrc-PCMA.py
server-alsasrc-PCMA.sh
server-decodebin-H263p-AMR.sh
server-v4l2-H263p-alsasrc-AMR.sh
server-v4l2-H264-alsasrc-PCMA.sh
server-VTS-H263p-ATS-PCMA.sh
server-VTS-H263p.sh