gstreamer/gst-libs
Wim Taymans 33467d9629 Merge branch 'master' into 0.11
Conflicts:
	configure.ac
	ext/pango/gsttextoverlay.c
	ext/theora/gsttheoradec.c
	gst/adder/gstadder.c
	gst/adder/gstadder.h
	gst/audioresample/gstaudioresample.c
	gst/encoding/gstencodebin.c
	gst/playback/gstdecodebin.c
	gst/playback/gstdecodebin2.c
	tests/check/elements/decodebin2.c
	tests/check/elements/playbin-compressed.c
	win32/common/libgsttag.def
2011-08-16 18:01:14 +02:00
..
ext move ffmpeg stuff to gst-ffmpeg module 2004-02-13 15:11:50 +00:00
gst Merge branch 'master' into 0.11 2011-08-16 18:01:14 +02:00
Makefile.am configure.ac: added GST_LIB_LDFLAGS and GST_ALL_LDFLAGS 2005-11-27 16:18:50 +00:00