[Pkg-gstreamer-commits] [gst-plugins-base1.0] 04/05: Merge tag 'upstream/1.2.0'
Sebastian Dröge
slomo at alioth.debian.org
Tue Sep 24 15:13:13 UTC 2013
This is an automated email from the git hooks/post-receive script.
slomo pushed a commit to branch master
in repository gst-plugins-base1.0.
commit 4a8f23421a9fdf3e6fe4b2606bba9a3347405778
Merge: dc3ace8 c372e7c
Author: Sebastian Dröge <slomo at circular-chaos.org>
Date: Tue Sep 24 16:24:37 2013 +0200
Merge tag 'upstream/1.2.0'
Upstream version 1.2.0
Conflicts:
ChangeLog
NEWS
RELEASE
configure
configure.ac
docs/libs/html/gst-plugins-base-libs-gstpluginsbaseversion.html
docs/libs/html/index.html
docs/plugins/html/gst-plugins-base-plugins-plugin-adder.html
docs/plugins/html/gst-plugins-base-plugins-plugin-alsa.html
docs/plugins/html/gst-plugins-base-plugins-plugin-app.html
docs/plugins/html/gst-plugins-base-plugins-plugin-audioconvert.html
docs/plugins/html/gst-plugins-base-plugins-plugin-audiorate.html
docs/plugins/html/gst-plugins-base-plugins-plugin-audioresample.html
docs/plugins/html/gst-plugins-base-plugins-plugin-audiotestsrc.html
docs/plugins/html/gst-plugins-base-plugins-plugin-cdparanoia.html
docs/plugins/html/gst-plugins-base-plugins-plugin-encoding.html
docs/plugins/html/gst-plugins-base-plugins-plugin-gio.html
docs/plugins/html/gst-plugins-base-plugins-plugin-libvisual.html
docs/plugins/html/gst-plugins-base-plugins-plugin-ogg.html
docs/plugins/html/gst-plugins-base-plugins-plugin-pango.html
docs/plugins/html/gst-plugins-base-plugins-plugin-playback.html
docs/plugins/html/gst-plugins-base-plugins-plugin-subparse.html
docs/plugins/html/gst-plugins-base-plugins-plugin-tcp.html
docs/plugins/html/gst-plugins-base-plugins-plugin-theora.html
docs/plugins/html/gst-plugins-base-plugins-plugin-typefindfunctions.html
docs/plugins/html/gst-plugins-base-plugins-plugin-videoconvert.html
docs/plugins/html/gst-plugins-base-plugins-plugin-videorate.html
docs/plugins/html/gst-plugins-base-plugins-plugin-videoscale.html
docs/plugins/html/gst-plugins-base-plugins-plugin-videotestsrc.html
docs/plugins/html/gst-plugins-base-plugins-plugin-volume.html
docs/plugins/html/gst-plugins-base-plugins-plugin-vorbis.html
docs/plugins/html/gst-plugins-base-plugins-plugin-ximagesink.html
docs/plugins/html/gst-plugins-base-plugins-plugin-xvimagesink.html
docs/plugins/html/index.html
docs/plugins/inspect/plugin-adder.xml
docs/plugins/inspect/plugin-alsa.xml
docs/plugins/inspect/plugin-app.xml
docs/plugins/inspect/plugin-audioconvert.xml
docs/plugins/inspect/plugin-audiorate.xml
docs/plugins/inspect/plugin-audioresample.xml
docs/plugins/inspect/plugin-audiotestsrc.xml
docs/plugins/inspect/plugin-cdparanoia.xml
docs/plugins/inspect/plugin-encoding.xml
docs/plugins/inspect/plugin-gio.xml
docs/plugins/inspect/plugin-ivorbisdec.xml
docs/plugins/inspect/plugin-libvisual.xml
docs/plugins/inspect/plugin-ogg.xml
docs/plugins/inspect/plugin-pango.xml
docs/plugins/inspect/plugin-playback.xml
docs/plugins/inspect/plugin-subparse.xml
docs/plugins/inspect/plugin-tcp.xml
docs/plugins/inspect/plugin-theora.xml
docs/plugins/inspect/plugin-typefindfunctions.xml
docs/plugins/inspect/plugin-videoconvert.xml
docs/plugins/inspect/plugin-videorate.xml
docs/plugins/inspect/plugin-videoscale.xml
docs/plugins/inspect/plugin-videotestsrc.xml
docs/plugins/inspect/plugin-volume.xml
docs/plugins/inspect/plugin-vorbis.xml
docs/plugins/inspect/plugin-ximagesink.xml
docs/plugins/inspect/plugin-xvimagesink.xml
gst-plugins-base.doap
gst-plugins-base.spec
po/af.gmo
po/af.po
po/az.gmo
po/az.po
po/bg.gmo
po/bg.po
po/ca.gmo
po/ca.po
po/cs.gmo
po/cs.po
po/da.gmo
po/da.po
po/de.gmo
po/de.po
po/el.gmo
po/el.po
po/en_GB.gmo
po/en_GB.po
po/eo.gmo
po/eo.po
po/es.gmo
po/es.po
po/eu.gmo
po/eu.po
po/fi.gmo
po/fi.po
po/fr.gmo
po/fr.po
po/gl.gmo
po/gl.po
po/gst-plugins-base-1.0.pot
po/hr.gmo
po/hr.po
po/hu.gmo
po/hu.po
po/id.gmo
po/id.po
po/it.gmo
po/it.po
po/ja.gmo
po/ja.po
po/lt.gmo
po/lt.po
po/lv.gmo
po/lv.po
po/nb.gmo
po/nb.po
po/nl.gmo
po/nl.po
po/or.gmo
po/or.po
po/pl.gmo
po/pl.po
po/pt_BR.gmo
po/pt_BR.po
po/ro.gmo
po/ro.po
po/ru.gmo
po/ru.po
po/sk.gmo
po/sk.po
po/sl.gmo
po/sl.po
po/sq.gmo
po/sq.po
po/sr.gmo
po/sr.po
po/sv.gmo
po/sv.po
po/tr.gmo
po/tr.po
po/uk.gmo
po/uk.po
po/vi.gmo
po/vi.po
po/zh_CN.gmo
po/zh_CN.po
win32/common/_stdint.h
win32/common/config.h
ChangeLog | 158 +++++++++++++++++++-
NEWS | 123 ++++++++++++++-
RELEASE | 32 +---
autogen.sh | 12 +-
common/check.mak | 6 +-
common/extract-release-date-from-doap-file | 8 +-
common/gst.supp | 8 +
common/m4/gst-args.m4 | 9 +-
common/m4/gst-glib2.m4 | 12 +-
common/m4/gst-package-release-datetime.m4 | 4 +-
configure | 59 ++++----
configure.ac | 6 +-
docs/libs/html/annotation-glossary.html | 17 ++-
...st-plugins-base-libs-gstpluginsbaseversion.html | 4 +-
.../html/gst-plugins-base-libs-gstsdpmessage.html | 29 ++--
.../gst-plugins-base-libs-gstvideooverlay.html | 8 +-
docs/libs/html/index.html | 2 +-
docs/libs/html/index.sgml | 4 +-
.../gst-plugins-base-plugins-plugin-adder.html | 2 +-
.../html/gst-plugins-base-plugins-plugin-alsa.html | 2 +-
.../html/gst-plugins-base-plugins-plugin-app.html | 2 +-
...t-plugins-base-plugins-plugin-audioconvert.html | 2 +-
.../gst-plugins-base-plugins-plugin-audiorate.html | 2 +-
...-plugins-base-plugins-plugin-audioresample.html | 2 +-
...t-plugins-base-plugins-plugin-audiotestsrc.html | 2 +-
...gst-plugins-base-plugins-plugin-cdparanoia.html | 2 +-
.../gst-plugins-base-plugins-plugin-encoding.html | 2 +-
.../html/gst-plugins-base-plugins-plugin-gio.html | 2 +-
.../gst-plugins-base-plugins-plugin-libvisual.html | 2 +-
.../html/gst-plugins-base-plugins-plugin-ogg.html | 2 +-
.../gst-plugins-base-plugins-plugin-pango.html | 2 +-
.../gst-plugins-base-plugins-plugin-playback.html | 2 +-
.../gst-plugins-base-plugins-plugin-subparse.html | 2 +-
.../html/gst-plugins-base-plugins-plugin-tcp.html | 2 +-
.../gst-plugins-base-plugins-plugin-theora.html | 2 +-
...gins-base-plugins-plugin-typefindfunctions.html | 2 +-
...t-plugins-base-plugins-plugin-videoconvert.html | 2 +-
.../gst-plugins-base-plugins-plugin-videorate.html | 2 +-
...gst-plugins-base-plugins-plugin-videoscale.html | 2 +-
...t-plugins-base-plugins-plugin-videotestsrc.html | 2 +-
.../gst-plugins-base-plugins-plugin-volume.html | 2 +-
.../gst-plugins-base-plugins-plugin-vorbis.html | 2 +-
...gst-plugins-base-plugins-plugin-ximagesink.html | 2 +-
...st-plugins-base-plugins-plugin-xvimagesink.html | 2 +-
docs/plugins/html/index.html | 2 +-
docs/plugins/inspect/plugin-adder.xml | 2 +-
docs/plugins/inspect/plugin-alsa.xml | 2 +-
docs/plugins/inspect/plugin-app.xml | 2 +-
docs/plugins/inspect/plugin-audioconvert.xml | 2 +-
docs/plugins/inspect/plugin-audiorate.xml | 2 +-
docs/plugins/inspect/plugin-audioresample.xml | 2 +-
docs/plugins/inspect/plugin-audiotestsrc.xml | 2 +-
docs/plugins/inspect/plugin-cdparanoia.xml | 2 +-
docs/plugins/inspect/plugin-encoding.xml | 2 +-
docs/plugins/inspect/plugin-gio.xml | 2 +-
docs/plugins/inspect/plugin-ivorbisdec.xml | 2 +-
docs/plugins/inspect/plugin-libvisual.xml | 2 +-
docs/plugins/inspect/plugin-ogg.xml | 2 +-
docs/plugins/inspect/plugin-pango.xml | 2 +-
docs/plugins/inspect/plugin-playback.xml | 2 +-
docs/plugins/inspect/plugin-subparse.xml | 2 +-
docs/plugins/inspect/plugin-tcp.xml | 2 +-
docs/plugins/inspect/plugin-theora.xml | 2 +-
docs/plugins/inspect/plugin-typefindfunctions.xml | 2 +-
docs/plugins/inspect/plugin-videoconvert.xml | 2 +-
docs/plugins/inspect/plugin-videorate.xml | 2 +-
docs/plugins/inspect/plugin-videoscale.xml | 2 +-
docs/plugins/inspect/plugin-videotestsrc.xml | 2 +-
docs/plugins/inspect/plugin-volume.xml | 2 +-
docs/plugins/inspect/plugin-vorbis.xml | 2 +-
docs/plugins/inspect/plugin-ximagesink.xml | 2 +-
docs/plugins/inspect/plugin-xvimagesink.xml | 2 +-
gst-libs/gst/allocators/gstdmabuf.c | 14 +-
gst-libs/gst/pbutils/gstdiscoverer.c | 6 +
gst-libs/gst/rtsp/gstrtspconnection.c | 42 ++----
gst-libs/gst/sdp/gstsdpmessage.c | 14 +-
gst-libs/gst/video/video-frame.c | 4 +-
gst-libs/gst/video/video-orc-dist.c | 2 +-
gst-plugins-base.doap | 10 ++
gst-plugins-base.spec | 2 +-
gst/adder/gstadder.c | 70 ++++-----
gst/playback/gstplaybin2.c | 2 +-
gst/videoscale/gstvideoscaleorc-dist.c | 22 +--
gst/volume/gstvolumeorc-dist.c | 22 +--
po/af.gmo | Bin 525 -> 525 bytes
po/af.po | 2 +-
po/az.gmo | Bin 588 -> 588 bytes
po/az.po | 2 +-
po/bg.gmo | Bin 15986 -> 15986 bytes
po/bg.po | 2 +-
po/ca.gmo | Bin 12557 -> 12557 bytes
po/ca.po | 2 +-
po/cs.gmo | Bin 13945 -> 13945 bytes
po/cs.po | 2 +-
po/da.gmo | Bin 12481 -> 12481 bytes
po/da.po | 2 +-
po/de.gmo | Bin 13033 -> 13033 bytes
po/de.po | 2 +-
po/el.gmo | Bin 16109 -> 16109 bytes
po/el.po | 2 +-
po/en_GB.gmo | Bin 529 -> 529 bytes
po/en_GB.po | 2 +-
po/eo.gmo | Bin 3409 -> 3409 bytes
po/eo.po | 2 +-
po/es.gmo | Bin 12536 -> 12536 bytes
po/es.po | 2 +-
po/eu.gmo | Bin 8196 -> 8196 bytes
po/eu.po | 2 +-
po/fi.gmo | Bin 11553 -> 11553 bytes
po/fi.po | 2 +-
po/fr.gmo | Bin 12930 -> 12930 bytes
po/fr.po | 2 +-
po/gl.gmo | Bin 13234 -> 13234 bytes
po/gl.po | 2 +-
po/gst-plugins-base-1.0.pot | 4 +-
po/hr.gmo | Bin 11851 -> 11851 bytes
po/hr.po | 2 +-
po/hu.gmo | Bin 13051 -> 13051 bytes
po/hu.po | 2 +-
po/id.gmo | Bin 12014 -> 12014 bytes
po/id.po | 2 +-
po/it.gmo | Bin 8432 -> 8432 bytes
po/it.po | 2 +-
po/ja.gmo | Bin 10257 -> 10257 bytes
po/ja.po | 2 +-
po/lt.gmo | Bin 6356 -> 6356 bytes
po/lt.po | 2 +-
po/lv.gmo | Bin 12249 -> 12249 bytes
po/lv.po | 2 +-
po/nb.gmo | Bin 12334 -> 12334 bytes
po/nb.po | 2 +-
po/nl.gmo | Bin 13433 -> 13433 bytes
po/nl.po | 2 +-
po/or.gmo | Bin 604 -> 604 bytes
po/or.po | 2 +-
po/pl.gmo | Bin 13503 -> 13503 bytes
po/pl.po | 2 +-
po/pt_BR.gmo | Bin 13520 -> 13520 bytes
po/pt_BR.po | 2 +-
po/ro.gmo | Bin 7912 -> 7912 bytes
po/ro.po | 2 +-
po/ru.gmo | Bin 16887 -> 16887 bytes
po/ru.po | 2 +-
po/sk.gmo | Bin 11823 -> 11823 bytes
po/sk.po | 2 +-
po/sl.gmo | Bin 12719 -> 12719 bytes
po/sl.po | 2 +-
po/sq.gmo | Bin 538 -> 538 bytes
po/sq.po | 2 +-
po/sr.gmo | Bin 15709 -> 15709 bytes
po/sr.po | 2 +-
po/sv.gmo | Bin 7936 -> 7936 bytes
po/sv.po | 2 +-
po/tr.gmo | Bin 12710 -> 12710 bytes
po/tr.po | 2 +-
po/uk.gmo | Bin 17835 -> 17835 bytes
po/uk.po | 2 +-
po/vi.gmo | Bin 15389 -> 15389 bytes
po/vi.po | 2 +-
po/zh_CN.gmo | Bin 5928 -> 5928 bytes
po/zh_CN.po | 2 +-
tests/check/Makefile.in | 2 +
win32/common/_stdint.h | 2 +-
win32/common/config.h | 8 +-
164 files changed, 605 insertions(+), 306 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gstreamer/gst-plugins-base1.0.git
More information about the Pkg-gstreamer-commits
mailing list