From: Wim Taymans Date: Wed, 9 Nov 2011 11:11:59 +0000 (+0100) Subject: Merge branch 'master' into 0.11 X-Git-Tag: RELEASE-0.11.2~420 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d77c8cafeed2ca9d614b4e11facf9b359bec342b;p=platform%2Fupstream%2Fgst-plugins-base.git Merge branch 'master' into 0.11 Conflicts: common ext/pango/gsttextoverlay.c gst-libs/gst/video/video.c --- d77c8cafeed2ca9d614b4e11facf9b359bec342b diff --cc common index 762b692,63d592e..a62f3d4 --- a/common +++ b/common @@@ -1,1 -1,1 +1,1 @@@ - Subproject commit 762b6927ffdd1726cb4f4783f49b5cfaa9edd941 -Subproject commit 63d592ed74618734d69438c770d6462efeb5ab9d ++Subproject commit a62f3d4acded1a2913cfe6125a5831274d55c52b diff --cc win32/common/libgstaudio.def index 79cf6d9,cc8e310..b660865 --- a/win32/common/libgstaudio.def +++ b/win32/common/libgstaudio.def @@@ -75,7 -75,10 +75,9 @@@ EXPORT gst_audio_set_structure_channel_positions_list gst_audio_sink_get_type gst_audio_src_get_type - gst_audio_structure_set_int gst_base_audio_sink_create_ringbuffer + gst_base_audio_sink_get_alignment_threshold + gst_base_audio_sink_get_discont_wait gst_base_audio_sink_get_drift_tolerance gst_base_audio_sink_get_provide_clock gst_base_audio_sink_get_slave_method