Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Thu, 4 Aug 2011 07:36:07 +0000 (09:36 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Thu, 4 Aug 2011 07:36:07 +0000 (09:36 +0200)
Conflicts:
common
configure.ac
gst/colorspace/colorspace.c
gst/colorspace/colorspace.h
gst/colorspace/gstcolorspace.c

1  2 
configure.ac
ext/directfb/dfbvideosink.c
gst/id3tag/id3tag.c
gst/mxf/mxfdemux.c
gst/sdi/gstsdidemux.c
sys/Makefile.am

diff --cc configure.ac
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -366,8 -364,7 +364,6 @@@ gst_sdi_demux_chain (GstPad * pad, GstB
    if (sdidemux->output_buffer == NULL) {
      gst_sdi_demux_get_output_buffer (sdidemux);
    }
-   output_data = GST_BUFFER_DATA (sdidemux->output_buffer);
--
  #if 0
    if (sdidemux->offset) {
      int n;
diff --cc sys/Makefile.am
Simple merge