Sebastian Dröge dc8984d76c Merge branch 'master' into 0.11 ...

Conflicts:
	gst-libs/gst/app/gstappsrc.c
	gst-libs/gst/audio/multichannel.h
	gst-libs/gst/video/videooverlay.c
	gst/playback/gstplaysink.c
	gst/playback/gststreamsynchronizer.c
	tests/check/Makefile.am
	win32/common/libgstvideo.def

2012-01-10 13:15:12 +01:00

..

.gitignore

gst: New encoding plugin

2010-12-15 11:54:32 +01:00

gstencode-marshal.list

gst: New encoding plugin

2010-12-15 11:54:32 +01:00

gstencodebin.c

various: fix pad template leaks

2011-11-28 13:09:02 +00:00

gstencodebin.h

encodebin: Add missing-plugin support

2011-01-07 13:18:20 +01:00

gstsmartencoder.c

Merge branch 'master' into 0.11

2012-01-10 13:15:12 +01:00

gstsmartencoder.h

gst: New encoding plugin

2010-12-15 11:54:32 +01:00

gststreamcombiner.c

streamcombiner: fix srcpad query caps

2012-01-02 18:28:46 +01:00

gststreamcombiner.h

gst: New encoding plugin

2010-12-15 11:54:32 +01:00

gststreamsplitter.c

Work around deprecated thread API in glib master

2011-12-04 17:16:30 +00:00

gststreamsplitter.h

gst: New encoding plugin

2010-12-15 11:54:32 +01:00

Makefile.am

android: make it ready for androgenizer

2011-04-11 07:23:21 +02:00