diff options
| author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2011-05-05 12:27:51 +0200 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2011-05-05 12:27:51 +0200 |
| commit | 65eafd93402d5620a809cb63f0612fc2456de19d (patch) | |
| tree | d4e6c257791d194dc130abc2db66bd3e9660cb2d /docs/libs | |
| parent | 9ef1346b1fa0bd2bb42cd991a52ff308a728bdb6 (diff) | |
| parent | d72f559d297a06bec892fa5a6bd4e43094f8dcf5 (diff) | |
Merge branch 'master' into 0.11
Conflicts:
docs/gst/gstreamer-sections.txt
gst/gstelementfactory.c
gst/gstminiobject.c
Diffstat (limited to 'docs/libs')
| -rw-r--r-- | docs/libs/gstreamer-libs-sections.txt | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/docs/libs/gstreamer-libs-sections.txt b/docs/libs/gstreamer-libs-sections.txt index bb3e10426..948b1b770 100644 --- a/docs/libs/gstreamer-libs-sections.txt +++ b/docs/libs/gstreamer-libs-sections.txt @@ -229,6 +229,7 @@ gst_base_parse_set_frame_rate gst_base_parse_convert_default gst_base_parse_add_index_entry +GstBaseParseFrame GstBaseParseFrameFlags gst_base_parse_frame_new gst_base_parse_frame_init @@ -236,6 +237,13 @@ gst_base_parse_frame_free gst_base_parse_push_frame +GST_BASE_PARSE_DRAINING +GST_BASE_PARSE_FLAG_DRAINING +GST_BASE_PARSE_FLAG_LOST_SYNC +GST_BASE_PARSE_FLOW_DROPPED +GST_BASE_PARSE_FLOW_QUEUED +GST_BASE_PARSE_LOST_SYNC +GST_BASE_PARSE_SINK_PAD GST_BASE_PARSE_SRC_PAD <SUBSECTION Standard> GstBaseParsePrivate |