projects / platform / upstream / gstreamer.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 54fd50b 954bcb0)
Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Mon, 13 Jun 2011 17:10:00 +0000 (19:10 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Mon, 13 Jun 2011 17:10:00 +0000 (19:10 +0200)
1  2 
docs/libs/gstreamer-libs-sections.txt patch | diff1 | diff2 | blob | history
libs/gst/base/gstbasesrc.c patch | diff1 | diff2 | blob | history

diff --cc docs/libs/gstreamer-libs-sections.txt
index f157866,621cbbd..29f4fcd
--- 1/docs/libs/gstreamer-libs-sections.txt
--- 2/docs/libs/gstreamer-libs-sections.txt
+++ b/docs/libs/gstreamer-libs-sections.txt
@@@ -278,8 -286,8 +278,9 @@@ gst_base_src_get_blocksiz
  gst_base_src_set_blocksize
  gst_base_src_get_do_timestamp
  gst_base_src_set_do_timestamp
+ gst_base_src_set_dynamic_size
  gst_base_src_new_seamless_segment
 +gst_base_src_set_dynamic_size
  
  GST_BASE_SRC_PAD
  <SUBSECTION Standard>
diff --cc libs/gst/base/gstbasesrc.c
Simple merge
Domain: Multimedia / Media Common;