Wim Taymans 016d036137 Merge branch 'master' into 0.11 ...

Conflicts:
	configure.ac
	gst-libs/gst/audio/gstbaseaudiosink.c
	gst/audioconvert/channelmixtest.c
	gst/playback/gstplaybasebin.c
	gst/playback/gstsubtitleoverlay.c
	tests/examples/Makefile.am
	tests/examples/audio/Makefile.am

2011-10-27 15:44:58 +02:00

..

.gitignore

playback: move tests from plugin-dir to tests/examples/playback

2010-08-12 10:52:34 +03:00

gstdecodebin2.c

Merge branch 'master' into 0.11

2011-10-27 15:44:58 +02:00

gstdecodebin.c

decodebin: don't plug the same parser multiple times in a row

2011-07-15 16:14:11 +01:00

gstplay-enum.c

playbin2: Add flag for enabling/disabling automatic deinterlacing

2010-04-29 18:21:21 +02:00

gstplay-enum.h

some more ffmpegcolorspace to videoconvert changes

2011-06-15 18:08:32 +02:00

gstplay-marshal.list

uridecodebin, decodebin: remove new-decoded-pad and removed-decoded-pad signals

2011-06-15 00:32:23 +01:00

gstplayback.c

playback: merge playbin and decodebin plugins into one single playback plugin again

2011-06-15 00:02:13 +01:00

gstplayback.h

playback: merge playbin and decodebin plugins into one single playback plugin again

2011-06-15 00:02:13 +01:00

gstplaybin2.c

Merge branch 'master' into 0.11

2011-10-08 10:19:06 +02:00

gstplaysink.c

Merge branch 'master' into 0.11

2011-10-08 10:19:06 +02:00

gstplaysink.h

playbin2/playsink: Decide if A/V caps are raw only inside playsink

2011-05-14 11:42:32 +02:00

gstplaysinkaudioconvert.c

Merge branch 'master' into 0.11

2011-10-27 15:44:58 +02:00

gstplaysinkaudioconvert.h

probes: port to new API for blocking and probes

2011-06-01 19:34:54 +02:00

gstplaysinkvideoconvert.c

Merge branch 'master' into 0.11

2011-10-08 10:19:06 +02:00

gstplaysinkvideoconvert.h

probes: port to new API for blocking and probes

2011-06-01 19:34:54 +02:00

gstrawcaps.h

audio: rework audio caps.

2011-08-18 19:15:03 +02:00

gststreamselector.c

base: Update for SEGMENT event parse API changes

2011-05-18 17:23:18 +02:00

gststreamselector.h

gst/playback/gststreamselector.*: Revert change that caused regression until a real fix is found.

2008-03-14 09:54:44 +00:00

gststreamsynchronizer.c

gststreamsynchronizer: don't abuse PREROLL flag

2011-08-15 18:38:04 +02:00

gststreamsynchronizer.h

streamsynchronizer: Fix another deadlock when going PAUSED->READY while streams are waiting for the GCond

2010-07-22 09:13:48 +02:00

gstsubtitleoverlay.c

Merge branch 'master' into 0.11

2011-10-27 15:44:58 +02:00

gstsubtitleoverlay.h

probes: port to new API for blocking and probes

2011-06-01 19:34:54 +02:00

gsturidecodebin.c

ext,gst: update for query API changes

2011-07-27 01:16:53 +01:00

Makefile.am

Merge branch 'master' into 0.11

2011-09-06 15:24:32 +02:00