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

..

gstjp2kdecimator.c

jp2kdecimator: Add a JPEG2000 decimator element

2010-11-30 12:39:46 +01:00

gstjp2kdecimator.h

jp2kdecimator: Add a JPEG2000 decimator element

2010-11-30 12:39:46 +01:00

jp2kcodestream.c

Merge branch 'master' into 0.11

2011-02-28 12:06:12 +01:00

jp2kcodestream.h

jp2kdecimator: Add a JPEG2000 decimator element

2010-11-30 12:39:46 +01:00

Makefile.am

android: make it ready for androgenizer

2011-04-11 07:27:11 +02:00