Wim Taymans 33f18b8ea4 Merge branch 'master' into 0.11 ...

Conflicts:
	gst/audioparsers/gstamrparse.c
	gst/isomp4/qtdemux.c

2011-09-06 16:06:25 +02:00

..

atoms.c

fourcc: remove fourcc from caps

2011-08-22 12:24:15 +02:00

atoms.h

fourcc: remove fourcc from caps

2011-08-22 12:24:15 +02:00

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

-good: port to new audio caps

2011-09-06 13:16:27 +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_dump.c

…

qtdemux_dump.h

…

qtdemux_fourcc.h

…

qtdemux_lang.c

…

qtdemux_lang.h

…

qtdemux_types.c

…

qtdemux_types.h

…

qtdemux.c

Merge branch 'master' into 0.11

2011-09-06 16:06:25 +02:00

qtdemux.h

Merge branch 'master' into 0.11

2011-09-06 16:06:25 +02:00

qtdemux.vcproj

…

qtpalette.h

…