From: Wim Taymans <wim.taymans@collabora.co.uk>
Date: Sat, 26 Feb 2011 14:02:58 +0000 (+0100)
Subject: Merge branch 'master' into 0.11
X-Git-Tag: 1.19.3~505^2~999
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=62efb84c19414a13cfac17c7f9e6ba312375beed;p=platform%2Fupstream%2Fgstreamer.git

Merge branch 'master' into 0.11

Conflicts:
	configure.ac
---

62efb84c19414a13cfac17c7f9e6ba312375beed
diff --cc configure.ac
index fdb0a44,a903428..d16c139
--- a/configure.ac
+++ b/configure.ac
@@@ -533,10 -516,10 +516,10 @@@ sed 
      -e "s/.* PACKAGE_STRING$/#define PACKAGE_STRING \"$PACKAGE_STRING\"/" \
      -e 's/.* PACKAGE_TARNAME$/#define PACKAGE_TARNAME "'$PACKAGE_TARNAME'"/' \
      -e 's/.* PACKAGE_VERSION$/#define PACKAGE_VERSION "'$PACKAGE_VERSION'"/' \
 -    -e 's/.* PLUGINDIR$/#ifdef _DEBUG\n#  define PLUGINDIR PREFIX "\\\\debug\\\\lib\\\\gstreamer-0.10"\n#else\n#  define PLUGINDIR PREFIX "\\\\lib\\\\gstreamer-0.10"\n#endif/' \
 +    -e 's/.* PLUGINDIR$/#ifdef _DEBUG\n#  define PLUGINDIR PREFIX "\\\\debug\\\\lib\\\\gstreamer-0.11"\n#else\n#  define PLUGINDIR PREFIX "\\\\lib\\\\gstreamer-0.11"\n#endif/' \
      -e 's/.* USE_BINARY_REGISTRY$/#define USE_BINARY_REGISTRY/' \
      -e 's/.* VERSION$/#define VERSION "'$VERSION'"/' \
-     -e "s/.* DEFAULT_AUDIOSINK$/#define DEFAULT_AUDIOSINK \"directaudiosink\"/" \
+     -e "s/.* DEFAULT_AUDIOSINK$/#define DEFAULT_AUDIOSINK \"directsoundsink\"/" \
      -e "s/.* DEFAULT_AUDIOSRC$/#define DEFAULT_AUDIOSRC \"audiotestsrc\"/" \
      -e "s/.* DEFAULT_VIDEOSRC$/#define DEFAULT_VIDEOSRC \"videotestsrc\"/" \
      -e "s/.* DEFAULT_VISUALIZER$/#define DEFAULT_VISUALIZER \"goom\"/" \
diff --cc gst/asfdemux/gstasfdemux.c
index 88bff47b,3d32e0a..0020027
--- a/gst/asfdemux/gstasfdemux.c
+++ b/gst/asfdemux/gstasfdemux.c
@@@ -2289,7 -2289,7 +2289,7 @@@ gst_asf_demux_parse_stream_object (GstA
  
    flags = gst_asf_demux_get_uint16 (&data, &size);
    stream_id = flags & 0x7f;
--  is_encrypted = ! !((flags & 0x8000) << 15);
++  is_encrypted = !!((flags & 0x8000) << 15);
    unknown = gst_asf_demux_get_uint32 (&data, &size);
  
    GST_DEBUG_OBJECT (demux, "Found stream %u, time_offset=%" GST_TIME_FORMAT,
@@@ -2895,8 -2895,8 +2895,8 @@@ gst_asf_demux_process_file (GstASFDemu
    max_pktsize = gst_asf_demux_get_uint32 (&data, &size);
    min_bitrate = gst_asf_demux_get_uint32 (&data, &size);
  
--  demux->broadcast = ! !(flags & 0x01);
--  demux->seekable = ! !(flags & 0x02);
++  demux->broadcast = !!(flags & 0x01);
++  demux->seekable = !!(flags & 0x02);
  
    GST_DEBUG_OBJECT (demux, "min_pktsize = %u", min_pktsize);
    GST_DEBUG_OBJECT (demux, "flags::broadcast = %d", demux->broadcast);