diff options
| author | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2012-01-02 02:21:40 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2012-01-02 02:21:40 +0000 |
| commit | 2836cbee946f00f7876fb070c5385e36af92aff8 (patch) | |
| tree | 891708c2feac439e7ff71f699cb2cef3063f4661 /docs/gst | |
| parent | 5668654ed5fe0779e7067efc1f7769542dfff7e3 (diff) | |
| parent | cb23beda4fb9df87eba1f28ef0cd483287e38b66 (diff) | |
Merge remote-tracking branch 'origin/master' into 0.11
Conflicts:
gst/gsttaglist.c
plugins/elements/gstoutputselector.c
Diffstat (limited to 'docs/gst')
| -rw-r--r-- | docs/gst/gstreamer-sections.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/docs/gst/gstreamer-sections.txt b/docs/gst/gstreamer-sections.txt index 91c6a97a7..1af0570cc 100644 --- a/docs/gst/gstreamer-sections.txt +++ b/docs/gst/gstreamer-sections.txt @@ -2319,6 +2319,7 @@ GST_TAG_ALBUM_GAIN GST_TAG_ALBUM_PEAK GST_TAG_REFERENCE_LEVEL GST_TAG_LANGUAGE_CODE +GST_TAG_LANGUAGE_NAME GST_TAG_IMAGE GST_TAG_PREVIEW_IMAGE GST_TAG_ATTACHMENT |