Wim Taymans 1119f6ee41 Merge branch 'master' into 0.11 ...

Conflicts:
	ext/chromaprint/gstchromaprint.c
	ext/mpeg2enc/Makefile.am
	ext/voaacenc/gstvoaacenc.c
	gst/dvbsuboverlay/gstdvbsuboverlay.c
	gst/mpegtsdemux/mpegtsbase.c
	gst/sdp/gstsdpdemux.c
	gst/videoparsers/gsth264parse.c
	sys/d3dvideosink/d3dvideosink.c
	tests/examples/camerabin/gst-camera-perf.c
	tests/examples/camerabin/gst-camerabin-test.c
	tests/examples/camerabin2/gst-camerabin2-test.c
	tests/examples/mxf/mxfdemux-structure.c
	tests/examples/scaletempo/demo-main.c

2012-02-10 16:46:50 +01:00

..

gstmpeg2enc.cc

Merge branch 'master' into 0.11

2012-02-10 16:46:50 +01:00

gstmpeg2enc.hh

mpeg2enc: port to 0.11

2012-01-25 18:50:40 +01:00

gstmpeg2encoder.cc

mpeg2enc: fix build with 1.9.0 release again after recent fixes for mjpegtools 2.0.0

2011-05-25 14:44:50 +01:00

gstmpeg2encoder.hh

Port mpeg2enc to 0.10 (#343184).

2006-07-13 11:06:45 +00:00

gstmpeg2encoptions.cc

various (ext): add missing G_PARAM_STATIC_STRINGS flags

2010-10-19 17:13:26 +03:00

gstmpeg2encoptions.hh

ext/mpeg2enc/gstmpeg2encoptions.*: Expose the additional MPEG HDTV format profiles available in latest mjpegtools ver...

2008-06-28 20:51:36 +00:00

gstmpeg2encpicturereader.cc

mpeg2enc: port to 0.11

2012-01-25 18:50:40 +01:00

gstmpeg2encpicturereader.hh

configure.ac: Clean up detection of different mjpegtoolsAPI versions.

2008-03-05 05:38:06 +00:00

gstmpeg2encstreamwriter.cc

mpeg2enc: port to 0.11

2012-01-25 18:50:40 +01:00

gstmpeg2encstreamwriter.hh

configure.ac: Clean up detection of different mjpegtoolsAPI versions.

2008-03-05 05:38:06 +00:00

Makefile.am

Merge branch 'master' into 0.11

2012-02-10 16:46:50 +01:00