gstreamer/gst/videorate
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
..
gstvideorate.c plugins: port some plugins to the new memory API 2011-03-27 16:35:28 +02:00
gstvideorate.h videorate: Fix behaviour for frame rate cap changes 2011-01-06 13:12:05 +01:00
Makefile.am android: make it ready for androgenizer 2011-04-11 07:23:21 +02:00
videorate.vcproj more working plugins 2004-07-27 21:41:30 +00:00