Commit 3fab57b5 authored by Wim Taymans's avatar Wim Taymans
Browse files

Merge branch 'master' into 0.11

Conflicts:
	gst-libs/gst/interfaces/videooverlay.c
	gst-libs/gst/rtp/gstrtpbuffer.c
	po/af.po
	po/az.po
	po/bg.po
	po/ca.po
	po/cs.po
	po/da.po
	po/de.po
	po/el.po
	po/en_GB.po
	po/es.po
	po/eu.po
	po/fi.po
	po/fr.po
	po/gl.po
	po/hu.po
	po/id.po
	po/it.po
	po/ja.po
	po/lt.po
	po/lv.po
	po/nb.po
	po/nl.po
	po/or.po
	po/pl.po
	po/pt_BR.po
	po/ro.po
	po/ru.po
	po/sk.po
	po/sl.po
	po/sq.po
	po/sr.po
	po/sv.po
	po/tr.po
	po/uk.po
	po/vi.po
	po/zh_CN.po
parents c81c62d0 54c15acd
......@@ -188,6 +188,7 @@
<xi:include href="xml/gsttag.xml" />
<xi:include href="xml/gsttagvorbis.xml" />
<xi:include href="xml/gsttagid3.xml" />
<xi:include href="xml/gsttagexif.xml" />
<xi:include href="xml/gsttagxmp.xml" />
<xi:include href="xml/gsttagxmpwriter.xml" />
<xi:include href="xml/gsttagdemux.xml" />
......
......@@ -1739,6 +1739,7 @@ GST_TAG_CAPTURING_SOURCE
GST_TAG_CAPTURING_EXPOSURE_COMPENSATION
GST_TAG_IMAGE_HORIZONTAL_PPI
GST_TAG_IMAGE_VERTICAL_PPI
GST_TAG_ID3V2_HEADER_SIZE
gst_tag_register_musicbrainz_tags
gst_tag_freeform_string_to_utf8
gst_tag_parse_extended_comment
......
......@@ -23,7 +23,7 @@
* SECTION:gstaudiofilter
* @short_description: Base class for simple audio filters
*
* #GstAudioFilter is a #GstBaseTransform-derived base class for simple audio
* #GstAudioFilter is a #GstBaseTransform<!-- -->-derived base class for simple audio
* filters, ie. those that output the same format that they get as input.
*
* #GstAudioFilter will parse the input format for you (with error checking)
......
......@@ -145,8 +145,8 @@ gst_color_balance_list_channels (GstColorBalance * balance)
* Sets the current value of the channel to the passed value, which must
* be between min_value and max_value.
*
* See Also: The #GstColorBalanceChannel::min_value and
* #GstColorBalanceChannel::max_value members of the
* See Also: The #GstColorBalanceChannel.min_value and
* #GstColorBalanceChannel.max_value members of the
* #GstColorBalanceChannel object.
*/
void
......@@ -168,8 +168,8 @@ gst_color_balance_set_value (GstColorBalance * balance,
* Retrieve the current value of the indicated channel, between min_value
* and max_value.
*
* See Also: The #GstColorBalanceChannel::min_value and
* #GstColorBalanceChannel::max_value members of the
* See Also: The #GstColorBalanceChannel.min_value and
* #GstColorBalanceChannel.max_value members of the
* #GstColorBalanceChannel object.
*
* Returns: The current value of the channel.
......
......@@ -545,7 +545,7 @@ gst_mixer_option_changed (GstMixer * mixer,
* options of a given options object has changed.
*
* The new options are not contained in the message on purpose. Applications
* should call gst_mixer_option_get_values() on @opts to make @opts update
* should call gst_mixer_options_get_values() on @opts to make @opts update
* its internal state and obtain the new list of values.
*
* This function only works for GstElements that are implementing the
......
......@@ -486,7 +486,7 @@ gst_navigation_query_parse_angles (GstQuery * query, guint * cur_angle,
* Check a bus message to see if it is a #GstNavigation event, and return
* the #GstNavigationMessageType identifying the type of the message if so.
*
* Returns: The type of the #GstNavigationMessage, or
* Returns: The type of the #GstMessage, or
* #GST_NAVIGATION_MESSAGE_INVALID if the message is not a #GstNavigation
* notification.
*
......
......@@ -53,7 +53,7 @@ struct _GstStreamVolumeInterface {
* @GST_STREAM_VOLUME_FORMAT_CUBIC: Cubic volume scale
* @GST_STREAM_VOLUME_FORMAT_DB: Logarithmic volume scale (dB, amplitude not power)
*
* Different representations of a stream volume. gst_stream_volume_convert()
* Different representations of a stream volume. gst_stream_volume_convert_volume()
* allows to convert between the different representations.
*
* Formulas to convert from a linear to a cubic or dB volume are
......
......@@ -927,7 +927,7 @@ DISCOVERER_INFO_ACCESSOR_CODE (misc, const GstStructure *, NULL);
* gst_discoverer_info_get_tags:
* @info: a #GstDiscovererInfo
*
* Returns: (transfer none): all tags contained in the %URI. If you wish to use
* Returns: (transfer none): all tags contained in the URI. If you wish to use
* the tags after the life-time of @info, you will need to copy them.
*
* Since: 0.10.31
......
......@@ -58,7 +58,7 @@ G_BEGIN_DECLS
*
* Result codes returned by gst_install_plugins_async() and
* gst_install_plugins_sync(), and also the result code passed to the
* #GstInstallPluginsResultFunc specified with gst_install_plugin_async().
* #GstInstallPluginsResultFunc specified with gst_install_plugins_async().
*
* These codes indicate success or failure of starting an external installer
* program and to what extent the requested plugins could be installed.
......
......@@ -284,7 +284,7 @@ gst_rtp_buffer_calc_payload_len (guint packet_len, guint8 pad_len,
- pad_len;
}
/**
/*
* validate_data:
* @data: the data to validate
* @len: the length of @data to validate
......@@ -401,7 +401,7 @@ gst_rtp_buffer_validate_data (guint8 * data, gsize len)
* @buffer: the buffer to validate
*
* Check if the data pointed to by @buffer is a valid RTP packet using
* validate_data().
* gst_rtp_buffer_validate_data().
* Use this function to validate a packet before using the other functions in
* this module.
*
......
......@@ -231,8 +231,7 @@ gst_rtsp_transport_get_mime (GstRTSPTransMode trans, const gchar ** mime)
* @manager: location to hold the result
* @option: option index.
*
* Get the #GStreamer element that can handle the buffers transported over
* @trans.
* Get the #GstElement that can handle the buffers transported over @trans.
*
* It is possible that there are several managers available, use @option to
* selected one.
......
......@@ -385,10 +385,10 @@ unescape_path_component (gchar * comp)
* Splits the path of @url on '/' boundaries, decoding the resulting components,
*
* The decoding performed by this routine is "URI decoding", as defined in RFC
* 3986, commonly known as percent-decoding. For example, a string "foo%2fbar"
* will decode to "foo/bar" -- the %2f being replaced by the corresponding byte
* 3986, commonly known as percent-decoding. For example, a string "foo\%2fbar"
* will decode to "foo/bar" -- the \%2f being replaced by the corresponding byte
* with hex value 0x2f. Note that there is no guarantee that the resulting byte
* sequence is valid in any given encoding. As a special case, %00 is not
* sequence is valid in any given encoding. As a special case, \%00 is not
* unescaped to NUL, as that would prematurely terminate the string.
*
* Also note that since paths usually start with a slash, the first component
......
......@@ -1204,7 +1204,7 @@ DEFINE_ARRAY_GETTER (media, medias, const GstSDPMedia);
*
* Adds @media to the array of medias in @msg. This function takes ownership of
* the contents of @media so that @media will have to be reinitialized with
* gst_media_init() before it can be used again.
* gst_sdp_media_init() before it can be used again.
*
* Returns: a #GstSDPResult.
*/
......
......@@ -19,7 +19,7 @@ libgsttag_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(
# lang-tables.dat contains generated static data and is included by lang.c
# licenses-tables.dat contains generated data and is included by licenses.c
EXTRA_DIST = lang-tables.dat licenses-tables.dat
EXTRA_DIST = lang-tables.dat licenses-tables.dat license-translations.dict
noinst_HEADERS = gsttageditingprivate.h id3v2.h
......@@ -102,7 +102,7 @@ update-licenses: mklicensestables
# strings retranslated, but also we don't want to create 30 1kB .mo files,
# so just do something for now, we can change it later if someone really cares.
licensetransdir = $(pkgdatadir)
licensetrans_DATA = $(builddir)/license-translations.dict
licensetrans_DATA = $(srcdir)/license-translations.dict
#endif
Android.mk: Makefile.am
......
......@@ -22,14 +22,10 @@
* @short_description: utility functions for Creative Commons licenses
* @see_also: #GstTagList
*
* <refsect2>
* <para>
* Provides information about Creative Commons media licenses, which are
* often expressed in media files as a license URI in tags. Also useful
* for applications creating media files, in case the user wants to license
* the content under a Creative Commons license.
* </para>
* </refsect2>
*/
/* FIXME: add API to check obsolete-ness / replace-by */
......
......@@ -105,10 +105,10 @@ struct _GstVideoSink {
/**
* GstVideoSinkClass:
* @parent_class: the parent class structure
* @show_frame: render a video frame. Maps to #GstBaseSink::render and
* #GstBaseSink::preroll vfuncs. Rendering during preroll will be
* suppressed if the 'show-preroll-frame' property is set to #FALSE.
* Since: 0.10.25
* @show_frame: render a video frame. Maps to #GstBaseSinkClass.render() and
* #GstBaseSinkClass.preroll() vfuncs. Rendering during preroll will be
* suppressed if the #GstVideoSink:show-preroll-frame property is set to
* %FALSE. Since: 0.10.25
*
* The video sink class structure. Derived classes should override the
* @show_frame virtual function.
......
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gst-plugins 0.7.6\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n"
"POT-Creation-Date: 2011-08-02 21:32+0200\n"
"POT-Creation-Date: 2011-08-20 12:18+0100\n"
"PO-Revision-Date: 2004-03-18 14:16+0200\n"
"Last-Translator: Petri Jooste <rkwjpj@puk.ac.za>\n"
"Language-Team: Afrikaans <i18n@af.org.za>\n"
......@@ -353,6 +353,12 @@ msgstr ""
msgid "Media (image/video) intended vertical pixel density in ppi"
msgstr ""
msgid "ID3v2 frame"
msgstr ""
msgid "unparsed id3v2 tag frame"
msgstr ""
msgid "This CD has no audio tracks"
msgstr ""
......
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gst-plugins-0.8.0\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n"
"POT-Creation-Date: 2011-08-02 21:32+0200\n"
"POT-Creation-Date: 2011-08-20 12:18+0100\n"
"PO-Revision-Date: 2004-03-19 18:29+0200\n"
"Last-Translator: Metin Amiroff <metin@karegen.com>\n"
"Language-Team: Azerbaijani <translation-team-az@lists.sourceforge.net>\n"
......@@ -354,6 +354,12 @@ msgstr ""
msgid "Media (image/video) intended vertical pixel density in ppi"
msgstr ""
msgid "ID3v2 frame"
msgstr ""
msgid "unparsed id3v2 tag frame"
msgstr ""
msgid "This CD has no audio tracks"
msgstr ""
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gst-plugins-base 0.10.32.2\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n"
"POT-Creation-Date: 2011-08-02 21:32+0200\n"
"POT-Creation-Date: 2011-08-20 12:18+0100\n"
"PO-Revision-Date: 2011-04-26 22:31+0300\n"
"Last-Translator: Alexander Shopov <ash@kambanaria.org>\n"
"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
......@@ -350,6 +350,12 @@ msgstr "точки на инч по вертикал"
msgid "Media (image/video) intended vertical pixel density in ppi"
msgstr "Целевата разделителна способност на медията по вертикал"
msgid "ID3v2 frame"
msgstr ""
msgid "unparsed id3v2 tag frame"
msgstr ""
msgid "This CD has no audio tracks"
msgstr "В това CD липсва аудио"
......
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gst-plugins-base 0.10.30.3\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n"
"POT-Creation-Date: 2011-08-02 21:32+0200\n"
"POT-Creation-Date: 2011-08-20 12:18+0100\n"
"PO-Revision-Date: 2010-11-04 23:13+0100\n"
"Last-Translator: Jordi Mallach <jordi@sindominio.net>\n"
"Language-Team: Catalan <ca@dodds.net>\n"
......@@ -349,6 +349,12 @@ msgstr "ppi vertical de la imatge"
msgid "Media (image/video) intended vertical pixel density in ppi"
msgstr "Densitat vertical de píxels del medi (imatge/vídeo), en ppi"
msgid "ID3v2 frame"
msgstr ""
msgid "unparsed id3v2 tag frame"
msgstr ""
msgid "This CD has no audio tracks"
msgstr "Aquest CD no té pistes d'àudio"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment