diff options
| author | Wim Taymans <wim.taymans@collabora.co.uk> | 2011-04-11 10:26:54 +0200 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@collabora.co.uk> | 2011-04-11 10:26:54 +0200 |
| commit | 6be4dbdb5a1856d79369574afd8d5df460fb1af2 (patch) | |
| tree | daa5fb81f37e0561ef6a5638029c09811c8d6a42 /win32 | |
| parent | df85690cfdac9fe15cccaf85b20373e0a81be714 (diff) | |
| parent | 3f1ef2255a2e7c316d7c877d3a3f6bb815bc79a4 (diff) | |
Merge branch 'master' into 0.11
Conflicts:
android/base.mk
android/controller.mk
android/dataprotocol.mk
android/elements.mk
android/gst-inspect.mk
android/gst-launch.mk
android/gst-plugin-scanner.mk
android/gst.mk
android/indexers.mk
android/net.mk
win32/common/libgstbase.def
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/common/libgstbase.def | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/win32/common/libgstbase.def b/win32/common/libgstbase.def index 6609f9293..61ab48e08 100644 --- a/win32/common/libgstbase.def +++ b/win32/common/libgstbase.def @@ -15,6 +15,18 @@ EXPORTS gst_adapter_take_buffer gst_adapter_take_list gst_adapter_unmap + gst_base_parse_add_index_entry + gst_base_parse_convert_default + gst_base_parse_frame_init + gst_base_parse_get_type + gst_base_parse_push_frame + gst_base_parse_set_average_bitrate + gst_base_parse_set_duration + gst_base_parse_set_frame_rate + gst_base_parse_set_has_timing_info + gst_base_parse_set_min_frame_size + gst_base_parse_set_passthrough + gst_base_parse_set_syncable gst_base_sink_do_preroll gst_base_sink_get_blocksize gst_base_sink_get_last_buffer |