Wim Taymans 0dd59060d9 subtitleoverlay: fix merge error ...

Fix merge error from commit fb6d09055ae90979682fa4b1c6ee4f4abdaafd8f

2012-02-09 15:51:10 +01:00

..

.gitignore

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

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

gstdecodebin2.c

playback: suppress GValueArray deprecation warnings for the time being

2012-02-01 15:50:52 +00:00

gstdecodebin.c

port to new glib thread API

2012-01-19 11:36:17 +01:00

gstplay-enum.c

…

gstplay-enum.h

Merge branch 'master' into 0.11

2012-01-10 13:15:12 +01: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

playback: suppress GValueArray deprecation warnings for the time being

2012-02-01 15:50:52 +00:00

gstplaysink.c

Merge branch 'master' into 0.11

2012-01-25 11:50:54 +01: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

playsink: call the right default query handler

2012-02-02 12:14:15 +01: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 branch 'master' into 0.11

2012-01-25 11:50:54 +01:00

gststreamsynchronizer.h

…

gstsubtitleoverlay.c

subtitleoverlay: fix merge error

2012-02-09 15:51:10 +01:00

gstsubtitleoverlay.h

probes: port to new API for blocking and probes

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

gsturidecodebin.c

playback: suppress GValueArray deprecation warnings for the time being

2012-02-01 15:50:52 +00:00

Makefile.am

audio: move audio interfaces

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