| commit | 1119f6ee4103990ccc55d521be08bdce10737c8e | [log] [tgz] |
|---|---|---|
| author | Wim Taymans <wim.taymans@collabora.co.uk> | Fri Feb 10 16:46:50 2012 +0100 |
| committer | Wim Taymans <wim.taymans@collabora.co.uk> | Fri Feb 10 16:46:50 2012 +0100 |
| tree | d2b9a31d43d6a1f832951a9c984127e27622211a | |
| parent | 9fcfa6046d0e8e8ec89c32d7091b747088265d70 [diff] | |
| parent | 1cbd755a2cd45531076c7b19ef194b77d5575cb0 [diff] |
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