53 commits

Author	SHA1	Message	Date
Wim Taymans	3d0ac3ded2	rename files to match contained objects	2011-11-11 11:33:15 +01:00
Wim Taymans	ad8f694ec6	remove bogus files ... They got somehow commited in 7012e88090	2011-11-11 10:39:52 +01:00
Wim Taymans	7012e88090	Merge branch 'master' into 0.11 ... Conflicts: gst-libs/gst/audio/audio.h gst-libs/gst/audio/gstaudiodecoder.c gst-libs/gst/audio/gstaudiodecoder.h gst-libs/gst/audio/gstaudioencoder.c gst-libs/gst/audio/gstbaseaudioencoder.h gst/playback/Makefile.am gst/playback/gstplaybin.c gst/playback/gstplaysink.c gst/playback/gstplaysinkvideoconvert.c gst/playback/gstsubtitleoverlay.c gst/videorate/gstvideorate.c gst/videoscale/gstvideoscale.c win32/common/libgstaudio.def	2011-09-06 15:24:32 +02:00