Wim Taymans 87fbd1e784 Merge branch 'master' into 0.11 ...

Conflicts:
	common
	ext/pulse/pulsesink.c
	ext/soup/gstsouphttpclientsink.c
	gst/audioparsers/gstaacparse.c
	gst/audioparsers/gstac3parse.c
	gst/rtp/gstrtph264depay.c
	gst/rtpmanager/gstrtpjitterbuffer.c
	gst/rtpmanager/rtpjitterbuffer.c
	gst/rtsp/gstrtspsrc.c
	sys/ximage/gstximagesrc.c

2011-09-28 12:44:59 +02:00

..

gstsoup.c

soup: rename souphttpsink to souphttpclientsink

2011-09-25 15:13:39 +01:00

gstsouphttpclientsink.c

Merge branch 'master' into 0.11

2011-09-28 12:44:59 +02:00

gstsouphttpclientsink.h

soup: rename souphttpsink to souphttpclientsink

2011-09-25 15:13:39 +01:00

gstsouphttpsrc.c

Merge branch 'master' into 0.11

2011-09-28 12:44:59 +02:00

gstsouphttpsrc.h

souphttpsrc: Rename icy_caps to src_caps

2009-05-22 00:55:08 +03:00

Makefile.am

soup: rename souphttpsink to souphttpclientsink

2011-09-25 15:13:39 +01:00