Wim Taymans 6e160bed3d Merge branch 'master' into 0.11 ...

Conflicts:
	android/alsa.mk
	android/app.mk
	android/app_plugin.mk
	android/audio.mk
	android/audioconvert.mk
	android/decodebin.mk
	android/decodebin2.mk
	android/gdp.mk
	android/interfaces.mk
	android/netbuffer.mk
	android/pbutils.mk
	android/playbin.mk
	android/queue2.mk
	android/riff.mk
	android/rtp.mk
	android/rtsp.mk
	android/sdp.mk
	android/tag.mk
	android/tcp.mk
	android/typefindfunctions.mk
	android/video.mk

2011-04-11 11:37:51 +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-04-11 11:37:51 +02:00

Makefile.am

configure.ac: added GST_LIB_LDFLAGS and GST_ALL_LDFLAGS

2005-11-27 16:18:50 +00:00