Commit graph

6 commits

Author SHA1 Message Date
Tim-Philipp Müller be0d6baac5 Merge remote-tracking branch 'origin/master' into 0.11
Conflicts:
	ext/pulse/pulseaudiosink.c
	ext/pulse/pulsesrc.c
	gst/audioparsers/gstaacparse.c
	gst/audioparsers/gstamrparse.c
	gst/audioparsers/gstdcaparse.c
	gst/audioparsers/gstflacparse.c
	gst/effectv/gstradioac.c
	gst/effectv/gstradioac.h
	gst/effectv/gstripple.c

Some possible FIXMEs remaining in the audio parser getcaps functions.
2011-11-26 13:34:10 +00:00
Thiago Santos a3bc431924 ismlmux: Use iso-fragmented as variant type
Using 'iso' conflicts with mp4mux variant type, ismlmux now
uses iso-fragmented

Fixes #656823
2011-11-25 19:29:31 -03:00
Wim Taymans 734ec56617 Merge branch 'master' into 0.11 2011-07-08 12:51:14 +02:00
David Schleef 4dcc9ee42a qtmux: Add direct dirac mapping 2011-07-07 11:27:52 -07:00
Mark Nauwelaerts f886681367 isomp4: port to 0.11 2011-06-29 12:46:20 +02:00
Tim-Philipp Müller c25bf5dc34 quicktime: rename plugin to isomp4
https://bugzilla.gnome.org/show_bug.cgi?id=648004
2011-04-30 17:58:02 +01:00
Renamed from gst/quicktime/gstqtmuxmap.c (Browse further)