[Pkg-gstreamer-commits] [gstreamer-vaapi] 01/01: Merge branch 'upstream'
Vincent Cheng
vcheng at moszumanska.debian.org
Tue Jun 3 08:14:20 UTC 2014
This is an automated email from the git hooks/post-receive script.
vcheng pushed a commit to branch master
in repository gstreamer-vaapi.
commit 3e7d5be425e72e2ac799b9c8b7757cd6b94dda3b
Merge: eea4a2c c9af9a8
Author: Vincent Cheng <vcheng at debian.org>
Date: Tue Jun 3 01:13:01 2014 -0700
Merge branch 'upstream'
Conflicts:
debian.upstream/control.in
debian.upstream/copyright
NEWS | 16 +-
README | 35 +-
configure.ac | 77 +-
docs/reference/libs/libs-sections.txt | 1 +
ext/codecparsers | 2 +-
ext/videoutils | 2 +-
gst-libs/gst/Makefile.am | 2 +-
gst-libs/gst/base/Makefile.am | 48 +
gst-libs/gst/base/gstbitwriter.c | 278 +++
gst-libs/gst/base/gstbitwriter.h | 361 +++
gst-libs/gst/vaapi/Makefile.am | 62 +-
gst-libs/gst/vaapi/glibcompat.h | 13 +-
gst-libs/gst/vaapi/gstcompat.h | 38 +-
gst-libs/gst/vaapi/gstvaapicodec_objects.c | 225 +-
gst-libs/gst/vaapi/gstvaapicodec_objects.h | 180 +-
gst-libs/gst/vaapi/gstvaapicodedbuffer.c | 232 ++
gst-libs/gst/vaapi/gstvaapicodedbuffer.h | 53 +
gst-libs/gst/vaapi/gstvaapicodedbuffer_priv.h | 78 +
gst-libs/gst/vaapi/gstvaapicodedbufferpool.c | 130 ++
.../gst/vaapi/gstvaapicodedbufferpool.h | 31 +-
gst-libs/gst/vaapi/gstvaapicodedbufferproxy.c | 253 +++
gst-libs/gst/vaapi/gstvaapicodedbufferproxy.h | 82 +
gst-libs/gst/vaapi/gstvaapicodedbufferproxy_priv.h | 70 +
gst-libs/gst/vaapi/gstvaapicontext.c | 1102 +++------
gst-libs/gst/vaapi/gstvaapicontext.h | 157 +-
gst-libs/gst/vaapi/gstvaapicontext_overlay.c | 451 ++++
...tvaapiutils_x11.h => gstvaapicontext_overlay.h} | 44 +-
gst-libs/gst/vaapi/gstvaapidecoder.c | 21 +-
gst-libs/gst/vaapi/gstvaapidecoder_h264.c | 187 +-
gst-libs/gst/vaapi/gstvaapidecoder_objects.c | 640 +++---
gst-libs/gst/vaapi/gstvaapidecoder_objects.h | 209 +-
gst-libs/gst/vaapi/gstvaapidecoder_priv.h | 3 +-
gst-libs/gst/vaapi/gstvaapidecoder_unit.h | 2 +
gst-libs/gst/vaapi/gstvaapidisplay.c | 2387 +++++++++++---------
gst-libs/gst/vaapi/gstvaapidisplay.h | 144 +-
gst-libs/gst/vaapi/gstvaapidisplay_drm.c | 498 ++--
gst-libs/gst/vaapi/gstvaapidisplay_drm.h | 9 +-
gst-libs/gst/vaapi/gstvaapidisplay_drm_priv.h | 27 +-
gst-libs/gst/vaapi/gstvaapidisplay_glx.c | 68 +-
gst-libs/gst/vaapi/gstvaapidisplay_glx.h | 4 +-
gst-libs/gst/vaapi/gstvaapidisplay_glx_priv.h | 16 +-
gst-libs/gst/vaapi/gstvaapidisplay_priv.h | 145 +-
gst-libs/gst/vaapi/gstvaapidisplay_wayland.c | 506 ++---
gst-libs/gst/vaapi/gstvaapidisplay_wayland.h | 6 +-
gst-libs/gst/vaapi/gstvaapidisplay_wayland_priv.h | 43 +-
gst-libs/gst/vaapi/gstvaapidisplay_x11.c | 700 +++---
gst-libs/gst/vaapi/gstvaapidisplay_x11.h | 10 +-
gst-libs/gst/vaapi/gstvaapidisplay_x11_priv.h | 41 +-
gst-libs/gst/vaapi/gstvaapidisplaycache.c | 334 ++-
gst-libs/gst/vaapi/gstvaapidisplaycache.h | 55 +-
gst-libs/gst/vaapi/gstvaapiencoder.c | 1099 +++++++++
gst-libs/gst/vaapi/gstvaapiencoder.h | 178 ++
gst-libs/gst/vaapi/gstvaapiencoder_h264.c | 2242 ++++++++++++++++++
gst-libs/gst/vaapi/gstvaapiencoder_h264.h | 78 +
gst-libs/gst/vaapi/gstvaapiencoder_mpeg2.c | 1015 +++++++++
gst-libs/gst/vaapi/gstvaapiencoder_mpeg2.h | 57 +
gst-libs/gst/vaapi/gstvaapiencoder_mpeg2_priv.h | 66 +
gst-libs/gst/vaapi/gstvaapiencoder_objects.c | 460 ++++
gst-libs/gst/vaapi/gstvaapiencoder_objects.h | 271 +++
gst-libs/gst/vaapi/gstvaapiencoder_priv.h | 345 +++
gst-libs/gst/vaapi/gstvaapifilter.c | 28 +-
gst-libs/gst/vaapi/gstvaapiminiobject.h | 1 +
gst-libs/gst/vaapi/gstvaapiobject.h | 18 +
gst-libs/gst/vaapi/gstvaapiobject_priv.h | 4 +-
gst-libs/gst/vaapi/gstvaapipixmap_priv.h | 2 +-
gst-libs/gst/vaapi/gstvaapipixmap_x11.c | 4 +-
gst-libs/gst/vaapi/gstvaapiprofile.c | 100 +-
gst-libs/gst/vaapi/gstvaapiprofile.h | 48 +-
gst-libs/gst/vaapi/gstvaapisurface.c | 5 +-
gst-libs/gst/vaapi/gstvaapisurface.h | 33 +-
gst-libs/gst/vaapi/gstvaapisurfaceproxy.c | 63 +-
gst-libs/gst/vaapi/gstvaapisurfaceproxy.h | 3 +
gst-libs/gst/vaapi/gstvaapisurfaceproxy_priv.h | 1 +
gst-libs/gst/vaapi/gstvaapitypes.h | 29 +-
gst-libs/gst/vaapi/gstvaapiutils.c | 553 +++--
gst-libs/gst/vaapi/gstvaapiutils.h | 66 +-
gst-libs/gst/vaapi/gstvaapiutils_core.c | 77 +
.../gst/vaapi/gstvaapiutils_core.h | 16 +-
gst-libs/gst/vaapi/gstvaapiutils_glx.c | 1294 +++++------
gst-libs/gst/vaapi/gstvaapiutils_glx.h | 160 +-
gst-libs/gst/vaapi/gstvaapiutils_h264.c | 399 ++++
gst-libs/gst/vaapi/gstvaapiutils_h264.h | 95 +
gst-libs/gst/vaapi/gstvaapiutils_h264_priv.h | 95 +
gst-libs/gst/vaapi/gstvaapiutils_mpeg2.c | 284 +++
gst-libs/gst/vaapi/gstvaapiutils_mpeg2.h | 70 +
gst-libs/gst/vaapi/gstvaapiutils_mpeg2_priv.h | 97 +
gst-libs/gst/vaapi/gstvaapiutils_x11.c | 174 +-
gst-libs/gst/vaapi/gstvaapiutils_x11.h | 19 +-
gst-libs/gst/vaapi/gstvaapivalue.c | 84 +-
gst-libs/gst/vaapi/gstvaapivalue.h | 79 +-
gst-libs/gst/vaapi/gstvaapivideopool.h | 4 +-
gst-libs/gst/vaapi/gstvaapiwindow_glx.c | 4 +-
gst-libs/gst/vaapi/gstvaapiwindow_priv.h | 2 +-
gst-libs/gst/vaapi/gstvaapiwindow_x11.c | 4 +-
.../gst/vaapi/libgstvaapi_priv_check.h | 25 +-
gst-libs/gst/vaapi/video-format.c | 367 +--
gst-libs/gst/vaapi/video-format.h | 30 +-
gst-libs/gst/video/Makefile.am | 6 +-
gst/vaapi/Makefile.am | 19 +
gst/vaapi/gstvaapi.c | 14 +
gst/vaapi/gstvaapidecode.c | 288 +--
gst/vaapi/gstvaapidecode.h | 14 +-
gst/vaapi/gstvaapidownload.c | 109 +-
gst/vaapi/gstvaapidownload.h | 3 +-
gst/vaapi/gstvaapiencode.c | 742 ++++++
gst/vaapi/gstvaapiencode.h | 95 +
gst/vaapi/gstvaapiencode_h264.c | 412 ++++
gst/vaapi/gstvaapiencode_h264.h | 72 +
gst/vaapi/gstvaapiencode_mpeg2.c | 179 ++
gst/vaapi/gstvaapiencode_mpeg2.h | 74 +
gst/vaapi/gstvaapipluginbase.c | 589 +++++
gst/vaapi/gstvaapipluginbase.h | 221 ++
gst/vaapi/gstvaapipluginutil.c | 735 +++---
gst/vaapi/gstvaapipluginutil.h | 60 +-
gst/vaapi/gstvaapipostproc.c | 518 ++---
gst/vaapi/gstvaapipostproc.h | 24 +-
gst/vaapi/gstvaapisink.c | 542 ++---
gst/vaapi/gstvaapisink.h | 15 +-
gst/vaapi/gstvaapiupload.c | 74 +-
gst/vaapi/gstvaapiupload.h | 7 +-
gst/vaapi/gstvaapiuploader.c | 47 +-
gst/vaapi/gstvaapivideobuffer.c | 6 -
gst/vaapi/gstvaapivideobuffer.h | 4 -
gst/vaapi/gstvaapivideobufferpool.c | 15 +-
gst/vaapi/gstvaapivideobufferpool.h | 15 +
gst/vaapi/gstvaapivideocontext.c | 219 +-
gst/vaapi/gstvaapivideocontext.h | 21 +-
gst/vaapi/gstvaapivideomemory.c | 4 +-
gst/vaapi/gstvaapivideometa.c | 150 +-
gst/vaapi/gstvaapivideometa.h | 14 -
gst/vaapi/gstvaapivideometa_texture.c | 102 +-
gst/vaapi/gstvaapivideometa_texture.h | 6 +
pkgconfig/gstreamer-vaapi-drm.pc.in | 4 +-
pkgconfig/gstreamer-vaapi-glx.pc.in | 4 +-
pkgconfig/gstreamer-vaapi-wayland.pc.in | 4 +-
pkgconfig/gstreamer-vaapi-x11.pc.in | 4 +-
pkgconfig/gstreamer-vaapi.pc.in | 6 +-
tests/Makefile.am | 3 +-
tests/simple-decoder.c | 8 +-
tests/test-display.c | 120 +-
tests/test-filter.c | 6 +-
141 files changed, 18403 insertions(+), 7397 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gstreamer/gstreamer-vaapi.git
More information about the Pkg-gstreamer-commits
mailing list