Tim-Philipp Müller fb6d09055a Merge remote-tracking branch 'origin/master' into 0.11 ...

Conflicts:
	ext/alsa/gstalsadeviceprobe.c
	ext/alsa/gstalsamixer.c
	ext/pango/gsttextoverlay.c
	ext/pango/gsttextoverlay.h
	gst-libs/gst/audio/gstaudiobasesink.c
	gst-libs/gst/audio/gstaudioringbuffer.c
	gst-libs/gst/audio/gstaudiosrc.c
	gst-libs/gst/video/Makefile.am
	gst-libs/gst/video/video.c
	gst/encoding/gststreamcombiner.c
	gst/encoding/gststreamsplitter.c
	gst/playback/gstplaybasebin.c
	gst/playback/gststreamsynchronizer.c
	gst/playback/gstsubtitleoverlay.c
	gst/playback/gsturidecodebin.c
	sys/xvimage/xvimagesink.c
	tests/examples/Makefile.am
	win32/common/libgstvideo.def

Video overlay composition disabled for now, needs
porting to buffer meta.

2011-12-08 01:19:03 +00:00

..

.gitignore

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

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

gstdecodebin2.c

Merge remote-tracking branch 'origin/master' into 0.11

2011-12-08 01:19:03 +00:00

gstdecodebin.c

Merge remote-tracking branch 'origin/master' into 0.11

2011-12-08 01:19:03 +00: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

remove streamselector

2011-11-09 11:06:10 +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 remote-tracking branch 'origin/master' into 0.11

2011-12-08 01:19:03 +00:00

gstplaysink.c

Merge remote-tracking branch 'origin/master' into 0.11

2011-12-08 01:19:03 +00:00

gstplaysink.h

Use the new GstSample for snapshots

2011-12-01 16:53:11 +01:00

gstplaysinkaudioconvert.c

playsinkaudioconvert: use-volume and use-converters are no construct-only properties anymore

2011-11-24 11:34:12 +01:00

gstplaysinkaudioconvert.h

playsink: handle after-the-fact changes in converters/volume booleans

2011-11-03 10:02:31 +01:00

gstplaysinkconvertbin.c

Merge remote-tracking branch 'origin/master' into 0.11

2011-12-08 01:19:03 +00:00

gstplaysinkconvertbin.h

convertbin: port to 0.11 again

2011-11-07 12:43:52 +01:00

gstplaysinkvideoconvert.c

playback: name conversion elements differently

2011-11-04 17:41:01 +01:00

gstplaysinkvideoconvert.h

playsink: handle after-the-fact changes in converters/volume booleans

2011-11-03 10:02:31 +01:00

gstrawcaps.h

audio: rework audio caps.

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

gststreamsynchronizer.c

Merge remote-tracking branch 'origin/master' into 0.11

2011-12-08 01:19:03 +00: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 remote-tracking branch 'origin/master' into 0.11

2011-12-08 01:19:03 +00:00

gstsubtitleoverlay.h

probes: port to new API for blocking and probes

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

gsturidecodebin.c

Merge remote-tracking branch 'origin/master' into 0.11

2011-12-08 01:19:03 +00:00

Makefile.am

audio: move audio interfaces

2011-11-30 07:57:02 +01:00