Commit graph

5 commits

Author SHA1 Message Date
Wim Taymans
a2b7a672b8 Merge branch 'master' into 0.11
Conflicts:
	android/aacparse.mk
	android/amrparse.mk
	android/h264parse.mk
	android/metadata.mk
	android/qtmux.mk
	android/sdpelem.mk
	configure.ac
	gst/qtmux/gstqtmux.c
	win32/common/config.h
2011-06-15 16:06:36 +02:00
Thibault Saunier
17fd7ebcb4 android: make it ready for androgenizer
Remove the android/ top dir
Fixe the Makefile.am to be androgenized

To build gstreamer for android we are now using androgenizer which generates the needed Android.mk files.
Androgenizer can be found here: http://git.collabora.co.uk/?p=user/derek/androgenizer.git
2011-04-11 07:27:11 +02:00
Wim Taymans
2eb38991c6 Merge branch 'master' into 0.11
Conflicts:
	configure.ac
	win32/common/config.h
2011-02-28 12:06:12 +01:00
Edward Hervey
0a55306c40 jp2kdecimator: Fix unitialized variables on macosx 2011-01-06 12:50:14 +01:00
Sebastian Dröge
5df40a727c jp2kdecimator: Add a JPEG2000 decimator element
This element drops information from JPEG2000 images without reencoding.
2010-11-30 12:39:46 +01:00