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

Conflicts:
	gst-libs/gst/netbuffer/gstnetbuffer.c
	gst/ffmpegcolorspace/avcodec.h
	gst/ffmpegcolorspace/gstffmpegcodecmap.c
	gst/ffmpegcolorspace/imgconvert.c
	gst/ffmpegcolorspace/imgconvert_template.h
	gst/ffmpegcolorspace/mem.c
	gst/playback/README
	gst/playback/gstplaybasebin.c
	gst/playback/gstplaybasebin.h
	gst/playback/gstplaybin.c
	sys/v4l/v4lmjpegsrc_calls.c
	sys/v4l/videodev_mjpeg.h
	tests/check/elements/gnomevfssink.c

2011-12-02 11:10:17 +00: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

various: fix pad template leaks

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

gstsmartencoder.h

gst: New encoding plugin

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

gststreamcombiner.c

various: fix pad template leaks

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

gststreamcombiner.h

gst: New encoding plugin

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

gststreamsplitter.c

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

2011-12-02 11:10:17 +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