Wim Taymans 4bb2b140e9 Merge branch 'master' into 0.11 ... Conflicts: sys/v4l2/v4l2src_calls.c		2011-08-16 18:35:53 +02:00
..
atoms.c	isomp4: port to 0.11	2011-06-29 12:46:20 +02:00
atoms.h
atomsrecovery.c	isomp4: port to 0.11	2011-06-29 12:46:20 +02:00
atomsrecovery.h
descriptors.c
descriptors.h
fourcc.h
ftypcc.h
gstqtmoovrecover.c	isomp4: port to 0.11	2011-06-29 12:46:20 +02:00
gstqtmoovrecover.h
gstqtmux-doc.c
gstqtmux-doc.h
gstqtmux.c	isomp4: fixup after small api changes	2011-08-05 12:07:50 +02:00
gstqtmux.h	isomp4: port to 0.11	2011-06-29 12:46:20 +02:00
gstqtmuxmap.c	Merge branch 'master' into 0.11	2011-07-08 12:51:14 +02:00
gstqtmuxmap.h
gstrtpxqtdepay.c	isomp4: port to 0.11	2011-06-29 12:46:20 +02:00
gstrtpxqtdepay.h
isomp4-plugin.c
LEGAL
Makefile.am	isomp4: port to 0.11	2011-06-29 12:46:20 +02:00
properties.c
properties.h
qtatomparser.h
qtdemux.c	Merge branch 'master' into 0.11	2011-08-16 18:35:53 +02:00
qtdemux.h	isomp4: port to 0.11	2011-06-29 12:46:20 +02:00
qtdemux.vcproj
qtdemux_dump.c
qtdemux_dump.h
qtdemux_fourcc.h
qtdemux_lang.c
qtdemux_lang.h
qtdemux_types.c
qtdemux_types.h
qtpalette.h