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

Initial revision

2001-12-22 22:43:48 +00:00

adder.vcproj

more working plugins

2004-07-27 21:41:30 +00:00

gstadder.c

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

2011-12-02 11:10:17 +00:00

gstadder.h

adder: fix deadly setcaps recursion

2011-11-29 10:42:16 +01:00

gstadderorc-dist.c

gst: update disted orc backup code

2011-04-16 15:59:45 +01:00

gstadderorc-dist.h

gst: update disted orc backup code

2011-04-16 15:59:45 +01:00

gstadderorc.orc

Revert "Revert "Use init functions for Orc code""

2010-09-09 10:57:41 +02:00

Makefile.am

android: make it ready for androgenizer

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