diff options
| author | Wim Taymans <wim.taymans@collabora.co.uk> | 2011-02-22 14:11:59 +0100 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@collabora.co.uk> | 2011-02-22 14:11:59 +0100 |
| commit | 238b9a57cc022aec7ebd52d908ac5e24d76c3183 (patch) | |
| tree | 9563e2353a2c427a40fae0e7de0ed73c2348c402 /docs/libs | |
| parent | 90fff577f0661c1ec7a0f2c324d5b69d1d1d040e (diff) | |
| parent | cc5edeefcd7772ac645fa0b8b91cfe7be201d78a (diff) | |
Merge branch 'master' into 0.11
Conflicts:
configure.ac
gst/gstelement.c
gst/gstelement.h
gst/gstpad.c
gst/gstutils.c
libs/gst/base/Makefile.am
libs/gst/check/Makefile.am
libs/gst/controller/Makefile.am
libs/gst/dataprotocol/Makefile.am
libs/gst/net/Makefile.am
win32/common/libgstreamer.def
Diffstat (limited to 'docs/libs')
| -rw-r--r-- | docs/libs/gstreamer-libs-sections.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/docs/libs/gstreamer-libs-sections.txt b/docs/libs/gstreamer-libs-sections.txt index 553ad6e59..6f3a7bfe7 100644 --- a/docs/libs/gstreamer-libs-sections.txt +++ b/docs/libs/gstreamer-libs-sections.txt @@ -275,6 +275,8 @@ gst_base_sink_is_last_buffer_enabled gst_base_sink_get_last_buffer gst_base_sink_set_blocksize gst_base_sink_get_blocksize +gst_base_sink_get_throttle_time +gst_base_sink_set_throttle_time GST_BASE_SINK_PAD |