gstreamer/tests/icles
Wim Taymans 7555d0949f Merge branch 'master' into 0.11
Conflicts:
	android/apetag.mk
	android/avi.mk
	android/flv.mk
	android/icydemux.mk
	android/id3demux.mk
	android/qtdemux.mk
	android/rtp.mk
	android/rtpmanager.mk
	android/rtsp.mk
	android/soup.mk
	android/udp.mk
	android/wavenc.mk
	android/wavparse.mk
	configure.ac
2011-04-18 10:23:45 +02:00
..
.gitignore
equalizer-test.c
gdkpixbufsink-test.c
Makefile.am
test-oss4.c
v4l2src-test.c
videobox-test.c
videocrop-test.c
videocrop2-test.c
ximagesrc-test.c