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

Conflicts:
	configure.ac
	ext/kate/gstkateenc.c
	gst/colorspace/colorspace.c
	gst/mpegvideoparse/mpegvideoparse.c

2012-01-25 13:22:43 +01:00

..

.gitignore

inter: add ignore file for intermediate files

2011-07-08 00:11:37 -07:00

gstinter.c

inter: Add channel property

2012-01-22 15:52:15 -08:00

gstinteraudiosink.c

Merge branch 'master' into 0.11

2012-01-25 13:22:43 +01:00

gstinteraudiosink.h

inter: remove (leaking) dead code

2012-01-12 16:48:38 +00:00

gstinteraudiosrc.c

Merge branch 'master' into 0.11

2012-01-25 13:22:43 +01:00

gstinteraudiosrc.h

inter: remove (leaking) dead code

2012-01-12 16:48:38 +00:00

gstintersubsink.c

inter: Fix compilation

2012-01-22 16:55:46 -08:00

gstintersubsink.h

inter: Add subtitle inter elements

2012-01-22 15:49:44 -08:00

gstintersubsrc.c

inter: Add subtitle inter elements

2012-01-22 15:49:44 -08:00

gstintersubsrc.h

inter: Add subtitle inter elements

2012-01-22 15:49:44 -08:00

gstintersurface.c

inter: Add channel property

2012-01-22 15:52:15 -08:00

gstintersurface.h

inter: Add channel property

2012-01-22 15:52:15 -08:00

gstintertest.c

…

gstintervideosink.c

Merge branch 'master' into 0.11

2012-01-25 13:22:43 +01:00

gstintervideosink.h

inter: Add channel property

2012-01-22 15:52:15 -08:00

gstintervideosrc.c

Merge branch 'master' into 0.11

2012-01-25 13:22:43 +01:00

gstintervideosrc.h

inter: Add channel property

2012-01-22 15:52:15 -08:00

Makefile.am

inter: Add subtitle inter elements

2012-01-22 15:49:44 -08:00