Wim Taymans e787c7a5e2 Merge branch 'master' into 0.11 ...

Conflicts:
	ext/pango/gsttextoverlay.c
	gst/encoding/gstencodebin.c

2011-10-03 10:11:19 +02: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

Merge branch 'master' into 0.11

2011-10-03 10:11:19 +02:00

gstencodebin.h

encodebin: Add missing-plugin support

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

gstsmartencoder.c

-base: fix for flush_stop event API change

2011-06-10 11:59:53 +02:00

gstsmartencoder.h

gst: New encoding plugin

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

gststreamcombiner.c

-base: use caps event instead of setcapsfunction

2011-06-07 10:58:27 +02:00

gststreamcombiner.h

gst: New encoding plugin

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

gststreamsplitter.c

Merge branch 'master' into 0.11

2011-07-07 11:10:39 +02: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