Tim-Philipp Müller 177525f89f Merge remote-tracking branch 'origin/master' into 0.11 ...

Conflicts:
	gst-libs/gst/netbuffer/gstnetbuffer.c
	gst/ffmpegcolorspace/avcodec.h
	gst/ffmpegcolorspace/gstffmpegcodecmap.c
	gst/ffmpegcolorspace/imgconvert.c
	gst/ffmpegcolorspace/imgconvert_template.h
	gst/ffmpegcolorspace/mem.c
	gst/playback/README
	gst/playback/gstplaybasebin.c
	gst/playback/gstplaybasebin.h
	gst/playback/gstplaybin.c
	sys/v4l/v4lmjpegsrc_calls.c
	sys/v4l/videodev_mjpeg.h
	tests/check/elements/gnomevfssink.c

2011-12-02 11:10:17 +00:00

..

audiorate.vcproj

more working plugins

2004-07-27 21:41:30 +00:00

gstaudiorate.c

Merge remote-tracking branch 'origin/master' into 0.11

2011-12-02 11:10:17 +00:00

gstaudiorate.h

audio: rework audio caps.

2011-08-18 19:15:03 +02:00

Makefile.am

audio: rework audio caps.

2011-08-18 19:15:03 +02:00