[Pkg-gstreamer-commits] [gst-plugins-base1.0] 02/04: Merge tag 'upstream/1.2.3'

Sebastian Dröge slomo at moszumanska.debian.org
Sun Feb 9 10:35:58 UTC 2014


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 9e322a7baf3cb7bb904af36bf984518b3aacd52f
Merge: 2da4512 696dd44
Author: Sebastian Dröge <sebastian at centricular.com>
Date:   Sun Feb 9 11:14:02 2014 +0100

    Merge tag 'upstream/1.2.3'
    
    Upstream version 1.2.3
    
    Conflicts:
    	ChangeLog
    	NEWS
    	RELEASE
    	configure
    	configure.ac
    	docs/libs/html/annotation-glossary.html
    	docs/libs/html/gst-plugins-base-libs-gstpluginsbaseversion.html
    	docs/libs/html/index.html
    	docs/libs/html/index.sgml
    	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-libs/gst/video/gstvideodecoder.c
    	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                                          |  409 ++++++-
 Makefile.in                                        |    5 +-
 NEWS                                               |    2 +-
 RELEASE                                            |   35 +-
 aclocal.m4                                         |    6 +-
 common/Makefile.in                                 |    2 +-
 common/m4/Makefile.in                              |    2 +-
 configure                                          |   35 +-
 configure.ac                                       |    5 +-
 docs/Makefile.in                                   |    2 +-
 docs/design/Makefile.am                            |    8 +-
 docs/design/Makefile.in                            |   10 +-
 docs/design/draft-hw-acceleration.txt              |  427 +++++++
 docs/design/draft-subtitle-overlays.txt            |  546 +++++++++
 docs/design/part-interlaced-video.txt              |  107 ++
 docs/design/part-mediatype-audio-raw.txt           |   76 ++
 docs/design/part-mediatype-text-raw.txt            |   28 +
 docs/design/part-mediatype-video-raw.txt           | 1190 ++++++++++++++++++++
 docs/libs/Makefile.in                              |    2 +-
 docs/libs/html/annotation-glossary.html            |   43 +-
 .../gst-plugins-base-libs-GstVideoDecoder.html     |    4 +-
 .../gst-plugins-base-libs-GstVideoEncoder.html     |    2 +
 .../gst-plugins-base-libs-gstaudiodecoder.html     |    4 +-
 .../gst-plugins-base-libs-gstaudioencoder.html     |    4 +-
 ...st-plugins-base-libs-gstpluginsbaseversion.html |    2 +-
 docs/libs/html/index.html                          |    2 +-
 docs/libs/html/index.sgml                          |   12 +-
 docs/plugins/Makefile.in                           |    2 +-
 .../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 +-
 ext/Makefile.in                                    |    2 +-
 ext/alsa/Makefile.in                               |    2 +-
 ext/cdparanoia/Makefile.in                         |    2 +-
 ext/libvisual/Makefile.in                          |    2 +-
 ext/ogg/Makefile.in                                |    2 +-
 ext/ogg/gstoggdemux.c                              |   89 +-
 ext/ogg/gstoggdemux.h                              |    1 +
 ext/pango/Makefile.in                              |    2 +-
 ext/pango/gstbasetextoverlay.c                     |    3 +
 ext/theora/Makefile.in                             |    2 +-
 ext/vorbis/Makefile.in                             |    2 +-
 gst-libs/Makefile.in                               |    2 +-
 gst-libs/gst/Makefile.in                           |    2 +-
 gst-libs/gst/allocators/Makefile.in                |    2 +-
 gst-libs/gst/app/Makefile.in                       |    2 +-
 gst-libs/gst/audio/Makefile.in                     |    2 +-
 gst-libs/gst/audio/gstaudiobasesink.c              |   23 +-
 gst-libs/gst/audio/gstaudiobasesrc.c               |   10 +-
 gst-libs/gst/audio/gstaudiodecoder.c               |  360 +++++-
 gst-libs/gst/audio/gstaudioencoder.c               |   38 +-
 gst-libs/gst/fft/Makefile.in                       |    2 +-
 gst-libs/gst/pbutils/Makefile.in                   |    2 +-
 gst-libs/gst/riff/Makefile.in                      |    2 +-
 gst-libs/gst/riff/riff-ids.h                       |    1 +
 gst-libs/gst/rtp/Makefile.in                       |    2 +-
 gst-libs/gst/rtsp/Makefile.in                      |    2 +-
 gst-libs/gst/rtsp/gstrtsptransport.c               |   19 +-
 gst-libs/gst/rtsp/gstrtsptransport.h               |    3 +
 gst-libs/gst/sdp/Makefile.in                       |    2 +-
 gst-libs/gst/tag/Makefile.in                       |    2 +-
 gst-libs/gst/video/Makefile.in                     |    2 +-
 gst-libs/gst/video/gstvideodecoder.c               |  128 ++-
 gst-libs/gst/video/gstvideoencoder.c               |   49 +-
 gst-libs/gst/video/video-chroma.c                  |  264 ++++-
 gst-plugins-base.doap                              |   10 +
 gst-plugins-base.spec                              |    2 +-
 gst/Makefile.in                                    |    2 +-
 gst/adder/Makefile.in                              |    2 +-
 gst/app/Makefile.in                                |    2 +-
 gst/audioconvert/Makefile.in                       |    2 +-
 gst/audiorate/Makefile.in                          |    2 +-
 gst/audioresample/Makefile.in                      |    2 +-
 gst/audiotestsrc/Makefile.in                       |    2 +-
 gst/encoding/Makefile.in                           |    2 +-
 gst/gio/Makefile.in                                |    2 +-
 gst/playback/Makefile.in                           |    2 +-
 gst/subparse/Makefile.in                           |    2 +-
 gst/tcp/Makefile.in                                |    2 +-
 gst/typefind/Makefile.in                           |    2 +-
 gst/videoconvert/Makefile.in                       |    2 +-
 gst/videoconvert/gstvideoconvert.c                 |   98 +-
 gst/videorate/Makefile.in                          |    2 +-
 gst/videoscale/Makefile.in                         |    2 +-
 gst/videotestsrc/Makefile.in                       |    2 +-
 gst/videotestsrc/gstvideotestsrc.c                 |    8 +
 gst/volume/Makefile.in                             |    2 +-
 m4/Makefile.in                                     |    2 +-
 pkgconfig/Makefile.in                              |    2 +-
 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 14195 -> 14195 bytes
 po/da.po                                           |    2 +-
 po/de.gmo                                          |  Bin 14887 -> 14887 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                        |    8 +-
 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 13092 -> 14269 bytes
 po/id.po                                           |   46 +-
 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 -> 14007 bytes
 po/nb.po                                           |   53 +-
 po/nl.gmo                                          |  Bin 13433 -> 14663 bytes
 po/nl.po                                           |   46 +-
 po/or.gmo                                          |  Bin 604 -> 604 bytes
 po/or.po                                           |    2 +-
 po/pl.gmo                                          |  Bin 14737 -> 14737 bytes
 po/pl.po                                           |    2 +-
 po/pt_BR.gmo                                       |  Bin 13520 -> 15350 bytes
 po/pt_BR.po                                        |   51 +-
 po/ro.gmo                                          |  Bin 7912 -> 7912 bytes
 po/ro.po                                           |    2 +-
 po/ru.gmo                                          |  Bin 18379 -> 18379 bytes
 po/ru.po                                           |    2 +-
 po/sk.gmo                                          |  Bin 11823 -> 13990 bytes
 po/sk.po                                           |  217 ++--
 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 17135 -> 18700 bytes
 po/sr.po                                           |   46 +-
 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 19449 -> 19449 bytes
 po/uk.po                                           |    2 +-
 po/vi.gmo                                          |  Bin 16577 -> 16577 bytes
 po/vi.po                                           |    2 +-
 po/zh_CN.gmo                                       |  Bin 5928 -> 5928 bytes
 po/zh_CN.po                                        |    2 +-
 sys/Makefile.in                                    |    2 +-
 sys/ximage/Makefile.in                             |    2 +-
 sys/xvimage/Makefile.in                            |    2 +-
 sys/xvimage/xvimagesink.c                          |   17 +-
 tests/Makefile.in                                  |    2 +-
 tests/check/Makefile.am                            |   22 +
 tests/check/Makefile.in                            |  131 ++-
 tests/check/libs/audiodecoder.c                    |  437 +++++++
 tests/check/libs/videodecoder.c                    |  581 ++++++++++
 tests/examples/Makefile.in                         |    2 +-
 tests/examples/app/Makefile.in                     |    2 +-
 tests/examples/audio/Makefile.in                   |    2 +-
 tests/examples/dynamic/Makefile.in                 |    2 +-
 tests/examples/encoding/Makefile.in                |    2 +-
 tests/examples/fft/Makefile.in                     |    2 +-
 tests/examples/gio/Makefile.in                     |    2 +-
 tests/examples/overlay/Makefile.in                 |    2 +-
 tests/examples/playback/Makefile.in                |    2 +-
 tests/examples/playrec/Makefile.in                 |    2 +-
 tests/examples/seek/Makefile.in                    |    2 +-
 tests/examples/snapshot/Makefile.in                |    2 +-
 tests/files/Makefile.in                            |    2 +-
 tests/icles/Makefile.in                            |    2 +-
 tests/icles/playback/Makefile.in                   |    2 +-
 tools/Makefile.in                                  |    2 +-
 win32/common/_stdint.h                             |    4 +-
 win32/common/config.h                              |    8 +-
 win32/common/libgstrtsp.def                        |    1 +
 245 files changed, 5363 insertions(+), 677 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