diff -Nru gstreamer-vaapi-0.5.10/AUTHORS gstreamer-vaapi-0.6.0/AUTHORS
--- gstreamer-vaapi-0.5.10/AUTHORS	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/AUTHORS	2015-07-15 12:47:43.000000000 +0000
@@ -1,6 +1,7 @@
 Maintainers:
 
 Gwenole Beauchesne      - Lead developer
+Sreerenj Balachandran   - Lead developer
 Halley Zhao             - MPEG-4:2 decoder
 
 This project is maintained by Intel Corporation.
@@ -8,6 +9,7 @@
 Contributors (sorted by first name):
 
 Cong Zhong
+Changzhi Wei
 Emilio Lopez
 Fabrice Bellet
 Feng Yuan
@@ -21,12 +23,12 @@
 Lionel Landwerlin
 Matthew Waters
 Matthieu Bouron
+Michael Olbrich
 Nicolas Dufresne
 Philip Lorenz
 Robert Bradford
 Ross Burton
 Simon Farnsworth
-Sreerenj Balachandran
 Thibault Saunier
 Victor Manuel Jaquez Leal
 Xiaowei Li
diff -Nru gstreamer-vaapi-0.5.10/build-aux/ltmain.sh gstreamer-vaapi-0.6.0/build-aux/ltmain.sh
--- gstreamer-vaapi-0.5.10/build-aux/ltmain.sh	2015-02-03 08:39:51.000000000 +0000
+++ gstreamer-vaapi-0.6.0/build-aux/ltmain.sh	2015-07-15 12:50:31.000000000 +0000
@@ -70,7 +70,7 @@
 #         compiler:		$LTCC
 #         compiler flags:		$LTCFLAGS
 #         linker:		$LD (gnu? $with_gnu_ld)
-#         $progname:	(GNU libtool) 2.4.2 Debian-2.4.2-1.10ubuntu1
+#         $progname:	(GNU libtool) 2.4.2 Debian-2.4.2-1.11
 #         automake:	$automake_version
 #         autoconf:	$autoconf_version
 #
@@ -80,7 +80,7 @@
 
 PROGRAM=libtool
 PACKAGE=libtool
-VERSION="2.4.2 Debian-2.4.2-1.10ubuntu1"
+VERSION="2.4.2 Debian-2.4.2-1.11"
 TIMESTAMP=""
 package_revision=1.3337
 
diff -Nru gstreamer-vaapi-0.5.10/config.h.in gstreamer-vaapi-0.6.0/config.h.in
--- gstreamer-vaapi-0.5.10/config.h.in	2015-02-03 08:39:53.000000000 +0000
+++ gstreamer-vaapi-0.6.0/config.h.in	2015-07-15 12:50:33.000000000 +0000
@@ -1,11 +1,35 @@
 /* config.h.in.  Generated from configure.ac by autoheader.  */
 
+/* Defined to the string representation of GStreamer version */
+#undef GST_API_VERSION_S
+
+/* Defined to the string representation of GStreamer API version */
+#undef GST_PKG_VERSION_S
+
+/* Defined to the string representation of gstreamer-vaapi major version */
+#undef GST_VAAPI_MAJOR_VERSION_S
+
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #undef HAVE_DLFCN_H
 
 /* Define to 1 if you have the <drm_fourcc.h> header file. */
 #undef HAVE_DRM_FOURCC_H
 
+/* Define to 1 if you have the <EGL/egl.h> header file. */
+#undef HAVE_EGL_EGL_H
+
+/* Define to 1 if you have the <GLES2/gl2ext.h> header file. */
+#undef HAVE_GLES2_GL2EXT_H
+
+/* Define to 1 if you have the <GLES2/gl2.h> header file. */
+#undef HAVE_GLES2_GL2_H
+
+/* Define to 1 if you have the <GLES3/gl3ext.h> header file. */
+#undef HAVE_GLES3_GL3EXT_H
+
+/* Define to 1 if you have the <GLES3/gl3.h> header file. */
+#undef HAVE_GLES3_GL3_H
+
 /* Define to 1 if you have the <GL/glext.h> header file. */
 #undef HAVE_GL_GLEXT_H
 
@@ -15,8 +39,8 @@
 /* Define to 1 if you have the <GL/gl.h> header file. */
 #undef HAVE_GL_GL_H
 
-/* Defined to 1 if GstVideoOverlayComposition API supports HW hints. */
-#undef HAVE_GST_VIDEO_OVERLAY_HWCAPS
+/* Define to 1 if you have the <gst/gl/gl.h> header file. */
+#undef HAVE_GST_GL_GL_H
 
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
@@ -48,6 +72,9 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
+/* Define to 1 if you have the <va/va_dec_hevc.h> header file. */
+#undef HAVE_VA_VA_DEC_HEVC_H
+
 /* Define to 1 if you have the <va/va_dec_jpeg.h> header file. */
 #undef HAVE_VA_VA_DEC_JPEG_H
 
@@ -60,9 +87,18 @@
 /* Define to 1 if you have the <va/va_enc_h264.h> header file. */
 #undef HAVE_VA_VA_ENC_H264_H
 
+/* Define to 1 if you have the <va/va_enc_hevc.h> header file. */
+#undef HAVE_VA_VA_ENC_HEVC_H
+
+/* Define to 1 if you have the <va/va_enc_jpeg.h> header file. */
+#undef HAVE_VA_VA_ENC_JPEG_H
+
 /* Define to 1 if you have the <va/va_enc_mpeg2.h> header file. */
 #undef HAVE_VA_VA_ENC_MPEG2_H
 
+/* Define to 1 if you have the <va/va_enc_vp8.h> header file. */
+#undef HAVE_VA_VA_ENC_VP8_H
+
 /* Define to 1 if you have the <wayland-client.h> header file. */
 #undef HAVE_WAYLAND_CLIENT_H
 
@@ -124,21 +160,42 @@
 /* Defined to 1 if DRM is enabled */
 #undef USE_DRM
 
+/* Defined to 1 if EGL is enabled */
+#undef USE_EGL
+
 /* Defined to 1 if video encoders are used */
 #undef USE_ENCODERS
 
+/* Defined to the set of enabled OpenGL ES APIs */
+#undef USE_GLES_VERSION_MASK
+
 /* Defined to 1 if GLX is enabled */
 #undef USE_GLX
 
+/* Defined to 1 if GStreamer OpenGL helper libraries are available */
+#undef USE_GST_GL_HELPERS
+
+/* Defined to 1 if H265 encoder is used */
+#undef USE_H265_ENCODER
+
+/* Defined to 1 if HEVC decoder is used */
+#undef USE_HEVC_DECODER
+
 /* Defined to 1 if JPEG decoder is used */
 #undef USE_JPEG_DECODER
 
+/* Defined to 1 if JPEG encoder is used */
+#undef USE_JPEG_ENCODER
+
 /* Defined to 1 if video post-processing is used */
 #undef USE_VA_VPP
 
 /* Defined to 1 if VP8 decoder is used */
 #undef USE_VP8_DECODER
 
+/* Defined to 1 if VP8 encoder is used */
+#undef USE_VP8_ENCODER
+
 /* Defined to 1 if WAYLAND is enabled */
 #undef USE_WAYLAND
 
diff -Nru gstreamer-vaapi-0.5.10/configure gstreamer-vaapi-0.6.0/configure
--- gstreamer-vaapi-0.5.10/configure	2015-02-03 08:39:53.000000000 +0000
+++ gstreamer-vaapi-0.6.0/configure	2015-07-15 12:50:33.000000000 +0000
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for gst_vaapi 0.5.10.
+# Generated by GNU Autoconf 2.69 for gst_vaapi 0.6.0.
 #
-# Report bugs to <gwenole.beauchesne@intel.com>.
+# Report bugs to <gwenole.beauchesne@intel.com, sreerenj.balachandran@intel.com>.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -275,7 +275,8 @@
     $as_echo "$0: be upgraded to zsh 4.3.4 or later."
   else
     $as_echo "$0: Please tell bug-autoconf@gnu.org and
-$0: gwenole.beauchesne@intel.com about your system,
+$0: gwenole.beauchesne@intel.com,
+$0: sreerenj.balachandran@intel.com about your system,
 $0: including any error possibly output before this
 $0: message. Then install a modern shell, or manually run
 $0: the script under such a shell if you do have one."
@@ -650,9 +651,9 @@
 # Identity of this package.
 PACKAGE_NAME='gst_vaapi'
 PACKAGE_TARNAME='gstreamer-vaapi'
-PACKAGE_VERSION='0.5.10'
-PACKAGE_STRING='gst_vaapi 0.5.10'
-PACKAGE_BUGREPORT='gwenole.beauchesne@intel.com'
+PACKAGE_VERSION='0.6.0'
+PACKAGE_STRING='gst_vaapi 0.6.0'
+PACKAGE_BUGREPORT='gwenole.beauchesne@intel.com, sreerenj.balachandran@intel.com'
 PACKAGE_URL=''
 
 ac_unique_file="Makefile.am"
@@ -699,18 +700,28 @@
 pkgconfigdir
 USE_WAYLAND_FALSE
 USE_WAYLAND_TRUE
+USE_EGL_FALSE
+USE_EGL_TRUE
 USE_GLX_FALSE
 USE_GLX_TRUE
 USE_X11_FALSE
 USE_X11_TRUE
 USE_DRM_FALSE
 USE_DRM_TRUE
+USE_HEVC_DECODER_FALSE
+USE_HEVC_DECODER_TRUE
 USE_VP8_DECODER_FALSE
 USE_VP8_DECODER_TRUE
 USE_JPEG_DECODER_FALSE
 USE_JPEG_DECODER_TRUE
 USE_VA_VPP_FALSE
 USE_VA_VPP_TRUE
+USE_H265_ENCODER_FALSE
+USE_H265_ENCODER_TRUE
+USE_VP8_ENCODER_FALSE
+USE_VP8_ENCODER_TRUE
+USE_JPEG_ENCODER_FALSE
+USE_JPEG_ENCODER_TRUE
 USE_ENCODERS_FALSE
 USE_ENCODERS_TRUE
 LIBVA_WAYLAND_LIBS
@@ -725,6 +736,12 @@
 LIBVA_CFLAGS
 WAYLAND_LIBS
 WAYLAND_CFLAGS
+EGL_LIBS
+EGL_CFLAGS
+GLES3_LIBS
+GLES3_CFLAGS
+GLES2_LIBS
+GLES2_CFLAGS
 GL_LIBS
 GL_CFLAGS
 XRENDER_LIBS
@@ -739,14 +756,19 @@
 DRM_CFLAGS
 plugindir
 GST_PLUGIN_PATH_1_0
-GST_PLUGIN_PATH
 GST_PLUGIN_LDFLAGS
 GST_ALL_LDFLAGS
 GST_VAAPI_LT_LDFLAGS
 GST_VAAPI_LT_VERSION
 GST_VAAPI_MAJOR_VERSION
+USE_GST_GL_HELPERS_FALSE
+USE_GST_GL_HELPERS_TRUE
+GST_GL_LIBS
+GST_GL_CFLAGS
 USE_LOCAL_VIDEO_PARSERS_FALSE
 USE_LOCAL_VIDEO_PARSERS_TRUE
+USE_LOCAL_CODEC_PARSERS_H265_FALSE
+USE_LOCAL_CODEC_PARSERS_H265_TRUE
 USE_BUILTIN_LIBVPX_FALSE
 USE_BUILTIN_LIBVPX_TRUE
 USE_LOCAL_CODEC_PARSERS_VP8_FALSE
@@ -778,10 +800,6 @@
 USE_GST_API_1_4p_TRUE
 USE_GST_API_1_2p_FALSE
 USE_GST_API_1_2p_TRUE
-USE_GST_API_1_0p_FALSE
-USE_GST_API_1_0p_TRUE
-USE_GST_API_0_10_FALSE
-USE_GST_API_0_10_TRUE
 GST_PLUGINS_BAD_VERSION_REQUIRED
 GST_PLUGINS_BASE_VERSION_REQUIRED
 GST_VERSION_REQUIRED
@@ -956,7 +974,8 @@
 enable_x11
 enable_glx
 enable_wayland
-with_gstreamer_api
+enable_egl
+with_glapi
 with_html_dir
 enable_gtk_doc
 enable_gtk_doc_html
@@ -996,7 +1015,8 @@
 GST_BASEVIDEO_LIBS
 GST_CODEC_PARSERS_CFLAGS
 GST_CODEC_PARSERS_LIBS
-GST_PLUGIN_PATH
+GST_GL_CFLAGS
+GST_GL_LIBS
 GST_PLUGIN_PATH_1_0
 DRM_CFLAGS
 DRM_LIBS
@@ -1010,6 +1030,12 @@
 XRENDER_LIBS
 GL_CFLAGS
 GL_LIBS
+GLES2_CFLAGS
+GLES2_LIBS
+GLES3_CFLAGS
+GLES3_LIBS
+EGL_CFLAGS
+EGL_LIBS
 WAYLAND_CFLAGS
 WAYLAND_LIBS
 LIBVA_CFLAGS
@@ -1560,7 +1586,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures gst_vaapi 0.5.10 to adapt to many kinds of systems.
+\`configure' configures gst_vaapi 0.6.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1631,7 +1657,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of gst_vaapi 0.5.10:";;
+     short | recursive ) echo "Configuration of gst_vaapi 0.6.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1660,6 +1686,7 @@
   --enable-x11            enable X11 output [default=yes]
   --enable-glx            enable OpenGL/X11 output [default=yes]
   --enable-wayland        enable Wayland output [default=yes]
+  --enable-egl            enable EGL output [default=yes]
   --enable-gtk-doc        use gtk-doc to build documentation [[default=no]]
   --enable-gtk-doc-html   build documentation in html format [[default=yes]]
   --enable-gtk-doc-pdf    build documentation in pdf format [[default=no]]
@@ -1672,9 +1699,8 @@
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
   --with-sysroot=DIR Search for dependent libraries within DIR
                         (or the compiler's sysroot if not specified).
-  --with-gstreamer-api=VERSION
-                          build against the specified GStreamer API version
-                          [default=autodetect]
+  --with-glapi=APIs       build with the specified OpenGL APIs
+                          [default=any]
   --with-html-dir=PATH    path to installed docs
 
 Some influential environment variables:
@@ -1729,9 +1755,9 @@
               C compiler flags for GST_CODEC_PARSERS, overriding pkg-config
   GST_CODEC_PARSERS_LIBS
               linker flags for GST_CODEC_PARSERS, overriding pkg-config
-  GST_PLUGIN_PATH
-              installation path for gstreamer-vaapi plugin elements for
-              GStreamer 0.10
+  GST_GL_CFLAGS
+              C compiler flags for GST_GL, overriding pkg-config
+  GST_GL_LIBS linker flags for GST_GL, overriding pkg-config
   GST_PLUGIN_PATH_1_0
               installation path for gstreamer-vaapi plugin elements for
               GStreamer 1.0
@@ -1750,6 +1776,14 @@
               linker flags for XRENDER, overriding pkg-config
   GL_CFLAGS   C compiler flags for GL, overriding pkg-config
   GL_LIBS     linker flags for GL, overriding pkg-config
+  GLES2_CFLAGS
+              C compiler flags for GLES2, overriding pkg-config
+  GLES2_LIBS  linker flags for GLES2, overriding pkg-config
+  GLES3_CFLAGS
+              C compiler flags for GLES3, overriding pkg-config
+  GLES3_LIBS  linker flags for GLES3, overriding pkg-config
+  EGL_CFLAGS  C compiler flags for EGL, overriding pkg-config
+  EGL_LIBS    linker flags for EGL, overriding pkg-config
   WAYLAND_CFLAGS
               C compiler flags for WAYLAND, overriding pkg-config
   WAYLAND_LIBS
@@ -1773,7 +1807,7 @@
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
 
-Report bugs to <gwenole.beauchesne@intel.com>.
+Report bugs to <gwenole.beauchesne@intel.com, sreerenj.balachandran@intel.com>.
 _ACEOF
 ac_status=$?
 fi
@@ -1836,7 +1870,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-gst_vaapi configure 0.5.10
+gst_vaapi configure 0.6.0
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2181,9 +2215,9 @@
 $as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-( $as_echo "## ------------------------------------------- ##
+( $as_echo "## sssssssssssssssssssssssssssssssssssssssssss ##
 ## Report this to gwenole.beauchesne@intel.com ##
-## ------------------------------------------- ##"
+## sssssssssssssssssssssssssssssssssssssssssss ##"
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
@@ -2205,7 +2239,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by gst_vaapi $as_me 0.5.10, which was
+It was created by gst_vaapi $as_me 0.6.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3185,7 +3219,7 @@
 
 # Define the identity of the package.
  PACKAGE='gstreamer-vaapi'
- VERSION='0.5.10'
+ VERSION='0.6.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3401,7 +3435,7 @@
 LIBVA_PACKAGE_VERSION=1.0.3
 
 
-WAYLAND_API_VERSION=1.0.0
+WAYLAND_API_VERSION=1.0.2
 
 
 # Check whether --enable-silent-rules was given.
@@ -12172,12 +12206,20 @@
 fi
 
 
+# Check whether --enable-egl was given.
+if test "${enable_egl+set}" = set; then :
+  enableval=$enable_egl;
+else
+  enable_egl="yes"
+fi
+
+
 
-# Check whether --with-gstreamer-api was given.
-if test "${with_gstreamer_api+set}" = set; then :
-  withval=$with_gstreamer_api; GST_API_VERSION="$with_gstreamer_api"
+# Check whether --with-glapi was given.
+if test "${with_glapi+set}" = set; then :
+  withval=$with_glapi; GLAPI="$with_glapi"
 else
-  GST_API_VERSION=autodetect
+  GLAPI=any
 fi
 
 
@@ -12722,7 +12764,7 @@
 
 
 
-GLIB_VERSION_REQUIRED=2.28
+GLIB_VERSION_REQUIRED=2.32
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIB" >&5
@@ -12865,53 +12907,28 @@
 
 
 
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GStreamer API version" >&5
 $as_echo_n "checking for GStreamer API version... " >&6; }
-if test "$GST_API_VERSION" = "autodetect"; then
-    gst_pkg_versions="1.0 0.10"
-else
-    as_arg_v1=$GST_API_VERSION
-as_arg_v2=1.0
-awk "$as_awk_strverscmp" v1="$as_arg_v1" v2="$as_arg_v2" /dev/null
-case $? in #(
-  1) :
-    gst_pkg_versions="0.10" ;; #(
-  0) :
-    gst_pkg_versions="1.0" ;; #(
-  2) :
-            gst_pkg_versions="1.0" ;; #(
-  *) :
-     ;;
-esac
+if $PKG_CONFIG --exists "gstreamer-1.0"; then
+    gst_version=`$PKG_CONFIG --modversion "gstreamer-1.0"`
+    gst_major_version=`echo "$gst_version" | cut -d'.' -f1`
+    gst_minor_version=`echo "$gst_version" | cut -d'.' -f2`
+    GST_API_VERSION="${gst_major_version}.${gst_minor_version}"
+    GST_PKG_VERSION="1.0"
 fi
-for gst_pkg_version in ${gst_pkg_versions}; do
-    if $PKG_CONFIG --exists "gstreamer-$gst_pkg_version"; then
-        gst_version=`$PKG_CONFIG --modversion "gstreamer-$gst_pkg_version"`
-        gst_major_version=`echo "$gst_version" | cut -d'.' -f1`
-        gst_minor_version=`echo "$gst_version" | cut -d'.' -f2`
-        GST_API_VERSION="${gst_major_version}.${gst_minor_version}"
-        GST_PKG_VERSION="$gst_pkg_version"
-        break
-    fi
-done
 if test -z "$GST_PKG_VERSION"; then
-    as_fn_error $? "version $GST_API_VERSION not found" "$LINENO" 5
+    as_fn_error $? "gstreamer-$GST_PKG_VERSION was not found" "$LINENO" 5
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GST_API_VERSION" >&5
 $as_echo "$GST_API_VERSION" >&6; }
 
+
+cat >>confdefs.h <<_ACEOF
+#define GST_API_VERSION_S "$GST_API_VERSION"
+_ACEOF
+
+
 case $GST_API_VERSION in
-0.10)
-    GST_VERSION_REQUIRED=0.10.36
-    GST_PLUGINS_BASE_VERSION_REQUIRED=0.10.31
-    GST_PLUGINS_BAD_VERSION_REQUIRED=0.10.22
-    ;;
-1.0)
-    GST_VERSION_REQUIRED=1.0.0
-    GST_PLUGINS_BASE_VERSION_REQUIRED=1.0.0
-    GST_PLUGINS_BAD_VERSION_REQUIRED=1.0.0
-    ;;
 1.2)
     GST_VERSION_REQUIRED=1.1.90
     GST_PLUGINS_BASE_VERSION_REQUIRED=1.1.0
@@ -12936,37 +12953,9 @@
 
 
 
-USE_GST_API_0_10="no"
-USE_GST_API_1_0p="no"
 USE_GST_API_1_2p="no"
 USE_GST_API_1_4p="no"
 as_arg_v1=$GST_API_VERSION
-as_arg_v2=0.10
-awk "$as_awk_strverscmp" v1="$as_arg_v1" v2="$as_arg_v2" /dev/null
-case $? in #(
-  1) :
-     ;; #(
-  0) :
-    USE_GST_API_0_10="yes" ;; #(
-  2) :
-     ;; #(
-  *) :
-     ;;
-esac
-as_arg_v1=$GST_API_VERSION
-as_arg_v2=1.0
-awk "$as_awk_strverscmp" v1="$as_arg_v1" v2="$as_arg_v2" /dev/null
-case $? in #(
-  1) :
-     ;; #(
-  0) :
-    USE_GST_API_1_0p="yes" ;; #(
-  2) :
-    USE_GST_API_1_0p="yes" ;; #(
-  *) :
-     ;;
-esac
-as_arg_v1=$GST_API_VERSION
 as_arg_v2=1.2
 awk "$as_awk_strverscmp" v1="$as_arg_v1" v2="$as_arg_v2" /dev/null
 case $? in #(
@@ -12992,22 +12981,6 @@
   *) :
      ;;
 esac
- if test "$USE_GST_API_0_10" = "yes"; then
-  USE_GST_API_0_10_TRUE=
-  USE_GST_API_0_10_FALSE='#'
-else
-  USE_GST_API_0_10_TRUE='#'
-  USE_GST_API_0_10_FALSE=
-fi
-
- if test "$USE_GST_API_1_0p" = "yes"; then
-  USE_GST_API_1_0p_TRUE=
-  USE_GST_API_1_0p_FALSE='#'
-else
-  USE_GST_API_1_0p_TRUE='#'
-  USE_GST_API_1_0p_FALSE=
-fi
-
  if test "$USE_GST_API_1_2p" = "yes"; then
   USE_GST_API_1_2p_TRUE=
   USE_GST_API_1_2p_FALSE='#'
@@ -13025,23 +12998,17 @@
 fi
 
 
-GST_PKG_VERSION="$GST_API_VERSION"
-if test "$USE_GST_API_1_2p" = "yes" || test "$USE_GST_API_1_4p" = "yes" ; then
-    GST_PKG_VERSION="1.0"
-fi
 
 
-if test "$USE_GST_API_0_10" = "yes"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: support for GStreamer 0.10 is obsolete, and will be removed" >&5
-$as_echo "$as_me: WARNING: support for GStreamer 0.10 is obsolete, and will be removed" >&2;}
-    if test "$enable_builtin_videoparsers" = "yes"; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: disabled built-in videoparsers (unsupported)" >&5
-$as_echo "$as_me: WARNING: disabled built-in videoparsers (unsupported)" >&2;}
-        enable_builtin_videoparsers="no"
-    fi
-elif test "$GST_API_VERSION" = "1.0"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: support for GStreamer 1.0 is obsolete, and will be removed" >&5
-$as_echo "$as_me: WARNING: support for GStreamer 1.0 is obsolete, and will be removed" >&2;}
+
+cat >>confdefs.h <<_ACEOF
+#define GST_PKG_VERSION_S "$GST_PKG_VERSION"
+_ACEOF
+
+
+if test "$GST_API_VERSION" = "1.2"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: support for GStreamer 1.2 is deprecated, please upgrade" >&5
+$as_echo "$as_me: WARNING: support for GStreamer 1.2 is deprecated, please upgrade" >&2;}
 fi
 
 
@@ -13227,44 +13194,6 @@
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GstBaseSink::query hook" >&5
-$as_echo_n "checking for GstBaseSink::query hook... " >&6; }
-if ${ac_cv_have_gst_base_sink_query+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-    saved_CPPFLAGS="$CPPFLAGS"
-    CPPFLAGS="$CPPFLAGS $GST_BASE_CFLAGS"
-    saved_LIBS="$LIBS"
-    LIBS="$LIBS $GST_BASE_LIBS"
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <gst/base/gstbasesink.h>
-int
-main ()
-{
-GstBaseSinkClass klass; klass.query = NULL;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_have_gst_base_sink_query="yes"
-else
-  ac_cv_have_gst_base_sink_query="no"
-
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-    CPPFLAGS="$saved_CPPFLAGS"
-    LIBS="$saved_LIBS"
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_gst_base_sink_query" >&5
-$as_echo "$ac_cv_have_gst_base_sink_query" >&6; }
-if test "$ac_cv_have_gst_base_sink_query" != "yes"; then
-    as_fn_error $? "GstBaseSink does not contain the 'query' vfunc" "$LINENO" 5
-fi
-
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GST_PLUGINS_BASE" >&5
@@ -13634,94 +13563,6 @@
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GstVideoOverlayComposition" >&5
-$as_echo_n "checking for GstVideoOverlayComposition... " >&6; }
-if ${ac_cv_have_gst_video_overlay_composition+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-    saved_CPPFLAGS="$CPPFLAGS"
-    CPPFLAGS="$CPPFLAGS $GST_CFLAGS $GST_VIDEO_CFLAGS"
-    saved_LIBS="$LIBS"
-    LIBS="$LIBS $GST_LIBS $GST_VIDEO_LIBS"
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <gst/video/video-overlay-composition.h>
-int
-main ()
-{
-GstVideoOverlayComposition *c;
-              c = gst_video_overlay_composition_new(0);
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_have_gst_video_overlay_composition="yes"
-else
-  ac_cv_have_gst_video_overlay_composition="no"
-
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-    CPPFLAGS="$saved_CPPFLAGS"
-    LIBS="$saved_LIBS"
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_gst_video_overlay_composition" >&5
-$as_echo "$ac_cv_have_gst_video_overlay_composition" >&6; }
-if test "$ac_cv_have_gst_video_overlay_composition" != "yes"; then
-    as_fn_error $? "GstVideoOverlayComposition is not available" "$LINENO" 5
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking ... with advanced format flags" >&5
-$as_echo_n "checking ... with advanced format flags... " >&6; }
-if ${ac_cv_have_gst_video_overlay_hwcaps+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-    saved_CPPFLAGS="$CPPFLAGS"
-    CPPFLAGS="$CPPFLAGS $GST_CFLAGS $GST_VIDEO_CFLAGS"
-    saved_LIBS="$LIBS"
-    LIBS="$LIBS $GST_LIBS $GST_VIDEO_LIBS"
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <gst/video/video-overlay-composition.h>
-int
-main ()
-{
-GstVideoOverlayRectangle *rect;
-              const guint w = 64, h = 64;
-              guint flags = (
-                  GST_VIDEO_OVERLAY_FORMAT_FLAG_PREMULTIPLIED_ALPHA|
-                  GST_VIDEO_OVERLAY_FORMAT_FLAG_GLOBAL_ALPHA);
-              rect = gst_video_overlay_rectangle_new_argb(NULL, w, h, w * 4,
-                  0, 0, w, h, flags);
-              gst_video_overlay_rectangle_set_global_alpha(rect, 0.5f);
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_have_gst_video_overlay_hwcaps="yes"
-else
-  ac_cv_have_gst_video_overlay_hwcaps="no"
-
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-    CPPFLAGS="$saved_CPPFLAGS"
-    LIBS="$saved_LIBS"
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_gst_video_overlay_hwcaps" >&5
-$as_echo "$ac_cv_have_gst_video_overlay_hwcaps" >&6; }
-if test "$ac_cv_have_gst_video_overlay_hwcaps" = "yes"; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_GST_VIDEO_OVERLAY_HWCAPS 1
-_ACEOF
-
-fi
-
 if test "$USE_GST_API_1_2p" != "yes" && test "$USE_GST_API_1_4p" != "yes"; then
 
 pkg_failed=no
@@ -13821,6 +13662,7 @@
     ac_cv_have_gst_h264_parser="no"
     ac_cv_have_gst_jpeg_parser="no"
     ac_cv_have_gst_vp8_parser="no"
+    ac_cv_have_gst_h265_parser="no"
 else
 
 pkg_failed=no
@@ -14111,78 +13953,80 @@
 fi
 
 
- if test "$enable_builtin_videoparsers" = "yes"; then
-  USE_LOCAL_VIDEO_PARSERS_TRUE=
-  USE_LOCAL_VIDEO_PARSERS_FALSE='#'
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for H.265 parser" >&5
+$as_echo_n "checking for H.265 parser... " >&6; }
+if ${ac_cv_have_gst_h265_parser+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
-  USE_LOCAL_VIDEO_PARSERS_TRUE='#'
-  USE_LOCAL_VIDEO_PARSERS_FALSE=
-fi
-
-
-case $GST_API_VERSION in
-0.10)   lt_bias=0;;
-1.0)    lt_bias=2;;
-1.2)    lt_bias=4;;
-1.4) lt_bias=5;;
-1.[5-6])    lt_bias=6;;
-esac
-GST_VAAPI_MAJOR_VERSION=`expr 6 - "$lt_bias"`
-
-
-GST_VAAPI_LT_CURRENT="$GST_VAAPI_MAJOR_VERSION"
-GST_VAAPI_LT_REV=0
-GST_VAAPI_LT_AGE=0
-GST_VAAPI_LT_VERSION="$GST_VAAPI_LT_CURRENT:$GST_VAAPI_LT_REV:$GST_VAAPI_LT_AGE"
-GST_VAAPI_LT_LDFLAGS="-version-info $GST_VAAPI_LT_VERSION"
-
 
+    saved_CPPFLAGS="$CPPFLAGS"
+    CPPFLAGS="$CPPFLAGS $GST_CFLAGS $GST_CODEC_PARSERS_CFLAGS"
+    saved_LIBS="$LIBS"
+    LIBS="$LIBS $GST_LIBS $GST_CODEC_PARSERS_LIBS"
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <gst/codecparsers/gsth265parser.h>
+int
+main ()
+{
+GstH265SliceHdr slice_hdr;
+              GstH265VUIParams vui_params;
+              GstH265Profile profile = GST_H265_PROFILE_MAIN_STILL_PICTURE;
+              slice_hdr.n_emulation_prevention_bytes = 0;
+              vui_params.par_n = 0;
+              vui_params.par_d = 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_have_gst_h265_parser="yes"
+else
+  ac_cv_have_gst_h265_parser="no"
 
-GST_ALL_LDFLAGS="-no-undefined"
-
-
-GST_PLUGIN_LDFLAGS="-module -avoid-version -export-symbols-regex '^(_*gst_plugin_desc|gst_.*_get_type)\$\$' $GST_ALL_LDFLAGS"
-
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    CPPFLAGS="$saved_CPPFLAGS"
+    LIBS="$saved_LIBS"
 
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_gst_h265_parser" >&5
+$as_echo "$ac_cv_have_gst_h265_parser" >&6; }
+ if test "$ac_cv_have_gst_h265_parser" != "yes"; then
+  USE_LOCAL_CODEC_PARSERS_H265_TRUE=
+  USE_LOCAL_CODEC_PARSERS_H265_FALSE='#'
+else
+  USE_LOCAL_CODEC_PARSERS_H265_TRUE='#'
+  USE_LOCAL_CODEC_PARSERS_H265_FALSE=
+fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GStreamer plugins directory" >&5
-$as_echo_n "checking for GStreamer plugins directory... " >&6; }
-case $GST_PKG_VERSION in
-0.10)   _gst_plugin_path="$GST_PLUGIN_PATH";;
-1.0)    _gst_plugin_path="$GST_PLUGIN_PATH_1_0";;
-esac
-if test -d "$_gst_plugin_path"; then
-    GST_PLUGINS_DIR="$_gst_plugin_path"
+ if test "$enable_builtin_videoparsers" = "yes"; then
+  USE_LOCAL_VIDEO_PARSERS_TRUE=
+  USE_LOCAL_VIDEO_PARSERS_FALSE='#'
 else
-    GST_PLUGINS_DIR=`$PKG_CONFIG gstreamer-$GST_PKG_VERSION --variable pluginsdir`
-    if test -z "$GST_PLUGINS_DIR"; then
-        GST_PLUGINS_DIR="\$(libdir)/gstreamer-$GST_PKG_VERSION"
-    fi
+  USE_LOCAL_VIDEO_PARSERS_TRUE='#'
+  USE_LOCAL_VIDEO_PARSERS_FALSE=
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GST_PLUGINS_DIR" >&5
-$as_echo "$GST_PLUGINS_DIR" >&6; }
-plugindir="$GST_PLUGINS_DIR"
-
 
 
-USE_DRM=0
-if test "$enable_drm" = "yes"; then
+HAVE_GSTGL=0
+if test "$enable_glx" = "yes" -o "$enable_egl" = "yes"; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DRM" >&5
-$as_echo_n "checking for DRM... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GST_GL" >&5
+$as_echo_n "checking for GST_GL... " >&6; }
 
-if test -n "$DRM_CFLAGS"; then
-    pkg_cv_DRM_CFLAGS="$DRM_CFLAGS"
+if test -n "$GST_GL_CFLAGS"; then
+    pkg_cv_GST_GL_CFLAGS="$GST_GL_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdrm\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libdrm") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-gl-\$GST_PKG_VERSION >= \$GST_PLUGINS_BAD_VERSION_REQUIRED\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gstreamer-gl-$GST_PKG_VERSION >= $GST_PLUGINS_BAD_VERSION_REQUIRED") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_DRM_CFLAGS=`$PKG_CONFIG --cflags "libdrm" 2>/dev/null`
+  pkg_cv_GST_GL_CFLAGS=`$PKG_CONFIG --cflags "gstreamer-gl-$GST_PKG_VERSION >= $GST_PLUGINS_BAD_VERSION_REQUIRED" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -14190,16 +14034,16 @@
  else
     pkg_failed=untried
 fi
-if test -n "$DRM_LIBS"; then
-    pkg_cv_DRM_LIBS="$DRM_LIBS"
+if test -n "$GST_GL_LIBS"; then
+    pkg_cv_GST_GL_LIBS="$GST_GL_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdrm\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libdrm") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-gl-\$GST_PKG_VERSION >= \$GST_PLUGINS_BAD_VERSION_REQUIRED\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gstreamer-gl-$GST_PKG_VERSION >= $GST_PLUGINS_BAD_VERSION_REQUIRED") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_DRM_LIBS=`$PKG_CONFIG --libs "libdrm" 2>/dev/null`
+  pkg_cv_GST_GL_LIBS=`$PKG_CONFIG --libs "gstreamer-gl-$GST_PKG_VERSION >= $GST_PLUGINS_BAD_VERSION_REQUIRED" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -14220,49 +14064,240 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        DRM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libdrm" 2>&1`
+	        GST_GL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gstreamer-gl-$GST_PKG_VERSION >= $GST_PLUGINS_BAD_VERSION_REQUIRED" 2>&1`
         else
-	        DRM_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libdrm" 2>&1`
+	        GST_GL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gstreamer-gl-$GST_PKG_VERSION >= $GST_PLUGINS_BAD_VERSION_REQUIRED" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
-	echo "$DRM_PKG_ERRORS" >&5
+	echo "$GST_GL_PKG_ERRORS" >&5
 
-	USE_DRM=0
+	HAVE_GSTGL=0
 elif test $pkg_failed = untried; then
      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	USE_DRM=0
+	HAVE_GSTGL=0
 else
-	DRM_CFLAGS=$pkg_cv_DRM_CFLAGS
-	DRM_LIBS=$pkg_cv_DRM_LIBS
+	GST_GL_CFLAGS=$pkg_cv_GST_GL_CFLAGS
+	GST_GL_LIBS=$pkg_cv_GST_GL_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	USE_DRM=1
+	HAVE_GSTGL=1
+fi
 fi
 
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for UDEV" >&5
-$as_echo_n "checking for UDEV... " >&6; }
+if test $HAVE_GSTGL -eq 1; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GStreamer OpenGL helper libraries" >&5
+$as_echo_n "checking for GStreamer OpenGL helper libraries... " >&6; }
+if ${ac_cv_have_gst_gl_helpers+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
 
-if test -n "$UDEV_CFLAGS"; then
-    pkg_cv_UDEV_CFLAGS="$UDEV_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libudev\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libudev") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_UDEV_CFLAGS=`$PKG_CONFIG --cflags "libudev" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
+        saved_CPPFLAGS="$CPPFLAGS"
+        CPPFLAGS="$CPPFLAGS $GST_GL_CFLAGS $GST_VIDEO_CFLAGS"
+        saved_LIBS="$LIBS"
+        LIBS="$saved_LIBS"
+        for ac_header in gst/gl/gl.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "gst/gl/gl.h" "ac_cv_header_gst_gl_gl_h" "$ac_includes_default"
+if test "x$ac_cv_header_gst_gl_gl_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_GST_GL_GL_H 1
+_ACEOF
+ :
 else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
+  HAVE_GSTGL=0
 fi
-if test -n "$UDEV_LIBS"; then
-    pkg_cv_UDEV_LIBS="$UDEV_LIBS"
+
+done
+
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <gst/gl/gl.h>
+int
+main ()
+{
+GstGLContext gl_context;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_have_gst_gl_helpers="yes"
+else
+  ac_cv_have_gst_gl_helpers="no" HAVE_GSTGL=0
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+        CPPFLAGS="$saved_CPPFLAGS"
+        LIBS="$saved_LIBS"
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_gst_gl_helpers" >&5
+$as_echo "$ac_cv_have_gst_gl_helpers" >&6; }
+fi
+ if test $HAVE_GSTGL -eq 1; then
+  USE_GST_GL_HELPERS_TRUE=
+  USE_GST_GL_HELPERS_FALSE='#'
+else
+  USE_GST_GL_HELPERS_TRUE='#'
+  USE_GST_GL_HELPERS_FALSE=
+fi
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define USE_GST_GL_HELPERS $HAVE_GSTGL
+_ACEOF
+
+
+if test "$enable_egl" = "yes" -a $HAVE_GSTGL -ne 1; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: GStreamer/GL helper libraries not found, disabling EGL support" >&5
+$as_echo "$as_me: WARNING: GStreamer/GL helper libraries not found, disabling EGL support" >&2;}
+    enable_egl="no"
+fi
+
+case $GST_API_VERSION in
+1.2)    lt_bias=4;;
+1.4)    lt_bias=5;;
+1.[5-6])    lt_bias=6;;
+esac
+GST_VAAPI_MAJOR_VERSION=`expr 7 - "$lt_bias"`
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define GST_VAAPI_MAJOR_VERSION_S "$GST_VAAPI_MAJOR_VERSION"
+_ACEOF
+
+
+GST_VAAPI_LT_CURRENT="$GST_VAAPI_MAJOR_VERSION"
+GST_VAAPI_LT_REV=0
+GST_VAAPI_LT_AGE=0
+GST_VAAPI_LT_VERSION="$GST_VAAPI_LT_CURRENT:$GST_VAAPI_LT_REV:$GST_VAAPI_LT_AGE"
+GST_VAAPI_LT_LDFLAGS="-version-info $GST_VAAPI_LT_VERSION"
+
+
+
+GST_ALL_LDFLAGS="-no-undefined"
+
+
+GST_PLUGIN_LDFLAGS="-module -avoid-version -export-symbols-regex '^(_*gst_plugin_desc|gst_.*_get_type)\$\$' $GST_ALL_LDFLAGS"
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GStreamer plugins directory" >&5
+$as_echo_n "checking for GStreamer plugins directory... " >&6; }
+if test -d "$GST_PLUGIN_PATH_1_0"; then
+    GST_PLUGINS_DIR="$GST_PLUGIN_PATH_1_0"
+else
+    GST_PLUGINS_DIR=`$PKG_CONFIG gstreamer-$GST_PKG_VERSION --variable pluginsdir`
+    if test -z "$GST_PLUGINS_DIR"; then
+        GST_PLUGINS_DIR="\$(libdir)/gstreamer-$GST_PKG_VERSION"
+    fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GST_PLUGINS_DIR" >&5
+$as_echo "$GST_PLUGINS_DIR" >&6; }
+plugindir="$GST_PLUGINS_DIR"
+
+
+
+USE_DRM=0
+if test "$enable_drm" = "yes"; then
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DRM" >&5
+$as_echo_n "checking for DRM... " >&6; }
+
+if test -n "$DRM_CFLAGS"; then
+    pkg_cv_DRM_CFLAGS="$DRM_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdrm\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libdrm") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_DRM_CFLAGS=`$PKG_CONFIG --cflags "libdrm" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$DRM_LIBS"; then
+    pkg_cv_DRM_LIBS="$DRM_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdrm\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libdrm") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_DRM_LIBS=`$PKG_CONFIG --libs "libdrm" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        DRM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libdrm" 2>&1`
+        else
+	        DRM_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libdrm" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$DRM_PKG_ERRORS" >&5
+
+	USE_DRM=0
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	USE_DRM=0
+else
+	DRM_CFLAGS=$pkg_cv_DRM_CFLAGS
+	DRM_LIBS=$pkg_cv_DRM_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	USE_DRM=1
+fi
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for UDEV" >&5
+$as_echo_n "checking for UDEV... " >&6; }
+
+if test -n "$UDEV_CFLAGS"; then
+    pkg_cv_UDEV_CFLAGS="$UDEV_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libudev\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libudev") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_UDEV_CFLAGS=`$PKG_CONFIG --cflags "libudev" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$UDEV_LIBS"; then
+    pkg_cv_UDEV_LIBS="$UDEV_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libudev\""; } >&5
@@ -14660,9 +14695,15 @@
 if test "$enable_glx" = "yes"; then
     enable_opengl="yes"
 fi
+if test "$enable_egl" = "yes"; then
+    enable_opengl="yes"
+fi
+GLES_VERSION_MASK=0
 
 HAVE_GL=0
 if test "$enable_opengl" = "yes"; then
+case ",$GLAPI," in
+(*,any,*|*,gl,*)
     HAVE_GL=1
 
 pkg_failed=no
@@ -14718,81 +14759,428 @@
         if test $_pkg_short_errors_supported = yes; then
 	        GL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gl" 2>&1`
         else
-	        GL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gl" 2>&1`
+	        GL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gl" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$GL_PKG_ERRORS" >&5
+
+	HAVE_GL=0
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	HAVE_GL=0
+else
+	GL_CFLAGS=$pkg_cv_GL_CFLAGS
+	GL_LIBS=$pkg_cv_GL_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	:
+fi
+    saved_CPPFLAGS="$CPPFLAGS"
+    CPPFLAGS="$CPPFLAGS $GL_CFLAGS"
+    for ac_header in GL/gl.h GL/glext.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "
+#ifdef HAVE_GL_GL_H
+# include <GL/gl.h>
+#endif
+
+"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+ :
+else
+  HAVE_GL=0
+fi
+
+done
+
+    CPPFLAGS="$saved_CPPFLAGS"
+    ;;
+esac
+fi
+GLES_VERSION_MASK=`expr $GLES_VERSION_MASK "+" $HAVE_GL "*" 1`
+
+HAVE_GLESv2=0
+if test "$enable_opengl" = "yes"; then
+case ",$GLAPI," in
+(*,any,*|*,gles2,*)
+    HAVE_GLESv2=1
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLES2" >&5
+$as_echo_n "checking for GLES2... " >&6; }
+
+if test -n "$GLES2_CFLAGS"; then
+    pkg_cv_GLES2_CFLAGS="$GLES2_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glesv2\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "glesv2") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_GLES2_CFLAGS=`$PKG_CONFIG --cflags "glesv2" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$GLES2_LIBS"; then
+    pkg_cv_GLES2_LIBS="$GLES2_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glesv2\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "glesv2") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_GLES2_LIBS=`$PKG_CONFIG --libs "glesv2" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        GLES2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glesv2" 2>&1`
+        else
+	        GLES2_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glesv2" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$GLES2_PKG_ERRORS" >&5
+
+	HAVE_GLESv2=0
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	HAVE_GLESv2=0
+else
+	GLES2_CFLAGS=$pkg_cv_GLES2_CFLAGS
+	GLES2_LIBS=$pkg_cv_GLES2_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	:
+fi
+    saved_CPPFLAGS="$CPPFLAGS"
+    CPPFLAGS="$CPPFLAGS $GLES2_CFLAGS"
+    for ac_header in GLES2/gl2.h GLES2/gl2ext.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "
+#ifdef HAVE_GLES2_GL2_H
+# include <GLES2/gl2.h>
+#endif
+
+"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+ :
+else
+  HAVE_GLESv2=0
+fi
+
+done
+
+    CPPFLAGS="$saved_CPPFLAGS"
+    ;;
+esac
+fi
+GLES_VERSION_MASK=`expr $GLES_VERSION_MASK "+" $HAVE_GLESv2 "*" 4`
+
+HAVE_GLESv3=0
+if test "$enable_opengl" = "yes"; then
+case ",$GLAPI," in
+(*,any,*|*,gles3,*)
+    HAVE_GLESv3=1
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLES3" >&5
+$as_echo_n "checking for GLES3... " >&6; }
+
+if test -n "$GLES3_CFLAGS"; then
+    pkg_cv_GLES3_CFLAGS="$GLES3_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glesv2\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "glesv2") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_GLES3_CFLAGS=`$PKG_CONFIG --cflags "glesv2" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$GLES3_LIBS"; then
+    pkg_cv_GLES3_LIBS="$GLES3_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glesv2\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "glesv2") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_GLES3_LIBS=`$PKG_CONFIG --libs "glesv2" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        GLES3_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glesv2" 2>&1`
+        else
+	        GLES3_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glesv2" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$GLES3_PKG_ERRORS" >&5
+
+	HAVE_GLESv3=0
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	HAVE_GLESv3=0
+else
+	GLES3_CFLAGS=$pkg_cv_GLES3_CFLAGS
+	GLES3_LIBS=$pkg_cv_GLES3_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	:
+fi
+    saved_CPPFLAGS="$CPPFLAGS"
+    CPPFLAGS="$CPPFLAGS $GLES3_CFLAGS"
+    for ac_header in GLES3/gl3.h GLES3/gl3ext.h GLES2/gl2ext.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "
+#ifdef HAVE_GLES3_GL3_H
+# include <GLES3/gl3.h>
+#endif
+
+"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+ :
+else
+  HAVE_GLESv3=0
+fi
+
+done
+
+    CPPFLAGS="$saved_CPPFLAGS"
+    ;;
+esac
+fi
+GLES_VERSION_MASK=`expr $GLES_VERSION_MASK "+" $HAVE_GLESv3 "*" 8`
+
+USE_GLX=0
+if test "$enable_glx" = "yes" -a $HAVE_GL -eq 1 -a $USE_X11 -eq 1; then
+    USE_GLX=1
+    saved_CPPFLAGS="$CPPFLAGS"
+    saved_LIBS="$LIBS"
+    CPPFLAGS="$CPPFLAGS $GL_CFLAGS"
+    LIBS="$LIBS $GL_LIBS"
+    for ac_header in GL/glx.h
+do :
+  ac_fn_c_check_header_compile "$LINENO" "GL/glx.h" "ac_cv_header_GL_glx_h" "
+#ifdef HAVE_GL_GL_H
+# include <GL/gl.h>
+#endif
+
+"
+if test "x$ac_cv_header_GL_glx_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_GL_GLX_H 1
+_ACEOF
+ :
+else
+  USE_GLX=0
+fi
+
+done
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for glXCreateContext in -lGL" >&5
+$as_echo_n "checking for glXCreateContext in -lGL... " >&6; }
+if ${ac_cv_lib_GL_glXCreateContext+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lGL  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char glXCreateContext ();
+int
+main ()
+{
+return glXCreateContext ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_GL_glXCreateContext=yes
+else
+  ac_cv_lib_GL_glXCreateContext=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_GL_glXCreateContext" >&5
+$as_echo "$ac_cv_lib_GL_glXCreateContext" >&6; }
+if test "x$ac_cv_lib_GL_glXCreateContext" = xyes; then :
+  :
+else
+  USE_GLX=0
+fi
+
+    CPPFLAGS="$saved_CPPFLAGS"
+    LIBS="$saved_LIBS"
+fi
+
+USE_EGL=0
+if test "$enable_egl" = "yes" -a $GLES_VERSION_MASK -ne 0; then
+    USE_EGL=1
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EGL" >&5
+$as_echo_n "checking for EGL... " >&6; }
+
+if test -n "$EGL_CFLAGS"; then
+    pkg_cv_EGL_CFLAGS="$EGL_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"egl\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "egl") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_EGL_CFLAGS=`$PKG_CONFIG --cflags "egl" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$EGL_LIBS"; then
+    pkg_cv_EGL_LIBS="$EGL_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"egl\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "egl") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_EGL_LIBS=`$PKG_CONFIG --libs "egl" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        EGL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "egl" 2>&1`
+        else
+	        EGL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "egl" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
-	echo "$GL_PKG_ERRORS" >&5
+	echo "$EGL_PKG_ERRORS" >&5
 
-	HAVE_GL=0
+	USE_EGL=0
 elif test $pkg_failed = untried; then
      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	HAVE_GL=0
+	USE_EGL=0
 else
-	GL_CFLAGS=$pkg_cv_GL_CFLAGS
-	GL_LIBS=$pkg_cv_GL_LIBS
+	EGL_CFLAGS=$pkg_cv_EGL_CFLAGS
+	EGL_LIBS=$pkg_cv_EGL_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 	:
 fi
     saved_CPPFLAGS="$CPPFLAGS"
-    CPPFLAGS="$CPPFLAGS $GL_CFLAGS"
-    for ac_header in GL/gl.h GL/glext.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "
-#ifdef HAVE_GL_GL_H
-# include <GL/gl.h>
-#endif
-
-"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
- :
-else
-  HAVE_GL=0
-fi
-
-done
-
-    CPPFLAGS="$saved_CPPFLAGS"
-fi
-
-USE_GLX=0
-if test "$enable_glx" = "yes" -a $HAVE_GL -eq 1 -a $USE_X11 -eq 1; then
-    USE_GLX=1
-    saved_CPPFLAGS="$CPPFLAGS"
     saved_LIBS="$LIBS"
-    CPPFLAGS="$CPPFLAGS $GL_CFLAGS"
-    LIBS="$LIBS $GL_LIBS"
-    for ac_header in GL/glx.h
+    for ac_header in EGL/egl.h
 do :
-  ac_fn_c_check_header_compile "$LINENO" "GL/glx.h" "ac_cv_header_GL_glx_h" "
-#ifdef HAVE_GL_GL_H
-# include <GL/gl.h>
-#endif
-
-"
-if test "x$ac_cv_header_GL_glx_h" = xyes; then :
+  ac_fn_c_check_header_mongrel "$LINENO" "EGL/egl.h" "ac_cv_header_EGL_egl_h" "$ac_includes_default"
+if test "x$ac_cv_header_EGL_egl_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
-#define HAVE_GL_GLX_H 1
+#define HAVE_EGL_EGL_H 1
 _ACEOF
  :
 else
-  USE_GLX=0
+  USE_EGL=0
 fi
 
 done
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for glXCreateContext in -lGL" >&5
-$as_echo_n "checking for glXCreateContext in -lGL... " >&6; }
-if ${ac_cv_lib_GL_glXCreateContext+:} false; then :
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for eglGetDisplay in -lEGL" >&5
+$as_echo_n "checking for eglGetDisplay in -lEGL... " >&6; }
+if ${ac_cv_lib_EGL_eglGetDisplay+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lGL  $LIBS"
+LIBS="-lEGL  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -14802,30 +15190,30 @@
 #ifdef __cplusplus
 extern "C"
 #endif
-char glXCreateContext ();
+char eglGetDisplay ();
 int
 main ()
 {
-return glXCreateContext ();
+return eglGetDisplay ();
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_GL_glXCreateContext=yes
+  ac_cv_lib_EGL_eglGetDisplay=yes
 else
-  ac_cv_lib_GL_glXCreateContext=no
+  ac_cv_lib_EGL_eglGetDisplay=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_GL_glXCreateContext" >&5
-$as_echo "$ac_cv_lib_GL_glXCreateContext" >&6; }
-if test "x$ac_cv_lib_GL_glXCreateContext" = xyes; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_EGL_eglGetDisplay" >&5
+$as_echo "$ac_cv_lib_EGL_eglGetDisplay" >&6; }
+if test "x$ac_cv_lib_EGL_eglGetDisplay" = xyes; then :
   :
 else
-  USE_GLX=0
+  USE_EGL=0
 fi
 
     CPPFLAGS="$saved_CPPFLAGS"
@@ -14843,12 +15231,12 @@
     pkg_cv_WAYLAND_CFLAGS="$WAYLAND_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"wayland-client >= 1.0.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "wayland-client >= 1.0.0") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"wayland-client >= 1.0.2\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "wayland-client >= 1.0.2") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_WAYLAND_CFLAGS=`$PKG_CONFIG --cflags "wayland-client >= 1.0.0" 2>/dev/null`
+  pkg_cv_WAYLAND_CFLAGS=`$PKG_CONFIG --cflags "wayland-client >= 1.0.2" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -14860,12 +15248,12 @@
     pkg_cv_WAYLAND_LIBS="$WAYLAND_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"wayland-client >= 1.0.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "wayland-client >= 1.0.0") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"wayland-client >= 1.0.2\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "wayland-client >= 1.0.2") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_WAYLAND_LIBS=`$PKG_CONFIG --libs "wayland-client >= 1.0.0" 2>/dev/null`
+  pkg_cv_WAYLAND_LIBS=`$PKG_CONFIG --libs "wayland-client >= 1.0.2" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -14886,9 +15274,9 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        WAYLAND_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "wayland-client >= 1.0.0" 2>&1`
+	        WAYLAND_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "wayland-client >= 1.0.2" 2>&1`
         else
-	        WAYLAND_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "wayland-client >= 1.0.0" 2>&1`
+	        WAYLAND_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "wayland-client >= 1.0.2" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$WAYLAND_PKG_ERRORS" >&5
@@ -15322,6 +15710,66 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_vp8_decoding_api" >&5
 $as_echo "$ac_cv_have_vp8_decoding_api" >&6; }
 
+saved_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS $LIBVA_CFLAGS"
+for ac_header in va/va_dec_hevc.h
+do :
+  ac_fn_c_check_header_compile "$LINENO" "va/va_dec_hevc.h" "ac_cv_header_va_va_dec_hevc_h" "#include <va/va.h>
+"
+if test "x$ac_cv_header_va_va_dec_hevc_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_VA_VA_DEC_HEVC_H 1
+_ACEOF
+
+fi
+
+done
+
+CPPFLAGS="$saved_CPPFLAGS"
+
+USE_HEVC_DECODER=0
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for HEVC decoding API" >&5
+$as_echo_n "checking for HEVC decoding API... " >&6; }
+if ${ac_cv_have_hevc_decoding_api+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+    saved_CPPFLAGS="$CPPFLAGS"
+    CPPFLAGS="$CPPFLAGS $LIBVA_CFLAGS"
+    saved_LIBS="$LIBS"
+    LIBS="$LIBS $LIBVA_LIBS"
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <va/va.h>
+              #ifdef HAVE_VA_VA_DEC_HEVC_H
+              #include <va/va_dec_hevc.h>
+              #endif
+
+int
+main ()
+{
+VAPictureParameterBufferHEVC pic_param;
+              VASliceParameterBufferHEVC slice_param;
+              VAIQMatrixBufferHEVC iq_matrix;
+              slice_param.slice_data_offset = 0;
+              slice_param.slice_data_flag = 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_have_hevc_decoding_api="yes" USE_HEVC_DECODER=1
+else
+  ac_cv_have_hevc_decoding_api="no"
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    CPPFLAGS="$saved_CPPFLAGS"
+    LIBS="$saved_LIBS"
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_hevc_decoding_api" >&5
+$as_echo "$ac_cv_have_hevc_decoding_api" >&6; }
 
 USE_VA_VPP=0
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for video post-postprocessing API" >&5
@@ -15366,6 +15814,9 @@
 $as_echo "$ac_cv_have_va_vpp_api" >&6; }
 
 USE_ENCODERS=0
+USE_JPEG_ENCODER=0
+USE_VP8_ENCODER=0
+USE_H265_ENCODER=0
 if test "$enable_encoders" = "yes"; then
 
 pkg_failed=no
@@ -15459,6 +15910,173 @@
 
 done
 
+
+                for ac_header in va/va_enc_jpeg.h
+do :
+  ac_fn_c_check_header_compile "$LINENO" "va/va_enc_jpeg.h" "ac_cv_header_va_va_enc_jpeg_h" "#include <va/va.h>
+
+"
+if test "x$ac_cv_header_va_va_enc_jpeg_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_VA_VA_ENC_JPEG_H 1
+_ACEOF
+ USE_JPEG_ENCODER=1
+fi
+
+done
+
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for JPEG encoding API" >&5
+$as_echo_n "checking for JPEG encoding API... " >&6; }
+if ${ac_cv_have_jpeg_encoding_api+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+            saved_CPPFLAGS="$CPPFLAGS"
+            CPPFLAGS="$CPPFLAGS $LIBVA_CFLAGS"
+            saved_LIBS="$LIBS"
+            LIBS="$LIBS $LIBVA_LIBS"
+            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <va/va.h>
+                      #ifdef HAVE_VA_VA_ENC_JPEG_H
+                      #include <va/va_enc_jpeg.h>
+                      #endif
+
+int
+main ()
+{
+VAEncPictureParameterBufferJPEG pic_param;
+                      VAEncSliceParameterBufferJPEG slice_param;
+                      VAQMatrixBufferJPEG q_matrix;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_have_jpeg_encoding_api="yes" USE_JPEG_ENCODER=1
+else
+  ac_cv_have_jpeg_encoding_api="no"
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+            CPPFLAGS="$saved_CPPFLAGS"
+            LIBS="$saved_LIBS"
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_jpeg_encoding_api" >&5
+$as_echo "$ac_cv_have_jpeg_encoding_api" >&6; }
+
+                for ac_header in va/va_enc_vp8.h
+do :
+  ac_fn_c_check_header_compile "$LINENO" "va/va_enc_vp8.h" "ac_cv_header_va_va_enc_vp8_h" "#include <va/va.h>
+
+"
+if test "x$ac_cv_header_va_va_enc_vp8_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_VA_VA_ENC_VP8_H 1
+_ACEOF
+ USE_VP8_ENCODER=1
+fi
+
+done
+
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for VP8 encoding API" >&5
+$as_echo_n "checking for VP8 encoding API... " >&6; }
+if ${ac_cv_have_vp8_encoding_api+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+            saved_CPPFLAGS="$CPPFLAGS"
+            CPPFLAGS="$CPPFLAGS $LIBVA_CFLAGS"
+            saved_LIBS="$LIBS"
+            LIBS="$LIBS $LIBVA_LIBS"
+            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <va/va.h>
+                      #ifdef HAVE_VA_VA_ENC_VP8_H
+                      #include <va/va_enc_vp8.h>
+                      #endif
+
+int
+main ()
+{
+VAEncSequenceParameterBufferVP8 seq_param;
+                      VAEncPictureParameterBufferVP8 pic_param;
+                      VAQMatrixBufferVP8 q_matrix;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_have_vp8_encoding_api="yes" USE_VP8_ENCODER=1
+else
+  ac_cv_have_vp8_encoding_api="no" USE_VP8_ENCODER=0
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+            CPPFLAGS="$saved_CPPFLAGS"
+            LIBS="$saved_LIBS"
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_vp8_encoding_api" >&5
+$as_echo "$ac_cv_have_vp8_encoding_api" >&6; }
+        CPPFLAGS="$saved_CPPFLAGS"
+
+                for ac_header in va/va_enc_hevc.h
+do :
+  ac_fn_c_check_header_compile "$LINENO" "va/va_enc_hevc.h" "ac_cv_header_va_va_enc_hevc_h" "#include <va/va.h>
+
+"
+if test "x$ac_cv_header_va_va_enc_hevc_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_VA_VA_ENC_HEVC_H 1
+_ACEOF
+ USE_H265_ENCODER=1
+fi
+
+done
+
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for HEVC encoding API" >&5
+$as_echo_n "checking for HEVC encoding API... " >&6; }
+if ${ac_cv_have_hevc_encoding_api+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+            saved_CPPFLAGS="$CPPFLAGS"
+            CPPFLAGS="$CPPFLAGS $LIBVA_CFLAGS"
+            saved_LIBS="$LIBS"
+            LIBS="$LIBS $LIBVA_LIBS"
+            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <va/va.h>
+                      #ifdef HAVE_VA_VA_ENC_HEVC_H
+                      #include <va/va_enc_hevc.h>
+                      #endif
+
+int
+main ()
+{
+VAEncSequenceParameterBufferHEVC seq_param;
+                      VAEncPictureParameterBufferHEVC pic_param;
+                      VAEncSliceParameterBufferHEVC;
+                      VAQMatrixBufferHEVC q_matrix;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_have_hevc_encoding_api="yes" USE_H265_ENCODER=1
+else
+  ac_cv_have_hevc_encoding_api="no" USE_H265_ENCODER=0
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+            CPPFLAGS="$saved_CPPFLAGS"
+            LIBS="$saved_LIBS"
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_hevc_encoding_api" >&5
+$as_echo "$ac_cv_have_hevc_encoding_api" >&6; }
         CPPFLAGS="$saved_CPPFLAGS"
     fi
 fi
@@ -15538,7 +16156,7 @@
 fi
 
 
-case ":$USE_X11:$USE_GLX:$USE_WAYLAND:$USE_DRM:" in
+case ":$USE_X11:$USE_GLX:$USE_EGL:$USE_WAYLAND:$USE_DRM:" in
 *:1:*)
     ;;
 *)
@@ -15562,6 +16180,48 @@
 
 
 cat >>confdefs.h <<_ACEOF
+#define USE_JPEG_ENCODER $USE_JPEG_ENCODER
+_ACEOF
+
+ if test $USE_JPEG_ENCODER -eq 1; then
+  USE_JPEG_ENCODER_TRUE=
+  USE_JPEG_ENCODER_FALSE='#'
+else
+  USE_JPEG_ENCODER_TRUE='#'
+  USE_JPEG_ENCODER_FALSE=
+fi
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define USE_VP8_ENCODER $USE_VP8_ENCODER
+_ACEOF
+
+ if test $USE_VP8_ENCODER -eq 1; then
+  USE_VP8_ENCODER_TRUE=
+  USE_VP8_ENCODER_FALSE='#'
+else
+  USE_VP8_ENCODER_TRUE='#'
+  USE_VP8_ENCODER_FALSE=
+fi
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define USE_H265_ENCODER $USE_H265_ENCODER
+_ACEOF
+
+ if test $USE_H265_ENCODER -eq 1; then
+  USE_H265_ENCODER_TRUE=
+  USE_H265_ENCODER_FALSE='#'
+else
+  USE_H265_ENCODER_TRUE='#'
+  USE_H265_ENCODER_FALSE=
+fi
+
+
+
+cat >>confdefs.h <<_ACEOF
 #define USE_VA_VPP $USE_VA_VPP
 _ACEOF
 
@@ -15604,6 +16264,20 @@
 
 
 cat >>confdefs.h <<_ACEOF
+#define USE_HEVC_DECODER $USE_HEVC_DECODER
+_ACEOF
+
+ if test $USE_HEVC_DECODER -eq 1; then
+  USE_HEVC_DECODER_TRUE=
+  USE_HEVC_DECODER_FALSE='#'
+else
+  USE_HEVC_DECODER_TRUE='#'
+  USE_HEVC_DECODER_FALSE=
+fi
+
+
+
+cat >>confdefs.h <<_ACEOF
 #define USE_DRM $USE_DRM
 _ACEOF
 
@@ -15646,6 +16320,26 @@
 
 
 cat >>confdefs.h <<_ACEOF
+#define USE_EGL $USE_EGL
+_ACEOF
+
+ if test $USE_EGL -eq 1; then
+  USE_EGL_TRUE=
+  USE_EGL_FALSE='#'
+else
+  USE_EGL_TRUE='#'
+  USE_EGL_FALSE=
+fi
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define USE_GLES_VERSION_MASK $GLES_VERSION_MASK
+_ACEOF
+
+
+
+cat >>confdefs.h <<_ACEOF
 #define USE_WAYLAND $USE_WAYLAND
 _ACEOF
 
@@ -15661,7 +16355,7 @@
 pkgconfigdir=${libdir}/pkgconfig
 
 
-ac_config_files="$ac_config_files Makefile debian.upstream/Makefile debian.upstream/changelog debian.upstream/control debian.upstream/gstreamer$GST_API_VERSION-vaapi-doc.install:debian.upstream/gstreamer-vaapi-doc.install.in debian.upstream/gstreamer$GST_API_VERSION-vaapi.install:debian.upstream/gstreamer-vaapi.install.in debian.upstream/libgstvaapi$GST_PKG_VERSION-dev.install:debian.upstream/libgstvaapi-dev.install.in debian.upstream/libgstvaapi$GST_VAAPI_MAJOR_VERSION.install:debian.upstream/libgstvaapi.install.in debian.upstream/libgstvaapi-drm-$GST_VAAPI_MAJOR_VERSION.install:debian.upstream/libgstvaapi-drm.install.in debian.upstream/libgstvaapi-glx-$GST_VAAPI_MAJOR_VERSION.install:debian.upstream/libgstvaapi-glx.install.in debian.upstream/libgstvaapi-wayland-$GST_VAAPI_MAJOR_VERSION.install:debian.upstream/libgstvaapi-wayland.install.in debian.upstream/libgstvaapi-x11-$GST_VAAPI_MAJOR_VERSION.install:debian.upstream/libgstvaapi-x11.install.in docs/Makefile docs/reference/Makefile docs/reference/libs/Makefile docs/reference/libs/libs-docs.xml docs/reference/plugins/Makefile docs/reference/plugins/plugins-docs.xml ext/Makefile ext/libvpx/Makefile gst-libs/Makefile gst-libs/gst/Makefile gst-libs/gst/base/Makefile gst-libs/gst/codecparsers/Makefile gst-libs/gst/vaapi/Makefile gst-libs/gst/video/Makefile gst/Makefile gst/vaapi/Makefile patches/Makefile patches/videoparsers/Makefile pkgconfig/Makefile pkgconfig/gstreamer-vaapi-$GST_PKG_VERSION.pc:pkgconfig/gstreamer-vaapi.pc.in pkgconfig/gstreamer-vaapi-drm-$GST_PKG_VERSION.pc:pkgconfig/gstreamer-vaapi-drm.pc.in pkgconfig/gstreamer-vaapi-glx-$GST_PKG_VERSION.pc:pkgconfig/gstreamer-vaapi-glx.pc.in pkgconfig/gstreamer-vaapi-wayland-$GST_PKG_VERSION.pc:pkgconfig/gstreamer-vaapi-wayland.pc.in pkgconfig/gstreamer-vaapi-x11-$GST_PKG_VERSION.pc:pkgconfig/gstreamer-vaapi-x11.pc.in tests/Makefile"
+ac_config_files="$ac_config_files Makefile debian.upstream/Makefile debian.upstream/changelog debian.upstream/control debian.upstream/gstreamer$GST_API_VERSION-vaapi-doc.install:debian.upstream/gstreamer-vaapi-doc.install.in debian.upstream/gstreamer$GST_API_VERSION-vaapi.install:debian.upstream/gstreamer-vaapi.install.in debian.upstream/libgstvaapi$GST_PKG_VERSION-dev.install:debian.upstream/libgstvaapi-dev.install.in debian.upstream/libgstvaapi$GST_VAAPI_MAJOR_VERSION.install:debian.upstream/libgstvaapi.install.in debian.upstream/libgstvaapi-drm-$GST_VAAPI_MAJOR_VERSION.install:debian.upstream/libgstvaapi-drm.install.in debian.upstream/libgstvaapi-glx-$GST_VAAPI_MAJOR_VERSION.install:debian.upstream/libgstvaapi-glx.install.in debian.upstream/libgstvaapi-wayland-$GST_VAAPI_MAJOR_VERSION.install:debian.upstream/libgstvaapi-wayland.install.in debian.upstream/libgstvaapi-x11-$GST_VAAPI_MAJOR_VERSION.install:debian.upstream/libgstvaapi-x11.install.in docs/Makefile docs/reference/Makefile docs/reference/libs/Makefile docs/reference/libs/libs-docs.xml docs/reference/plugins/Makefile docs/reference/plugins/plugins-docs.xml ext/Makefile ext/libvpx/Makefile gst-libs/Makefile gst-libs/gst/Makefile gst-libs/gst/base/Makefile gst-libs/gst/codecparsers/Makefile gst-libs/gst/vaapi/Makefile gst/Makefile gst/vaapi/Makefile patches/Makefile patches/videoparsers/Makefile pkgconfig/Makefile pkgconfig/gstreamer-vaapi-$GST_PKG_VERSION.pc:pkgconfig/gstreamer-vaapi.pc.in pkgconfig/gstreamer-vaapi-drm-$GST_PKG_VERSION.pc:pkgconfig/gstreamer-vaapi-drm.pc.in pkgconfig/gstreamer-vaapi-glx-$GST_PKG_VERSION.pc:pkgconfig/gstreamer-vaapi-glx.pc.in pkgconfig/gstreamer-vaapi-wayland-$GST_PKG_VERSION.pc:pkgconfig/gstreamer-vaapi-wayland.pc.in pkgconfig/gstreamer-vaapi-x11-$GST_PKG_VERSION.pc:pkgconfig/gstreamer-vaapi-x11.pc.in tests/Makefile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -15824,14 +16518,6 @@
   as_fn_error $? "conditional \"GTK_DOC_USE_REBASE\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${USE_GST_API_0_10_TRUE}" && test -z "${USE_GST_API_0_10_FALSE}"; then
-  as_fn_error $? "conditional \"USE_GST_API_0_10\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${USE_GST_API_1_0p_TRUE}" && test -z "${USE_GST_API_1_0p_FALSE}"; then
-  as_fn_error $? "conditional \"USE_GST_API_1_0p\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 if test -z "${USE_GST_API_1_2p_TRUE}" && test -z "${USE_GST_API_1_2p_FALSE}"; then
   as_fn_error $? "conditional \"USE_GST_API_1_2p\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -15860,14 +16546,34 @@
   as_fn_error $? "conditional \"USE_BUILTIN_LIBVPX\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${USE_LOCAL_CODEC_PARSERS_H265_TRUE}" && test -z "${USE_LOCAL_CODEC_PARSERS_H265_FALSE}"; then
+  as_fn_error $? "conditional \"USE_LOCAL_CODEC_PARSERS_H265\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${USE_LOCAL_VIDEO_PARSERS_TRUE}" && test -z "${USE_LOCAL_VIDEO_PARSERS_FALSE}"; then
   as_fn_error $? "conditional \"USE_LOCAL_VIDEO_PARSERS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${USE_GST_GL_HELPERS_TRUE}" && test -z "${USE_GST_GL_HELPERS_FALSE}"; then
+  as_fn_error $? "conditional \"USE_GST_GL_HELPERS\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${USE_ENCODERS_TRUE}" && test -z "${USE_ENCODERS_FALSE}"; then
   as_fn_error $? "conditional \"USE_ENCODERS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${USE_JPEG_ENCODER_TRUE}" && test -z "${USE_JPEG_ENCODER_FALSE}"; then
+  as_fn_error $? "conditional \"USE_JPEG_ENCODER\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${USE_VP8_ENCODER_TRUE}" && test -z "${USE_VP8_ENCODER_FALSE}"; then
+  as_fn_error $? "conditional \"USE_VP8_ENCODER\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${USE_H265_ENCODER_TRUE}" && test -z "${USE_H265_ENCODER_FALSE}"; then
+  as_fn_error $? "conditional \"USE_H265_ENCODER\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${USE_VA_VPP_TRUE}" && test -z "${USE_VA_VPP_FALSE}"; then
   as_fn_error $? "conditional \"USE_VA_VPP\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -15880,6 +16586,10 @@
   as_fn_error $? "conditional \"USE_VP8_DECODER\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${USE_HEVC_DECODER_TRUE}" && test -z "${USE_HEVC_DECODER_FALSE}"; then
+  as_fn_error $? "conditional \"USE_HEVC_DECODER\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${USE_DRM_TRUE}" && test -z "${USE_DRM_FALSE}"; then
   as_fn_error $? "conditional \"USE_DRM\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -15892,6 +16602,10 @@
   as_fn_error $? "conditional \"USE_GLX\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${USE_EGL_TRUE}" && test -z "${USE_EGL_FALSE}"; then
+  as_fn_error $? "conditional \"USE_EGL\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${USE_WAYLAND_TRUE}" && test -z "${USE_WAYLAND_FALSE}"; then
   as_fn_error $? "conditional \"USE_WAYLAND\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -16293,7 +17007,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by gst_vaapi $as_me 0.5.10, which was
+This file was extended by gst_vaapi $as_me 0.6.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -16353,13 +17067,13 @@
 Configuration commands:
 $config_commands
 
-Report bugs to <gwenole.beauchesne@intel.com>."
+Report bugs to <gwenole.beauchesne@intel.com, sreerenj.balachandran@intel.com>."
 
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-gst_vaapi config.status 0.5.10
+gst_vaapi config.status 0.6.0
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -16793,7 +17507,6 @@
     "gst-libs/gst/base/Makefile") CONFIG_FILES="$CONFIG_FILES gst-libs/gst/base/Makefile" ;;
     "gst-libs/gst/codecparsers/Makefile") CONFIG_FILES="$CONFIG_FILES gst-libs/gst/codecparsers/Makefile" ;;
     "gst-libs/gst/vaapi/Makefile") CONFIG_FILES="$CONFIG_FILES gst-libs/gst/vaapi/Makefile" ;;
-    "gst-libs/gst/video/Makefile") CONFIG_FILES="$CONFIG_FILES gst-libs/gst/video/Makefile" ;;
     "gst/Makefile") CONFIG_FILES="$CONFIG_FILES gst/Makefile" ;;
     "gst/vaapi/Makefile") CONFIG_FILES="$CONFIG_FILES gst/vaapi/Makefile" ;;
     "patches/Makefile") CONFIG_FILES="$CONFIG_FILES patches/Makefile" ;;
@@ -18176,6 +18889,9 @@
 if test $USE_GLX -eq 1; then :
   VIDEO_OUTPUTS="$VIDEO_OUTPUTS glx"
 fi
+if test $USE_EGL -eq 1; then :
+  VIDEO_OUTPUTS="$VIDEO_OUTPUTS egl"
+fi
 if test $USE_WAYLAND -eq 1; then :
   VIDEO_OUTPUTS="$VIDEO_OUTPUTS wayland"
 fi
diff -Nru gstreamer-vaapi-0.5.10/configure.ac gstreamer-vaapi-0.6.0/configure.ac
--- gstreamer-vaapi-0.5.10/configure.ac	2015-02-03 08:00:40.000000000 +0000
+++ gstreamer-vaapi-0.6.0/configure.ac	2015-07-15 12:49:33.000000000 +0000
@@ -1,7 +1,7 @@
 # gstreamer-vaapi package version number
 m4_define([gst_vaapi_major_version], [0])
-m4_define([gst_vaapi_minor_version], [5])
-m4_define([gst_vaapi_micro_version], [10])
+m4_define([gst_vaapi_minor_version], [6])
+m4_define([gst_vaapi_micro_version], [0])
 m4_define([gst_vaapi_pre_version],   [0])
 m4_define([gst_vaapi_version],
           [gst_vaapi_major_version.gst_vaapi_minor_version.gst_vaapi_micro_version])
@@ -9,10 +9,11 @@
 m4_append([gst_vaapi_version], gst_vaapi_pre_version, [.pre])
 ])
 
+# Configure defaults
+m4_define([default_glapi],              [any])
+
 # gstreamer-vaapi library (libtool) version number
-m4_define([gst_vaapi_lt_current],       [6])
-m4_define([gst0_vaapi_lt_current_bias], [0])
-m4_define([gst1_vaapi_lt_current_bias], [2])
+m4_define([gst_vaapi_lt_current],       [7])
 m4_define([gst2_vaapi_lt_current_bias], [4])
 m4_define([gst4_vaapi_lt_current_bias], [5])
 m4_define([gst6_vaapi_lt_current_bias], [6])
@@ -20,16 +21,10 @@
 m4_define([gst_vaapi_lt_age],           [0])
 
 # glib version number
-m4_define([glib_version], [2.28])
+m4_define([glib_version], [2.32])
 
 # gstreamer version number
 m4_define([gst_api_version],            [autodetect])
-m4_define([gst0_version],               [0.10.36])
-m4_define([gst0_plugins_base_version],  [0.10.31])
-m4_define([gst0_plugins_bad_version],   [0.10.22])
-m4_define([gst1_version],               [1.0.0])
-m4_define([gst1_plugins_base_version],  [1.0.0])
-m4_define([gst1_plugins_bad_version],   [1.0.0])
 m4_define([gst12_version],              [1.1.90])
 m4_define([gst12_plugins_base_version], [1.1.0])
 m4_define([gst12_plugins_bad_version],  [1.1.0])
@@ -41,7 +36,7 @@
 m4_define([gst16_plugins_bad_version],  [1.5.0])
 
 # Wayland minimum version number
-m4_define([wayland_api_version], [1.0.0])
+m4_define([wayland_api_version], [1.0.2])
 
 # VA-API minimum version number
 m4_define([va_api_version],     [0.30.4])
@@ -62,7 +57,7 @@
 
 AC_PREREQ([2.66])
 AC_INIT([gst_vaapi], [gst_vaapi_version],
-    [gwenole.beauchesne@intel.com],
+    [gwenole.beauchesne@intel.com, sreerenj.balachandran@intel.com],
     [gstreamer-vaapi])
 
 AC_CONFIG_HEADERS([config.h])
@@ -147,11 +142,15 @@
                    [enable Wayland output @<:@default=yes@:>@]),
     [], [enable_wayland="yes"])
 
-AC_ARG_WITH([gstreamer-api],
-    AC_HELP_STRING([--with-gstreamer-api=VERSION],
-                   [build against the specified GStreamer API version
-                    @<:@default=gst_api_version@:>@]),
-    [GST_API_VERSION="$with_gstreamer_api"], [GST_API_VERSION=gst_api_version])
+AC_ARG_ENABLE([egl],
+    AS_HELP_STRING([--enable-egl],
+        [enable EGL output @<:@default=yes@:>@]),
+    [], [enable_egl="yes"])
+
+AC_ARG_WITH([glapi],
+    AS_HELP_STRING([--with-glapi=APIs],
+        [build with the specified OpenGL APIs @<:@default=default_glapi@:>@]),
+    [GLAPI="$with_glapi"], [GLAPI=default_glapi])
 
 dnl Check for basic libraries
 AC_CHECK_LIB(m, tan)
@@ -178,45 +177,24 @@
 dnl ---------------------------------------------------------------------------
 dnl -- GStreamer                                                             --
 dnl ---------------------------------------------------------------------------
-
-dnl If GStreamer API version is to be autodetected, then always try
-dnl with the latest version first
 AC_MSG_CHECKING([for GStreamer API version])
-if test "$GST_API_VERSION" = "autodetect"; then
-    gst_pkg_versions="1.0 0.10"
-else
-    AS_VERSION_COMPARE([$GST_API_VERSION], [1.0],
-        [gst_pkg_versions="0.10"], [gst_pkg_versions="1.0"],
-        dnl GStreamer 1.2.x and 1.4.x APIs don't have their own namespace
-        [gst_pkg_versions="1.0"])
-fi
-for gst_pkg_version in ${gst_pkg_versions}; do
-    if $PKG_CONFIG --exists "gstreamer-$gst_pkg_version"; then
-        gst_version=`$PKG_CONFIG --modversion "gstreamer-$gst_pkg_version"`
-        gst_major_version=`echo "$gst_version" | cut -d'.' -f1`
-        gst_minor_version=`echo "$gst_version" | cut -d'.' -f2`
-        GST_API_VERSION="${gst_major_version}.${gst_minor_version}"
-        GST_PKG_VERSION="$gst_pkg_version"
-        break
-    fi
-done
+if $PKG_CONFIG --exists "gstreamer-1.0"; then
+    gst_version=`$PKG_CONFIG --modversion "gstreamer-1.0"`
+    gst_major_version=`echo "$gst_version" | cut -d'.' -f1`
+    gst_minor_version=`echo "$gst_version" | cut -d'.' -f2`
+    GST_API_VERSION="${gst_major_version}.${gst_minor_version}"
+    GST_PKG_VERSION="1.0"
+fi
 if test -z "$GST_PKG_VERSION"; then
-    AC_MSG_ERROR([version $GST_API_VERSION not found])
+    AC_MSG_ERROR([gstreamer-$GST_PKG_VERSION was not found])
 fi
 AC_MSG_RESULT([$GST_API_VERSION])
 
+AC_DEFINE_UNQUOTED([GST_API_VERSION_S], ["$GST_API_VERSION"],
+    [Defined to the string representation of GStreamer version])
+
 dnl Versions for GStreamer and plugins-base
 case $GST_API_VERSION in
-0.10)
-    GST_VERSION_REQUIRED=gst0_version
-    GST_PLUGINS_BASE_VERSION_REQUIRED=gst0_plugins_base_version
-    GST_PLUGINS_BAD_VERSION_REQUIRED=gst0_plugins_bad_version
-    ;;
-1.0)
-    GST_VERSION_REQUIRED=gst1_version
-    GST_PLUGINS_BASE_VERSION_REQUIRED=gst1_plugins_base_version
-    GST_PLUGINS_BAD_VERSION_REQUIRED=gst1_plugins_bad_version
-    ;;
 1.2)
     GST_VERSION_REQUIRED=gst12_version
     GST_PLUGINS_BASE_VERSION_REQUIRED=gst12_plugins_base_version
@@ -241,39 +219,22 @@
 AC_SUBST(GST_PLUGINS_BASE_VERSION_REQUIRED)
 AC_SUBST(GST_PLUGINS_BAD_VERSION_REQUIRED)
 
-USE_GST_API_0_10="no"
-USE_GST_API_1_0p="no"
 USE_GST_API_1_2p="no"
 USE_GST_API_1_4p="no"
-AS_VERSION_COMPARE([$GST_API_VERSION], [0.10],
-    [], [USE_GST_API_0_10="yes"], [])
-AS_VERSION_COMPARE([$GST_API_VERSION], [1.0],
-    [], [USE_GST_API_1_0p="yes"], [USE_GST_API_1_0p="yes"])
 AS_VERSION_COMPARE([$GST_API_VERSION], [1.2],
     [], [USE_GST_API_1_2p="yes"], [USE_GST_API_1_2p="yes"])
 AS_VERSION_COMPARE([$GST_API_VERSION], [1.4],
     [], [USE_GST_API_1_4p="yes"], [USE_GST_API_1_4p="yes"])
-AM_CONDITIONAL([USE_GST_API_0_10], [test "$USE_GST_API_0_10" = "yes"])
-AM_CONDITIONAL([USE_GST_API_1_0p], [test "$USE_GST_API_1_0p" = "yes"])
 AM_CONDITIONAL([USE_GST_API_1_2p], [test "$USE_GST_API_1_2p" = "yes"])
 AM_CONDITIONAL([USE_GST_API_1_4p], [test "$USE_GST_API_1_4p" = "yes"])
 
-dnl GStreamer 1.2.x and 1.4.x APIs don't have their own namespace
-GST_PKG_VERSION="$GST_API_VERSION"
-if test "$USE_GST_API_1_2p" = "yes" || test "$USE_GST_API_1_4p" = "yes" ; then
-    GST_PKG_VERSION="1.0"
-fi
 AC_SUBST([GST_PKG_VERSION])
 
-dnl Validate certain features
-if test "$USE_GST_API_0_10" = "yes"; then
-    AC_MSG_WARN([support for GStreamer 0.10 is obsolete, and will be removed])
-    if test "$enable_builtin_videoparsers" = "yes"; then
-        AC_MSG_WARN([disabled built-in videoparsers (unsupported)])
-        enable_builtin_videoparsers="no"
-    fi
-elif test "$GST_API_VERSION" = "1.0"; then
-    AC_MSG_WARN([support for GStreamer 1.0 is obsolete, and will be removed])
+AC_DEFINE_UNQUOTED([GST_PKG_VERSION_S], ["$GST_PKG_VERSION"],
+    [Defined to the string representation of GStreamer API version])
+
+if test "$GST_API_VERSION" = "1.2"; then
+    AC_MSG_WARN([support for GStreamer 1.2 is deprecated, please upgrade])
 fi
 
 dnl GStreamer Core
@@ -282,25 +243,6 @@
 PKG_CHECK_MODULES([GST_BASE],
     [gstreamer-base-$GST_PKG_VERSION >= $GST_VERSION_REQUIRED])
 
-AC_CACHE_CHECK([for GstBaseSink::query hook], ac_cv_have_gst_base_sink_query, [
-    saved_CPPFLAGS="$CPPFLAGS"
-    CPPFLAGS="$CPPFLAGS $GST_BASE_CFLAGS"
-    saved_LIBS="$LIBS"
-    LIBS="$LIBS $GST_BASE_LIBS"
-    AC_COMPILE_IFELSE(
-        [AC_LANG_PROGRAM(
-            [[#include <gst/base/gstbasesink.h>]],
-            [[GstBaseSinkClass klass; klass.query = NULL;]])],
-        [ac_cv_have_gst_base_sink_query="yes"],
-        [ac_cv_have_gst_base_sink_query="no"]
-    )
-    CPPFLAGS="$saved_CPPFLAGS"
-    LIBS="$saved_LIBS"
-])
-if test "$ac_cv_have_gst_base_sink_query" != "yes"; then
-    AC_MSG_ERROR([GstBaseSink does not contain the 'query' vfunc])
-fi
-
 dnl GStreamer -base plugins
 PKG_CHECK_MODULES([GST_PLUGINS_BASE],
     [gstreamer-plugins-base-$GST_PKG_VERSION >= $GST_PLUGINS_BASE_VERSION_REQUIRED])
@@ -317,55 +259,6 @@
 PKG_CHECK_MODULES([GST_VIDEO],
     [gstreamer-video-$GST_PKG_VERSION >= $GST_PLUGINS_BASE_VERSION_REQUIRED])
 
-AC_CACHE_CHECK([for GstVideoOverlayComposition],
-    ac_cv_have_gst_video_overlay_composition, [
-    saved_CPPFLAGS="$CPPFLAGS"
-    CPPFLAGS="$CPPFLAGS $GST_CFLAGS $GST_VIDEO_CFLAGS"
-    saved_LIBS="$LIBS"
-    LIBS="$LIBS $GST_LIBS $GST_VIDEO_LIBS"
-    AC_COMPILE_IFELSE(
-        [AC_LANG_PROGRAM(
-            [[#include <gst/video/video-overlay-composition.h>]],
-            [[GstVideoOverlayComposition *c;
-              c = gst_video_overlay_composition_new(0);]])],
-        [ac_cv_have_gst_video_overlay_composition="yes"],
-        [ac_cv_have_gst_video_overlay_composition="no"]
-    )
-    CPPFLAGS="$saved_CPPFLAGS"
-    LIBS="$saved_LIBS"
-])
-if test "$ac_cv_have_gst_video_overlay_composition" != "yes"; then
-    AC_MSG_ERROR([GstVideoOverlayComposition is not available])
-fi
-
-AC_CACHE_CHECK([... with advanced format flags],
-    ac_cv_have_gst_video_overlay_hwcaps, [
-    saved_CPPFLAGS="$CPPFLAGS"
-    CPPFLAGS="$CPPFLAGS $GST_CFLAGS $GST_VIDEO_CFLAGS"
-    saved_LIBS="$LIBS"
-    LIBS="$LIBS $GST_LIBS $GST_VIDEO_LIBS"
-    AC_COMPILE_IFELSE(
-        [AC_LANG_PROGRAM(
-            [[#include <gst/video/video-overlay-composition.h>]],
-            [[GstVideoOverlayRectangle *rect;
-              const guint w = 64, h = 64;
-              guint flags = (
-                  GST_VIDEO_OVERLAY_FORMAT_FLAG_PREMULTIPLIED_ALPHA|
-                  GST_VIDEO_OVERLAY_FORMAT_FLAG_GLOBAL_ALPHA);
-              rect = gst_video_overlay_rectangle_new_argb(NULL, w, h, w * 4,
-                  0, 0, w, h, flags);
-              gst_video_overlay_rectangle_set_global_alpha(rect, 0.5f);]])],
-        [ac_cv_have_gst_video_overlay_hwcaps="yes"],
-        [ac_cv_have_gst_video_overlay_hwcaps="no"]
-    )
-    CPPFLAGS="$saved_CPPFLAGS"
-    LIBS="$saved_LIBS"
-])
-if test "$ac_cv_have_gst_video_overlay_hwcaps" = "yes"; then
-    AC_DEFINE_UNQUOTED([HAVE_GST_VIDEO_OVERLAY_HWCAPS], 1,
-        [Defined to 1 if GstVideoOverlayComposition API supports HW hints.])
-fi
-
 dnl GStreamer -bad plugins (deprecated in GStreamer v1.2)
 if test "$USE_GST_API_1_2p" != "yes" && test "$USE_GST_API_1_4p" != "yes"; then
 PKG_CHECK_MODULES([GST_BASEVIDEO],
@@ -378,6 +271,7 @@
     ac_cv_have_gst_h264_parser="no"
     ac_cv_have_gst_jpeg_parser="no"
     ac_cv_have_gst_vp8_parser="no"
+    ac_cv_have_gst_h265_parser="no"
 else
 PKG_CHECK_MODULES([GST_CODEC_PARSERS],
     [gstreamer-codecparsers-$GST_PKG_VERSION >= $GST_PLUGINS_BAD_VERSION_REQUIRED])
@@ -480,20 +374,83 @@
     [test "$ac_cv_have_gst_vp8_parser" != "yes"])
 AM_CONDITIONAL([USE_BUILTIN_LIBVPX], [test "$enable_builtin_libvpx" = "yes"])
 
+dnl ... H.265 parser, with the required extensions
+AC_CACHE_CHECK([for H.265 parser],
+    ac_cv_have_gst_h265_parser, [
+    saved_CPPFLAGS="$CPPFLAGS"
+    CPPFLAGS="$CPPFLAGS $GST_CFLAGS $GST_CODEC_PARSERS_CFLAGS"
+    saved_LIBS="$LIBS"
+    LIBS="$LIBS $GST_LIBS $GST_CODEC_PARSERS_LIBS"
+    AC_COMPILE_IFELSE(
+        [AC_LANG_PROGRAM(
+            [[#include <gst/codecparsers/gsth265parser.h>]],
+            [[GstH265SliceHdr slice_hdr;
+              GstH265VUIParams vui_params;
+              GstH265Profile profile = GST_H265_PROFILE_MAIN_STILL_PICTURE;
+              slice_hdr.n_emulation_prevention_bytes = 0;
+              vui_params.par_n = 0;
+              vui_params.par_d = 0;]])],
+        [ac_cv_have_gst_h265_parser="yes"],
+        [ac_cv_have_gst_h265_parser="no"]
+    )
+    CPPFLAGS="$saved_CPPFLAGS"
+    LIBS="$saved_LIBS"
+])
+AM_CONDITIONAL([USE_LOCAL_CODEC_PARSERS_H265],
+    [test "$ac_cv_have_gst_h265_parser" != "yes"])
+
 dnl ... video parsers
 AM_CONDITIONAL([USE_LOCAL_VIDEO_PARSERS],
     [test "$enable_builtin_videoparsers" = "yes"])
 
+dnl ... opengl helper libraries
+HAVE_GSTGL=0
+if test "$enable_glx" = "yes" -o "$enable_egl" = "yes"; then
+    PKG_CHECK_MODULES([GST_GL],
+        [gstreamer-gl-$GST_PKG_VERSION >= $GST_PLUGINS_BAD_VERSION_REQUIRED],
+        [HAVE_GSTGL=1], [HAVE_GSTGL=0])
+fi
+
+if test $HAVE_GSTGL -eq 1; then
+    AC_CACHE_CHECK([for GStreamer OpenGL helper libraries],
+        [ac_cv_have_gst_gl_helpers], [
+        saved_CPPFLAGS="$CPPFLAGS"
+        CPPFLAGS="$CPPFLAGS $GST_GL_CFLAGS $GST_VIDEO_CFLAGS"
+        saved_LIBS="$LIBS"
+        LIBS="$saved_LIBS"
+        AC_CHECK_HEADERS([gst/gl/gl.h], [:], [HAVE_GSTGL=0])
+        AC_COMPILE_IFELSE(
+            [AC_LANG_PROGRAM(
+                [[#include <gst/gl/gl.h>]],
+                [[GstGLContext gl_context;]])],
+            [ac_cv_have_gst_gl_helpers="yes"],
+            [ac_cv_have_gst_gl_helpers="no" HAVE_GSTGL=0]
+        )
+        CPPFLAGS="$saved_CPPFLAGS"
+        LIBS="$saved_LIBS"
+    ])
+fi
+AM_CONDITIONAL([USE_GST_GL_HELPERS], [test $HAVE_GSTGL -eq 1])
+
+AC_DEFINE_UNQUOTED([USE_GST_GL_HELPERS], [$HAVE_GSTGL],
+    [Defined to 1 if GStreamer OpenGL helper libraries are available])
+
+if test "$enable_egl" = "yes" -a $HAVE_GSTGL -ne 1; then
+    AC_MSG_WARN([GStreamer/GL helper libraries not found, disabling EGL support])
+    enable_egl="no"
+fi
+
 case $GST_API_VERSION in
-0.10)   lt_bias=gst0_vaapi_lt_current_bias;;
-1.0)    lt_bias=gst1_vaapi_lt_current_bias;;
 1.2)    lt_bias=gst2_vaapi_lt_current_bias;;
-1.4) lt_bias=gst4_vaapi_lt_current_bias;;
+1.4)    lt_bias=gst4_vaapi_lt_current_bias;;
 1.[[5-6]])    lt_bias=gst6_vaapi_lt_current_bias;;
 esac
 GST_VAAPI_MAJOR_VERSION=`expr gst_vaapi_lt_current - "$lt_bias"`
 AC_SUBST(GST_VAAPI_MAJOR_VERSION)
 
+AC_DEFINE_UNQUOTED([GST_VAAPI_MAJOR_VERSION_S], ["$GST_VAAPI_MAJOR_VERSION"],
+    [Defined to the string representation of gstreamer-vaapi major version])
+
 dnl GST_VAAPI_LT_LDFLAGS:
 GST_VAAPI_LT_CURRENT="$GST_VAAPI_MAJOR_VERSION"
 GST_VAAPI_LT_REV=gst_vaapi_lt_revision
@@ -516,15 +473,10 @@
 AC_SUBST(GST_PLUGIN_LDFLAGS)
 
 dnl Check for the GStreamer plugins directory
-AC_ARG_VAR([GST_PLUGIN_PATH], [installation path for gstreamer-vaapi plugin elements for GStreamer 0.10])
 AC_ARG_VAR([GST_PLUGIN_PATH_1_0], [installation path for gstreamer-vaapi plugin elements for GStreamer 1.0])
 AC_MSG_CHECKING([for GStreamer plugins directory])
-case $GST_PKG_VERSION in
-0.10)   _gst_plugin_path="$GST_PLUGIN_PATH";;
-1.0)    _gst_plugin_path="$GST_PLUGIN_PATH_1_0";;
-esac
-if test -d "$_gst_plugin_path"; then
-    GST_PLUGINS_DIR="$_gst_plugin_path"
+if test -d "$GST_PLUGIN_PATH_1_0"; then
+    GST_PLUGINS_DIR="$GST_PLUGIN_PATH_1_0"
 else
     GST_PLUGINS_DIR=`$PKG_CONFIG gstreamer-$GST_PKG_VERSION --variable pluginsdir`
     if test -z "$GST_PLUGINS_DIR"; then
@@ -614,9 +566,15 @@
 if test "$enable_glx" = "yes"; then
     enable_opengl="yes"
 fi
+if test "$enable_egl" = "yes"; then
+    enable_opengl="yes"
+fi
+GLES_VERSION_MASK=0
 
 HAVE_GL=0
 if test "$enable_opengl" = "yes"; then
+case ",$GLAPI," in
+(*,any,*|*,gl,*)
     HAVE_GL=1
     PKG_CHECK_MODULES([GL], [gl], [:], [HAVE_GL=0])
     saved_CPPFLAGS="$CPPFLAGS"
@@ -627,7 +585,52 @@
 #endif
     ])
     CPPFLAGS="$saved_CPPFLAGS"
+    ;;
+esac
+fi
+GLES_VERSION_MASK=`expr $GLES_VERSION_MASK "+" $HAVE_GL "*" 1`
+
+dnl OpenGL|ESv2
+HAVE_GLESv2=0
+if test "$enable_opengl" = "yes"; then
+case ",$GLAPI," in
+(*,any,*|*,gles2,*)
+    HAVE_GLESv2=1
+    PKG_CHECK_MODULES([GLES2], [glesv2], [:], [HAVE_GLESv2=0])
+    saved_CPPFLAGS="$CPPFLAGS"
+    CPPFLAGS="$CPPFLAGS $GLES2_CFLAGS"
+    AC_CHECK_HEADERS([GLES2/gl2.h GLES2/gl2ext.h], [:],
+        [HAVE_GLESv2=0], [
+#ifdef HAVE_GLES2_GL2_H
+# include <GLES2/gl2.h>
+#endif
+    ])
+    CPPFLAGS="$saved_CPPFLAGS"
+    ;;
+esac
+fi
+GLES_VERSION_MASK=`expr $GLES_VERSION_MASK "+" $HAVE_GLESv2 "*" 4`
+
+dnl OpenGL|ESv3
+HAVE_GLESv3=0
+if test "$enable_opengl" = "yes"; then
+case ",$GLAPI," in
+(*,any,*|*,gles3,*)
+    HAVE_GLESv3=1
+    PKG_CHECK_MODULES([GLES3], [glesv2], [:], [HAVE_GLESv3=0])
+    saved_CPPFLAGS="$CPPFLAGS"
+    CPPFLAGS="$CPPFLAGS $GLES3_CFLAGS"
+    AC_CHECK_HEADERS([GLES3/gl3.h GLES3/gl3ext.h GLES2/gl2ext.h], [:],
+        [HAVE_GLESv3=0], [
+#ifdef HAVE_GLES3_GL3_H
+# include <GLES3/gl3.h>
+#endif
+    ])
+    CPPFLAGS="$saved_CPPFLAGS"
+    ;;
+esac
 fi
+GLES_VERSION_MASK=`expr $GLES_VERSION_MASK "+" $HAVE_GLESv3 "*" 8`
 
 dnl ... GLX
 USE_GLX=0
@@ -647,6 +650,19 @@
     LIBS="$saved_LIBS"
 fi
 
+dnl ... EGL
+USE_EGL=0
+if test "$enable_egl" = "yes" -a $GLES_VERSION_MASK -ne 0; then
+    USE_EGL=1
+    PKG_CHECK_MODULES([EGL], [egl], [:], [USE_EGL=0])
+    saved_CPPFLAGS="$CPPFLAGS"
+    saved_LIBS="$LIBS"
+    AC_CHECK_HEADERS([EGL/egl.h], [:], [USE_EGL=0])
+    AC_CHECK_LIB([EGL], [eglGetDisplay], [:], [USE_EGL=0])
+    CPPFLAGS="$saved_CPPFLAGS"
+    LIBS="$saved_LIBS"
+fi
+
 dnl Check for Wayland
 USE_WAYLAND=0
 if test "$enable_wayland" = "yes"; then
@@ -765,6 +781,38 @@
     LIBS="$saved_LIBS"
 ])
 
+dnl Check for va_dec_hevc.h header
+saved_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS $LIBVA_CFLAGS"
+AC_CHECK_HEADERS([va/va_dec_hevc.h], [], [], [#include <va/va.h>])
+CPPFLAGS="$saved_CPPFLAGS"
+
+dnl Check for HEVC decoding API (0.38+)
+USE_HEVC_DECODER=0
+AC_CACHE_CHECK([for HEVC decoding API],
+    ac_cv_have_hevc_decoding_api, [
+    saved_CPPFLAGS="$CPPFLAGS"
+    CPPFLAGS="$CPPFLAGS $LIBVA_CFLAGS"
+    saved_LIBS="$LIBS"
+    LIBS="$LIBS $LIBVA_LIBS"
+    AC_COMPILE_IFELSE(
+        [AC_LANG_PROGRAM(
+            [[#include <va/va.h>
+              #ifdef HAVE_VA_VA_DEC_HEVC_H
+              #include <va/va_dec_hevc.h>
+              #endif
+            ]],
+            [[VAPictureParameterBufferHEVC pic_param;
+              VASliceParameterBufferHEVC slice_param;
+              VAIQMatrixBufferHEVC iq_matrix;
+              slice_param.slice_data_offset = 0;
+              slice_param.slice_data_flag = 0;]])],
+        [ac_cv_have_hevc_decoding_api="yes" USE_HEVC_DECODER=1],
+        [ac_cv_have_hevc_decoding_api="no"]
+    )
+    CPPFLAGS="$saved_CPPFLAGS"
+    LIBS="$saved_LIBS"
+])
 
 dnl Check for vpp (video post-processing) support
 USE_VA_VPP=0
@@ -793,6 +841,9 @@
 
 dnl Check for encoding support
 USE_ENCODERS=0
+USE_JPEG_ENCODER=0
+USE_VP8_ENCODER=0
+USE_H265_ENCODER=0
 if test "$enable_encoders" = "yes"; then
     PKG_CHECK_MODULES([LIBVA], [libva >= va_api_enc_version],
         [HAVE_VA_ENC=1], [HAVE_VA_ENC=0])
@@ -804,6 +855,92 @@
             [USE_ENCODERS=1], [HAVE_VA_ENC=0 USE_ENCODERS=0],
             [#include <va/va.h>
             ])
+
+        dnl Check for JPEG Encoding API (0.37.0+)
+        AC_CHECK_HEADERS([va/va_enc_jpeg.h],
+            [USE_JPEG_ENCODER=1], [],
+            [#include <va/va.h>
+            ])
+        AC_CACHE_CHECK([for JPEG encoding API],
+            ac_cv_have_jpeg_encoding_api, [
+            saved_CPPFLAGS="$CPPFLAGS"
+            CPPFLAGS="$CPPFLAGS $LIBVA_CFLAGS"
+            saved_LIBS="$LIBS"
+            LIBS="$LIBS $LIBVA_LIBS"
+            AC_COMPILE_IFELSE(
+                [AC_LANG_PROGRAM(
+                    [[#include <va/va.h>
+                      #ifdef HAVE_VA_VA_ENC_JPEG_H
+                      #include <va/va_enc_jpeg.h>
+                      #endif
+                    ]],
+                    [[VAEncPictureParameterBufferJPEG pic_param;
+                      VAEncSliceParameterBufferJPEG slice_param;
+                      VAQMatrixBufferJPEG q_matrix;]])],
+                [ac_cv_have_jpeg_encoding_api="yes" USE_JPEG_ENCODER=1],
+                [ac_cv_have_jpeg_encoding_api="no"]
+            )
+            CPPFLAGS="$saved_CPPFLAGS"
+            LIBS="$saved_LIBS"
+        ])
+
+        dnl Check for VP8 Encoding API
+        AC_CHECK_HEADERS([va/va_enc_vp8.h],
+            [USE_VP8_ENCODER=1], [],
+            [#include <va/va.h>
+            ])
+        AC_CACHE_CHECK([for VP8 encoding API],
+            ac_cv_have_vp8_encoding_api, [
+            saved_CPPFLAGS="$CPPFLAGS"
+            CPPFLAGS="$CPPFLAGS $LIBVA_CFLAGS"
+            saved_LIBS="$LIBS"
+            LIBS="$LIBS $LIBVA_LIBS"
+            AC_COMPILE_IFELSE(
+                [AC_LANG_PROGRAM(
+                    [[#include <va/va.h>
+                      #ifdef HAVE_VA_VA_ENC_VP8_H
+                      #include <va/va_enc_vp8.h>
+                      #endif
+                    ]],
+                    [[VAEncSequenceParameterBufferVP8 seq_param;
+                      VAEncPictureParameterBufferVP8 pic_param;
+                      VAQMatrixBufferVP8 q_matrix;]])],
+                [ac_cv_have_vp8_encoding_api="yes" USE_VP8_ENCODER=1],
+                [ac_cv_have_vp8_encoding_api="no" USE_VP8_ENCODER=0]
+            )
+            CPPFLAGS="$saved_CPPFLAGS"
+            LIBS="$saved_LIBS"
+        ])
+        CPPFLAGS="$saved_CPPFLAGS"
+
+        dnl Check for H265/HEVC Encoding API
+        AC_CHECK_HEADERS([va/va_enc_hevc.h],
+            [USE_H265_ENCODER=1], [],
+            [#include <va/va.h>
+            ])
+        AC_CACHE_CHECK([for HEVC encoding API],
+            ac_cv_have_hevc_encoding_api, [
+            saved_CPPFLAGS="$CPPFLAGS"
+            CPPFLAGS="$CPPFLAGS $LIBVA_CFLAGS"
+            saved_LIBS="$LIBS"
+            LIBS="$LIBS $LIBVA_LIBS"
+            AC_COMPILE_IFELSE(
+                [AC_LANG_PROGRAM(
+                    [[#include <va/va.h>
+                      #ifdef HAVE_VA_VA_ENC_HEVC_H
+                      #include <va/va_enc_hevc.h>
+                      #endif
+                    ]],
+                    [[VAEncSequenceParameterBufferHEVC seq_param;
+                      VAEncPictureParameterBufferHEVC pic_param;
+                      VAEncSliceParameterBufferHEVC;
+                      VAQMatrixBufferHEVC q_matrix;]])],
+                [ac_cv_have_hevc_encoding_api="yes" USE_H265_ENCODER=1],
+                [ac_cv_have_hevc_encoding_api="no" USE_H265_ENCODER=0]
+            )
+            CPPFLAGS="$saved_CPPFLAGS"
+            LIBS="$saved_LIBS"
+        ])
         CPPFLAGS="$saved_CPPFLAGS"
     fi
 fi
@@ -818,7 +955,7 @@
 dnl -- Generate files and summary                                            --
 dnl ---------------------------------------------------------------------------
 
-case ":$USE_X11:$USE_GLX:$USE_WAYLAND:$USE_DRM:" in
+case ":$USE_X11:$USE_GLX:$USE_EGL:$USE_WAYLAND:$USE_DRM:" in
 *:1:*)
     ;;
 *)
@@ -830,6 +967,18 @@
     [Defined to 1 if video encoders are used])
 AM_CONDITIONAL([USE_ENCODERS], [test $USE_ENCODERS -eq 1])
 
+AC_DEFINE_UNQUOTED(USE_JPEG_ENCODER, $USE_JPEG_ENCODER,
+    [Defined to 1 if JPEG encoder is used])
+AM_CONDITIONAL(USE_JPEG_ENCODER, test $USE_JPEG_ENCODER -eq 1)
+
+AC_DEFINE_UNQUOTED(USE_VP8_ENCODER, $USE_VP8_ENCODER,
+    [Defined to 1 if VP8 encoder is used])
+AM_CONDITIONAL(USE_VP8_ENCODER, test $USE_VP8_ENCODER -eq 1)
+
+AC_DEFINE_UNQUOTED(USE_H265_ENCODER, $USE_H265_ENCODER,
+    [Defined to 1 if H265 encoder is used])
+AM_CONDITIONAL(USE_H265_ENCODER, test $USE_H265_ENCODER -eq 1)
+
 AC_DEFINE_UNQUOTED(USE_VA_VPP, $USE_VA_VPP,
     [Defined to 1 if video post-processing is used])
 AM_CONDITIONAL(USE_VA_VPP, test $USE_VA_VPP -eq 1)
@@ -842,6 +991,10 @@
     [Defined to 1 if VP8 decoder is used])
 AM_CONDITIONAL(USE_VP8_DECODER, test $USE_VP8_DECODER -eq 1)
 
+AC_DEFINE_UNQUOTED(USE_HEVC_DECODER, $USE_HEVC_DECODER,
+    [Defined to 1 if HEVC decoder is used])
+AM_CONDITIONAL(USE_HEVC_DECODER, test $USE_HEVC_DECODER -eq 1)
+
 AC_DEFINE_UNQUOTED(USE_DRM, $USE_DRM,
     [Defined to 1 if DRM is enabled])
 AM_CONDITIONAL(USE_DRM, test $USE_DRM -eq 1)
@@ -854,6 +1007,13 @@
     [Defined to 1 if GLX is enabled])
 AM_CONDITIONAL(USE_GLX, test $USE_GLX -eq 1)
 
+AC_DEFINE_UNQUOTED([USE_EGL], [$USE_EGL],
+    [Defined to 1 if EGL is enabled])
+AM_CONDITIONAL([USE_EGL], [test $USE_EGL -eq 1])
+
+AC_DEFINE_UNQUOTED([USE_GLES_VERSION_MASK], [$GLES_VERSION_MASK],
+    [Defined to the set of enabled OpenGL ES APIs])
+
 AC_DEFINE_UNQUOTED(USE_WAYLAND, $USE_WAYLAND,
     [Defined to 1 if WAYLAND is enabled])
 AM_CONDITIONAL(USE_WAYLAND, test $USE_WAYLAND -eq 1)
@@ -895,7 +1055,6 @@
     gst-libs/gst/base/Makefile
     gst-libs/gst/codecparsers/Makefile
     gst-libs/gst/vaapi/Makefile
-    gst-libs/gst/video/Makefile
     gst/Makefile
     gst/vaapi/Makefile
     patches/Makefile
@@ -924,6 +1083,7 @@
 AS_IF([test $USE_DRM -eq 1], [VIDEO_OUTPUTS="$VIDEO_OUTPUTS drm"])
 AS_IF([test $USE_X11 -eq 1], [VIDEO_OUTPUTS="$VIDEO_OUTPUTS x11"])
 AS_IF([test $USE_GLX -eq 1], [VIDEO_OUTPUTS="$VIDEO_OUTPUTS glx"])
+AS_IF([test $USE_EGL -eq 1], [VIDEO_OUTPUTS="$VIDEO_OUTPUTS egl"])
 AS_IF([test $USE_WAYLAND -eq 1], [VIDEO_OUTPUTS="$VIDEO_OUTPUTS wayland"])
 
 echo
diff -Nru gstreamer-vaapi-0.5.10/debian/changelog gstreamer-vaapi-0.6.0/debian/changelog
--- gstreamer-vaapi-0.5.10/debian/changelog	2015-04-30 00:52:37.000000000 +0000
+++ gstreamer-vaapi-0.6.0/debian/changelog	2015-07-16 07:38:58.000000000 +0000
@@ -1,3 +1,13 @@
+gstreamer-vaapi (0.6.0-1) unstable; urgency=medium
+
+  * New upstream release.
+    - Update build-dep on gst 1.x to (>= 1.3).
+  * Update debian/copyright.
+  * Update homepage.
+  * Update Vcs-Browser to point to cgit interface (instead of gitweb).
+
+ -- Vincent Cheng <vcheng@debian.org>  Thu, 16 Jul 2015 00:16:32 -0700
+
 gstreamer-vaapi (0.5.10-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru gstreamer-vaapi-0.5.10/debian/control gstreamer-vaapi-0.6.0/debian/control
--- gstreamer-vaapi-0.5.10/debian/control	2015-04-30 00:52:25.000000000 +0000
+++ gstreamer-vaapi-0.6.0/debian/control	2015-07-16 07:28:35.000000000 +0000
@@ -12,9 +12,9 @@
  libdrm-dev,
  libgl1-mesa-dev,
  libglib2.0-dev,
- libgstreamer-plugins-bad1.0-dev (>= 1.0.0),
- libgstreamer-plugins-base1.0-dev (>= 1.0.0),
- libgstreamer1.0-dev (>= 1.0.0),
+ libgstreamer-plugins-bad1.0-dev (>= 1.3.0),
+ libgstreamer-plugins-base1.0-dev (>= 1.3.0),
+ libgstreamer1.0-dev (>= 1.2.90),
  libudev-dev,
  libva-dev (>= 1.0.9),
  libwayland-dev,
@@ -23,9 +23,9 @@
  mesa-common-dev,
  yasm
 Standards-Version: 3.9.6
-Homepage: http://gitorious.org/vaapi/gstreamer-vaapi
+Homepage: https://github.com/01org/gstreamer-vaapi/
 Vcs-Git: git://anonscm.debian.org/pkg-gstreamer/gstreamer-vaapi.git
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-gstreamer/gstreamer-vaapi.git
+Vcs-Browser: http://anonscm.debian.org/cgit/pkg-gstreamer/gstreamer-vaapi.git
 
 Package: gstreamer1.0-vaapi
 Architecture: any
diff -Nru gstreamer-vaapi-0.5.10/debian/copyright gstreamer-vaapi-0.6.0/debian/copyright
--- gstreamer-vaapi-0.5.10/debian/copyright	2014-08-04 23:40:34.000000000 +0000
+++ gstreamer-vaapi-0.6.0/debian/copyright	2015-07-16 07:38:37.000000000 +0000
@@ -21,14 +21,9 @@
            2007 Jan Schmidt <thaytan@mad.scientist.com>
 License: LGPL-2+
 
-Files: ext/videoutils/gst-libs/gst/video/*
-Copyright: 2008 David Schleef <ds@schleef.org>
-           2011 Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>.
-           2011 Nokia Corporation.
-           2012 Collabora Ltd.
-           1999 Erik Walthinsen <omega@cse.ogi.edu>
-           2002 Ronald Bultje <rbultje@ronald.bitfreak.net>
-License: LGPL-2+
+Files: ext/libvpx/*
+Copyright: 2010 The WebM Project authors
+License: BSD-3-clause
 
 Files: debian/*
 Copyright: 2012 Timo Aaltonen <tjaalton@ubuntu.com>
@@ -88,3 +83,33 @@
  .
  On Debian GNU/Linux systems, the complete text of the GNU Lesser General
  Public License can be found in `/usr/share/common-licenses/LGPL-2.1'.
+
+License: BSD-3-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ .
+   * Redistributions of source code must retain the above copyright
+     notice, this list of conditions and the following disclaimer.
+ .
+   * Redistributions in binary form must reproduce the above copyright
+     notice, this list of conditions and the following disclaimer in
+     the documentation and/or other materials provided with the
+     distribution.
+ .
+   * Neither the name of Google, nor the WebM Project, nor the names
+     of its contributors may be used to endorse or promote products
+     derived from this software without specific prior written
+     permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff -Nru gstreamer-vaapi-0.5.10/debian.upstream/changelog gstreamer-vaapi-0.6.0/debian.upstream/changelog
--- gstreamer-vaapi-0.5.10/debian.upstream/changelog	2015-02-03 08:39:57.000000000 +0000
+++ gstreamer-vaapi-0.6.0/debian.upstream/changelog	2015-07-15 12:50:38.000000000 +0000
@@ -1,5 +1,5 @@
-gstreamer1.4-vaapi (0.5.10-1) unstable; urgency=low
+gstreamer1.4-vaapi (0.6.0-1) unstable; urgency=low
 
   * Autogenerated package, see NEWS file for ChangeLog.
 
- -- Gwenole Beauchesne <gwenole.beauchesne@intel.com>  Tue, 03 Feb 2015 10:39:55 +0200
+ -- Gwenole Beauchesne <gwenole.beauchesne@intel.com>  Wed, 15 Jul 2015 15:50:34 +0300
diff -Nru gstreamer-vaapi-0.5.10/debian.upstream/control gstreamer-vaapi-0.6.0/debian.upstream/control
--- gstreamer-vaapi-0.5.10/debian.upstream/control	2015-02-03 08:39:57.000000000 +0000
+++ gstreamer-vaapi-0.6.0/debian.upstream/control	2015-07-15 12:50:38.000000000 +0000
@@ -4,14 +4,14 @@
 Maintainer: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
 Build-Depends: debhelper (>= 5),
 	       cdbs,
-	       libglib2.0-dev (>= 2.28),
+	       libglib2.0-dev (>= 2.32),
 	       libgstreamer1.0-dev (>= 1.2.90),
 	       libgstreamer-plugins-base1.0-dev (>= 1.3.0),
 	       libgstreamer-plugins-bad1.0-dev (>= 1.3.0),
 	       libdrm-dev, libudev-dev,
 	       libx11-dev, libxrandr-dev,
 	       libgl-dev,
-	       libwayland-dev (>= 1.0.0),
+	       libwayland-dev (>= 1.0.2),
 	       libva-dev (>= 1.0.3)
 Build-Depends-Indep: gtk-doc-tools (>= 1.9)
 Standards-Version: 3.7.2
@@ -26,8 +26,6 @@
  - `vaapidecode': decode bitstreams using VA-API
  - `vaapiencode_mpeg2': encode bitstreams using VA-API (MPEG-2 codec)
  - `vaapiencode_h264': encode bitstreams using VA-API (H.264 codec)
-# - `vaapiupload': convert from YUV pixels to VA surfaces
-# - `vaapidownload': convert from VA surfaces to YUV pixels
  - `vaapipostproc': postprocess VA surfaces, e.g. for deinterlacing
  - `vaapisink': a VA-API based video sink
 
@@ -47,7 +45,7 @@
  .
  This package contains the debug files.
 
-Package: libgstvaapi1
+Package: libgstvaapi2
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -56,7 +54,7 @@
  .
  This package contains common libraries for the "vaapi" set.
 
-Package: libgstvaapi-drm-1
+Package: libgstvaapi-drm-2
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -65,7 +63,7 @@
  .
  This package contains headless libraries for the "vaapi" set.
 
-Package: libgstvaapi-x11-1
+Package: libgstvaapi-x11-2
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -74,7 +72,7 @@
  .
  This package contains x11 libraries for the "vaapi" set.
 
-Package: libgstvaapi-glx-1
+Package: libgstvaapi-glx-2
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -83,7 +81,7 @@
  .
  This package contains glx libraries for the "vaapi" set.
 
-Package: libgstvaapi-wayland-1
+Package: libgstvaapi-wayland-2
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -96,11 +94,11 @@
 Architecture: any
 Section: libdevel
 Depends: ${shlibs:Depends}, ${misc:Depends},
-	 libgstvaapi-drm-1 (= ${Source-Version}),
-	 libgstvaapi-x11-1 (= ${Source-Version}),
-	 libgstvaapi-glx-1 (= ${Source-Version}),
-	 libgstvaapi-wayland-1 (= ${Source-Version}),
-	 libgstvaapi1 (= ${Source-Version})
+	 libgstvaapi-drm-2 (= ${Source-Version}),
+	 libgstvaapi-x11-2 (= ${Source-Version}),
+	 libgstvaapi-glx-2 (= ${Source-Version}),
+	 libgstvaapi-wayland-2 (= ${Source-Version}),
+	 libgstvaapi2 (= ${Source-Version})
 Description: GStreamer development files for libraries from the "vaapi" set
  GStreamer/VA-API development files.
  .
diff -Nru gstreamer-vaapi-0.5.10/debian.upstream/control.in gstreamer-vaapi-0.6.0/debian.upstream/control.in
--- gstreamer-vaapi-0.5.10/debian.upstream/control.in	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/debian.upstream/control.in	2015-07-15 12:47:43.000000000 +0000
@@ -26,8 +26,6 @@
  - `vaapidecode': decode bitstreams using VA-API
 @USE_ENCODERS_TRUE@ - `vaapiencode_mpeg2': encode bitstreams using VA-API (MPEG-2 codec)
 @USE_ENCODERS_TRUE@ - `vaapiencode_h264': encode bitstreams using VA-API (H.264 codec)
-@USE_GST_API_0_10_TRUE@ - `vaapiupload': convert from YUV pixels to VA surfaces
-@USE_GST_API_0_10_TRUE@ - `vaapidownload': convert from VA surfaces to YUV pixels
  - `vaapipostproc': postprocess VA surfaces, e.g. for deinterlacing
  - `vaapisink': a VA-API based video sink
 
diff -Nru gstreamer-vaapi-0.5.10/debian.upstream/gstreamer1.4-vaapi.install gstreamer-vaapi-0.6.0/debian.upstream/gstreamer1.4-vaapi.install
--- gstreamer-vaapi-0.5.10/debian.upstream/gstreamer1.4-vaapi.install	2015-02-03 08:39:58.000000000 +0000
+++ gstreamer-vaapi-0.6.0/debian.upstream/gstreamer1.4-vaapi.install	2015-07-15 12:50:38.000000000 +0000
@@ -1 +1 @@
-debian/tmp/home/sreerenj/opt/gstreamer-1.4/lib/gstreamer-1.0/libgstvaapi*.so
+debian/tmp/home/sreerenj/opt/gstreamer/1.4/lib/gstreamer-1.0/libgstvaapi*.so
diff -Nru gstreamer-vaapi-0.5.10/debian.upstream/libgstvaapi1.install gstreamer-vaapi-0.6.0/debian.upstream/libgstvaapi1.install
--- gstreamer-vaapi-0.5.10/debian.upstream/libgstvaapi1.install	2015-02-03 08:39:58.000000000 +0000
+++ gstreamer-vaapi-0.6.0/debian.upstream/libgstvaapi1.install	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-debian/tmp/usr/lib/libgstcodecparsers_vpx.so.*
-debian/tmp/usr/lib/libgstvaapi-1.4.so.*
diff -Nru gstreamer-vaapi-0.5.10/debian.upstream/libgstvaapi2.install gstreamer-vaapi-0.6.0/debian.upstream/libgstvaapi2.install
--- gstreamer-vaapi-0.5.10/debian.upstream/libgstvaapi2.install	1970-01-01 00:00:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/debian.upstream/libgstvaapi2.install	2015-07-15 12:50:38.000000000 +0000
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/libgstcodecparsers_vpx.so.*
+debian/tmp/usr/lib/libgstvaapi-1.4.so.*
diff -Nru gstreamer-vaapi-0.5.10/debian.upstream/libgstvaapi-drm-1.install gstreamer-vaapi-0.6.0/debian.upstream/libgstvaapi-drm-1.install
--- gstreamer-vaapi-0.5.10/debian.upstream/libgstvaapi-drm-1.install	2015-02-03 08:39:58.000000000 +0000
+++ gstreamer-vaapi-0.6.0/debian.upstream/libgstvaapi-drm-1.install	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-debian/tmp/usr/lib/libgstvaapi-drm-1.4.so.*
diff -Nru gstreamer-vaapi-0.5.10/debian.upstream/libgstvaapi-drm-2.install gstreamer-vaapi-0.6.0/debian.upstream/libgstvaapi-drm-2.install
--- gstreamer-vaapi-0.5.10/debian.upstream/libgstvaapi-drm-2.install	1970-01-01 00:00:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/debian.upstream/libgstvaapi-drm-2.install	2015-07-15 12:50:38.000000000 +0000
@@ -0,0 +1 @@
+debian/tmp/usr/lib/libgstvaapi-drm-1.4.so.*
diff -Nru gstreamer-vaapi-0.5.10/debian.upstream/libgstvaapi-glx-1.install gstreamer-vaapi-0.6.0/debian.upstream/libgstvaapi-glx-1.install
--- gstreamer-vaapi-0.5.10/debian.upstream/libgstvaapi-glx-1.install	2015-02-03 08:39:58.000000000 +0000
+++ gstreamer-vaapi-0.6.0/debian.upstream/libgstvaapi-glx-1.install	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-debian/tmp/usr/lib/libgstvaapi-glx-1.4.so.*
diff -Nru gstreamer-vaapi-0.5.10/debian.upstream/libgstvaapi-glx-2.install gstreamer-vaapi-0.6.0/debian.upstream/libgstvaapi-glx-2.install
--- gstreamer-vaapi-0.5.10/debian.upstream/libgstvaapi-glx-2.install	1970-01-01 00:00:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/debian.upstream/libgstvaapi-glx-2.install	2015-07-15 12:50:38.000000000 +0000
@@ -0,0 +1 @@
+debian/tmp/usr/lib/libgstvaapi-glx-1.4.so.*
diff -Nru gstreamer-vaapi-0.5.10/debian.upstream/libgstvaapi-wayland-1.install gstreamer-vaapi-0.6.0/debian.upstream/libgstvaapi-wayland-1.install
--- gstreamer-vaapi-0.5.10/debian.upstream/libgstvaapi-wayland-1.install	2015-02-03 08:39:58.000000000 +0000
+++ gstreamer-vaapi-0.6.0/debian.upstream/libgstvaapi-wayland-1.install	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-debian/tmp/usr/lib/libgstvaapi-wayland-1.4.so.*
diff -Nru gstreamer-vaapi-0.5.10/debian.upstream/libgstvaapi-wayland-2.install gstreamer-vaapi-0.6.0/debian.upstream/libgstvaapi-wayland-2.install
--- gstreamer-vaapi-0.5.10/debian.upstream/libgstvaapi-wayland-2.install	1970-01-01 00:00:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/debian.upstream/libgstvaapi-wayland-2.install	2015-07-15 12:50:38.000000000 +0000
@@ -0,0 +1 @@
+debian/tmp/usr/lib/libgstvaapi-wayland-1.4.so.*
diff -Nru gstreamer-vaapi-0.5.10/debian.upstream/libgstvaapi-x11-1.install gstreamer-vaapi-0.6.0/debian.upstream/libgstvaapi-x11-1.install
--- gstreamer-vaapi-0.5.10/debian.upstream/libgstvaapi-x11-1.install	2015-02-03 08:39:58.000000000 +0000
+++ gstreamer-vaapi-0.6.0/debian.upstream/libgstvaapi-x11-1.install	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-debian/tmp/usr/lib/libgstvaapi-x11-1.4.so.*
diff -Nru gstreamer-vaapi-0.5.10/debian.upstream/libgstvaapi-x11-2.install gstreamer-vaapi-0.6.0/debian.upstream/libgstvaapi-x11-2.install
--- gstreamer-vaapi-0.5.10/debian.upstream/libgstvaapi-x11-2.install	1970-01-01 00:00:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/debian.upstream/libgstvaapi-x11-2.install	2015-07-15 12:50:38.000000000 +0000
@@ -0,0 +1 @@
+debian/tmp/usr/lib/libgstvaapi-x11-1.4.so.*
diff -Nru gstreamer-vaapi-0.5.10/debian.upstream/Makefile.am gstreamer-vaapi-0.6.0/debian.upstream/Makefile.am
--- gstreamer-vaapi-0.5.10/debian.upstream/Makefile.am	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/debian.upstream/Makefile.am	2015-07-15 12:47:43.000000000 +0000
@@ -37,6 +37,6 @@
 EXTRA_DIST = $(DEBIANFILES)
 
 dist_noinst_DATA = $(DEBIANGENFILES)
+DISTCLEANFILES = $(DEBIANGENFILES)
 
-# Extra clean files so that maintainer-clean removes *everything*
-MAINTAINERCLEANFILES = Makefile.in $(DEBIANGENFILES)
+-include $(top_srcdir)/git.mk
diff -Nru gstreamer-vaapi-0.5.10/debian.upstream/Makefile.in gstreamer-vaapi-0.6.0/debian.upstream/Makefile.in
--- gstreamer-vaapi-0.5.10/debian.upstream/Makefile.in	2015-02-03 08:39:54.000000000 +0000
+++ gstreamer-vaapi-0.6.0/debian.upstream/Makefile.in	2015-07-15 12:50:34.000000000 +0000
@@ -148,10 +148,16 @@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
+EGL_CFLAGS = @EGL_CFLAGS@
+EGL_LIBS = @EGL_LIBS@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GIT = @GIT@
+GLES2_CFLAGS = @GLES2_CFLAGS@
+GLES2_LIBS = @GLES2_LIBS@
+GLES3_CFLAGS = @GLES3_CFLAGS@
+GLES3_LIBS = @GLES3_LIBS@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_VERSION_REQUIRED = @GLIB_VERSION_REQUIRED@
@@ -169,6 +175,8 @@
 GST_CFLAGS = @GST_CFLAGS@
 GST_CODEC_PARSERS_CFLAGS = @GST_CODEC_PARSERS_CFLAGS@
 GST_CODEC_PARSERS_LIBS = @GST_CODEC_PARSERS_LIBS@
+GST_GL_CFLAGS = @GST_GL_CFLAGS@
+GST_GL_LIBS = @GST_GL_LIBS@
 GST_INTERFACES_CFLAGS = @GST_INTERFACES_CFLAGS@
 GST_INTERFACES_LIBS = @GST_INTERFACES_LIBS@
 GST_LIBS = @GST_LIBS@
@@ -178,7 +186,6 @@
 GST_PLUGINS_BASE_LIBS = @GST_PLUGINS_BASE_LIBS@
 GST_PLUGINS_BASE_VERSION_REQUIRED = @GST_PLUGINS_BASE_VERSION_REQUIRED@
 GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
-GST_PLUGIN_PATH = @GST_PLUGIN_PATH@
 GST_PLUGIN_PATH_1_0 = @GST_PLUGIN_PATH_1_0@
 GST_VAAPI_LT_LDFLAGS = @GST_VAAPI_LT_LDFLAGS@
 GST_VAAPI_LT_VERSION = @GST_VAAPI_LT_VERSION@
@@ -353,9 +360,7 @@
 
 EXTRA_DIST = $(DEBIANFILES)
 dist_noinst_DATA = $(DEBIANGENFILES)
-
-# Extra clean files so that maintainer-clean removes *everything*
-MAINTAINERCLEANFILES = Makefile.in $(DEBIANGENFILES)
+DISTCLEANFILES = $(DEBIANGENFILES)
 all: all-am
 
 .SUFFIXES:
@@ -466,11 +471,11 @@
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
 clean: clean-am
 
 clean-am: clean-generic clean-libtool mostlyclean-am
@@ -552,6 +557,8 @@
 	tags-am uninstall uninstall-am
 
 
+-include $(top_srcdir)/git.mk
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -Nru gstreamer-vaapi-0.5.10/docs/Makefile.am gstreamer-vaapi-0.6.0/docs/Makefile.am
--- gstreamer-vaapi-0.5.10/docs/Makefile.am	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/docs/Makefile.am	2015-07-15 12:47:43.000000000 +0000
@@ -6,5 +6,4 @@
 
 DIST_SUBDIRS = reference
 
-# Extra clean files so that maintainer-clean removes *everything*
-MAINTAINERCLEANFILES = Makefile.in
+-include $(top_srcdir)/git.mk
diff -Nru gstreamer-vaapi-0.5.10/docs/Makefile.in gstreamer-vaapi-0.6.0/docs/Makefile.in
--- gstreamer-vaapi-0.5.10/docs/Makefile.in	2015-02-03 08:39:54.000000000 +0000
+++ gstreamer-vaapi-0.6.0/docs/Makefile.in	2015-07-15 12:50:34.000000000 +0000
@@ -197,10 +197,16 @@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
+EGL_CFLAGS = @EGL_CFLAGS@
+EGL_LIBS = @EGL_LIBS@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GIT = @GIT@
+GLES2_CFLAGS = @GLES2_CFLAGS@
+GLES2_LIBS = @GLES2_LIBS@
+GLES3_CFLAGS = @GLES3_CFLAGS@
+GLES3_LIBS = @GLES3_LIBS@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_VERSION_REQUIRED = @GLIB_VERSION_REQUIRED@
@@ -218,6 +224,8 @@
 GST_CFLAGS = @GST_CFLAGS@
 GST_CODEC_PARSERS_CFLAGS = @GST_CODEC_PARSERS_CFLAGS@
 GST_CODEC_PARSERS_LIBS = @GST_CODEC_PARSERS_LIBS@
+GST_GL_CFLAGS = @GST_GL_CFLAGS@
+GST_GL_LIBS = @GST_GL_LIBS@
 GST_INTERFACES_CFLAGS = @GST_INTERFACES_CFLAGS@
 GST_INTERFACES_LIBS = @GST_INTERFACES_LIBS@
 GST_LIBS = @GST_LIBS@
@@ -227,7 +235,6 @@
 GST_PLUGINS_BASE_LIBS = @GST_PLUGINS_BASE_LIBS@
 GST_PLUGINS_BASE_VERSION_REQUIRED = @GST_PLUGINS_BASE_VERSION_REQUIRED@
 GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
-GST_PLUGIN_PATH = @GST_PLUGIN_PATH@
 GST_PLUGIN_PATH_1_0 = @GST_PLUGIN_PATH_1_0@
 GST_VAAPI_LT_LDFLAGS = @GST_VAAPI_LT_LDFLAGS@
 GST_VAAPI_LT_VERSION = @GST_VAAPI_LT_VERSION@
@@ -366,9 +373,6 @@
 top_srcdir = @top_srcdir@
 SUBDIRS = $(am__append_1)
 DIST_SUBDIRS = reference
-
-# Extra clean files so that maintainer-clean removes *everything*
-MAINTAINERCLEANFILES = Makefile.in
 all: all-recursive
 
 .SUFFIXES:
@@ -598,7 +602,6 @@
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
 clean: clean-recursive
 
 clean-am: clean-generic clean-libtool mostlyclean-am
@@ -681,6 +684,8 @@
 	ps ps-am tags tags-am uninstall uninstall-am
 
 
+-include $(top_srcdir)/git.mk
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -Nru gstreamer-vaapi-0.5.10/docs/reference/libs/html/annotation-glossary.html gstreamer-vaapi-0.6.0/docs/reference/libs/html/annotation-glossary.html
--- gstreamer-vaapi-0.5.10/docs/reference/libs/html/annotation-glossary.html	1970-01-01 00:00:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/docs/reference/libs/html/annotation-glossary.html	2015-07-15 12:52:27.000000000 +0000
@@ -0,0 +1,32 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>GStreamer VA-API Plugins 1.4 Library Reference Manual: Annotation Glossary</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="GStreamer VA-API Plugins 1.4 Library Reference Manual">
+<link rel="up" href="index.html" title="GStreamer VA-API Plugins 1.4 Library Reference Manual">
+<link rel="prev" href="api-index-full.html" title="API Index">
+<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts"><span id="nav_glossary"><a class="shortcut" href="#glsC">C</a></span></td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><img src="up-insensitive.png" width="16" height="16" border="0"></td>
+<td><a accesskey="p" href="api-index-full.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><img src="right-insensitive.png" width="16" height="16" border="0"></td>
+</tr></table>
+<div class="glossary">
+<div class="titlepage"><div><div><h1 class="title">
+<a name="annotation-glossary"></a>Annotation Glossary</h1></div></div></div>
+<a name="glsC"></a><h3 class="title">C</h3>
+<dt><span class="glossterm"><a name="annotation-glossterm-closure"></a>closure</span></dt>
+<dd class="glossdef"><p>This parameter is a 'user_data', for callbacks; many bindings can pass NULL here.</p></dd>
+</div>
+<div class="footer">
+<hr>
+          Generated by GTK-Doc V1.21</div>
+</body>
+</html>
\ No newline at end of file
diff -Nru gstreamer-vaapi-0.5.10/docs/reference/libs/html/api-index-full.html gstreamer-vaapi-0.6.0/docs/reference/libs/html/api-index-full.html
--- gstreamer-vaapi-0.5.10/docs/reference/libs/html/api-index-full.html	2015-02-03 08:45:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/docs/reference/libs/html/api-index-full.html	2015-07-15 12:52:27.000000000 +0000
@@ -7,6 +7,7 @@
 <link rel="home" href="index.html" title="GStreamer VA-API Plugins 1.4 Library Reference Manual">
 <link rel="up" href="index.html" title="GStreamer VA-API Plugins 1.4 Library Reference Manual">
 <link rel="prev" href="object-tree.html" title="Object Hierarchy">
+<link rel="next" href="annotation-glossary.html" title="Annotation Glossary">
 <meta name="generator" content="GTK-Doc V1.21 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
@@ -16,7 +17,7 @@
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
 <td><img src="up-insensitive.png" width="16" height="16" border="0"></td>
 <td><a accesskey="p" href="object-tree.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
-<td><img src="right-insensitive.png" width="16" height="16" border="0"></td>
+<td><a accesskey="n" href="annotation-glossary.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
 </tr></table>
 <div class="index">
 <div class="titlepage"><div><div><h1 class="title">
@@ -31,6 +32,22 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="libs-GstVaapiContext.html#GstVaapiConfigInfoEncoder" title="struct GstVaapiConfigInfoEncoder">GstVaapiConfigInfoEncoder</a>, struct in <a class="link" href="libs-GstVaapiContext.html" title="GstVaapiContext">GstVaapiContext</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libs-GstVaapiContext.html#GstVaapiContext" title="struct GstVaapiContext">GstVaapiContext</a>, struct in <a class="link" href="libs-GstVaapiContext.html" title="GstVaapiContext">GstVaapiContext</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libs-GstVaapiContext.html#GstVaapiContextInfo" title="struct GstVaapiContextInfo">GstVaapiContextInfo</a>, struct in <a class="link" href="libs-GstVaapiContext.html" title="GstVaapiContext">GstVaapiContext</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libs-GstVaapiContext.html#GstVaapiContextUsage" title="enum GstVaapiContextUsage">GstVaapiContextUsage</a>, enum in <a class="link" href="libs-GstVaapiContext.html" title="GstVaapiContext">GstVaapiContext</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="libs-gstvaapidecoder.html#GstVaapiDecoder" title="GstVaapiDecoder">GstVaapiDecoder</a>, struct in <a class="link" href="libs-gstvaapidecoder.html" title="GstVaapiDecoder">GstVaapiDecoder</a>
 </dt>
 <dd></dd>
@@ -39,6 +56,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="libs-GstVaapiDecoderH265.html#GstVaapiDecoderH265" title="GstVaapiDecoderH265">GstVaapiDecoderH265</a>, struct in <a class="link" href="libs-GstVaapiDecoderH265.html" title="GstVaapiDecoderH265">GstVaapiDecoderH265</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="libs-GstVaapiDecoderJpeg.html#GstVaapiDecoderJpeg" title="GstVaapiDecoderJpeg">GstVaapiDecoderJpeg</a>, struct in <a class="link" href="libs-GstVaapiDecoderJpeg.html" title="GstVaapiDecoderJpeg">GstVaapiDecoderJpeg</a>
 </dt>
 <dd></dd>
@@ -55,18 +76,42 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="libs-GstVaapiDecoderUnit.html#GstVaapiDecoderUnit" title="struct GstVaapiDecoderUnit">GstVaapiDecoderUnit</a>, struct in <a class="link" href="libs-GstVaapiDecoderUnit.html" title="GstVaapiDecoderUnit">GstVaapiDecoderUnit</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libs-GstVaapiDecoderUnit.html#GstVaapiDecoderUnitFlags" title="enum GstVaapiDecoderUnitFlags">GstVaapiDecoderUnitFlags</a>, enum in <a class="link" href="libs-GstVaapiDecoderUnit.html" title="GstVaapiDecoderUnit">GstVaapiDecoderUnit</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="libs-GstVaapiDecoderVC1.html#GstVaapiDecoderVC1" title="GstVaapiDecoderVC1">GstVaapiDecoderVC1</a>, struct in <a class="link" href="libs-GstVaapiDecoderVC1.html" title="GstVaapiDecoderVC1">GstVaapiDecoderVC1</a>
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="libs-GstVaapiDecoderVp8.html#GstVaapiDecoderVp8" title="GstVaapiDecoderVp8">GstVaapiDecoderVp8</a>, struct in <a class="link" href="libs-GstVaapiDecoderVp8.html" title="GstVaapiDecoderVp8">GstVaapiDecoderVp8</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay">GstVaapiDisplay</a>, struct in <a class="link" href="libs-GstVaapiDisplay.html" title="GstVaapiDisplay">GstVaapiDisplay</a>
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="libs-GstVaapiDisplayEGL.html#GstVaapiDisplayEGL" title="GstVaapiDisplayEGL">GstVaapiDisplayEGL</a>, struct in <a class="link" href="libs-GstVaapiDisplayEGL.html" title="GstVaapiDisplayEGL">GstVaapiDisplayEGL</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="libs-GstVaapiDisplayGLX.html#GstVaapiDisplayGLX" title="GstVaapiDisplayGLX">GstVaapiDisplayGLX</a>, struct in <a class="link" href="libs-GstVaapiDisplayGLX.html" title="GstVaapiDisplayGLX">GstVaapiDisplayGLX</a>
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplayInfo" title="struct GstVaapiDisplayInfo">GstVaapiDisplayInfo</a>, struct in <a class="link" href="libs-GstVaapiDisplay.html" title="GstVaapiDisplay">GstVaapiDisplay</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplayType" title="enum GstVaapiDisplayType">GstVaapiDisplayType</a>, enum in <a class="link" href="libs-GstVaapiDisplay.html" title="GstVaapiDisplay">GstVaapiDisplay</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="libs-GstVaapiDisplayX11.html#GstVaapiDisplayX11" title="GstVaapiDisplayX11">GstVaapiDisplayX11</a>, struct in <a class="link" href="libs-GstVaapiDisplayX11.html" title="GstVaapiDisplayX11">GstVaapiDisplayX11</a>
 </dt>
 <dd></dd>
@@ -75,10 +120,18 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="libs-GstVaapiValue.html#GstVaapiEnumSubset" title="GstVaapiEnumSubset">GstVaapiEnumSubset</a>, struct in <a class="link" href="libs-GstVaapiValue.html" title="GstVaapiValue">GstVaapiValue</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="libs-GstVaapiFilter.html#GstVaapiFilter" title="GstVaapiFilter">GstVaapiFilter</a>, struct in <a class="link" href="libs-GstVaapiFilter.html" title="GstVaapiFilter">GstVaapiFilter</a>
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="libs-GstVaapiFilter.html#GstVaapiFilterOp" title="enum GstVaapiFilterOp">GstVaapiFilterOp</a>, enum in <a class="link" href="libs-GstVaapiFilter.html" title="GstVaapiFilter">GstVaapiFilter</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="libs-Basic-data-structures.html#GstVaapiID" title="GstVaapiID">GstVaapiID</a>, typedef in <a class="link" href="libs-Basic-data-structures.html" title="Basic data structures">Basic data structures</a>
 </dt>
 <dd></dd>
@@ -115,6 +168,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="libs-GstVaapiDecoderH265.html#GstVaapiStreamAlignH265" title="enum GstVaapiStreamAlignH265">GstVaapiStreamAlignH265</a>, enum in <a class="link" href="libs-GstVaapiDecoderH265.html" title="GstVaapiDecoderH265">GstVaapiDecoderH265</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="libs-GstVaapiSubpicture.html#GstVaapiSubpicture" title="GstVaapiSubpicture">GstVaapiSubpicture</a>, struct in <a class="link" href="libs-GstVaapiSubpicture.html" title="GstVaapiSubpicture">GstVaapiSubpicture</a>
 </dt>
 <dd></dd>
@@ -155,6 +212,26 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="libs-GstVaapiContext.html#gst-vaapi-context-get-id" title="gst_vaapi_context_get_id ()">gst_vaapi_context_get_id</a>, function in <a class="link" href="libs-GstVaapiContext.html" title="GstVaapiContext">GstVaapiContext</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libs-GstVaapiContext.html#gst-vaapi-context-get-surface-count" title="gst_vaapi_context_get_surface_count ()">gst_vaapi_context_get_surface_count</a>, function in <a class="link" href="libs-GstVaapiContext.html" title="GstVaapiContext">GstVaapiContext</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libs-GstVaapiContext.html#gst-vaapi-context-get-surface-proxy" title="gst_vaapi_context_get_surface_proxy ()">gst_vaapi_context_get_surface_proxy</a>, function in <a class="link" href="libs-GstVaapiContext.html" title="GstVaapiContext">GstVaapiContext</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libs-GstVaapiContext.html#gst-vaapi-context-new" title="gst_vaapi_context_new ()">gst_vaapi_context_new</a>, function in <a class="link" href="libs-GstVaapiContext.html" title="GstVaapiContext">GstVaapiContext</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libs-GstVaapiContext.html#gst-vaapi-context-reset" title="gst_vaapi_context_reset ()">gst_vaapi_context_reset</a>, function in <a class="link" href="libs-GstVaapiContext.html" title="GstVaapiContext">GstVaapiContext</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="libs-gstvaapidecoder.html#gst-vaapi-decoder-decode" title="gst_vaapi_decoder_decode ()">gst_vaapi_decoder_decode</a>, function in <a class="link" href="libs-gstvaapidecoder.html" title="GstVaapiDecoder">GstVaapiDecoder</a>
 </dt>
 <dd></dd>
@@ -187,6 +264,14 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="libs-GstVaapiDecoderH265.html#gst-vaapi-decoder-h265-new" title="gst_vaapi_decoder_h265_new ()">gst_vaapi_decoder_h265_new</a>, function in <a class="link" href="libs-GstVaapiDecoderH265.html" title="GstVaapiDecoderH265">GstVaapiDecoderH265</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libs-GstVaapiDecoderH265.html#gst-vaapi-decoder-h265-set-alignment" title="gst_vaapi_decoder_h265_set_alignment ()">gst_vaapi_decoder_h265_set_alignment</a>, function in <a class="link" href="libs-GstVaapiDecoderH265.html" title="GstVaapiDecoderH265">GstVaapiDecoderH265</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="libs-GstVaapiDecoderJpeg.html#gst-vaapi-decoder-jpeg-new" title="gst_vaapi_decoder_jpeg_new ()">gst_vaapi_decoder_jpeg_new</a>, function in <a class="link" href="libs-GstVaapiDecoderJpeg.html" title="GstVaapiDecoderJpeg">GstVaapiDecoderJpeg</a>
 </dt>
 <dd></dd>
@@ -207,26 +292,110 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="libs-GstVaapiDecoderUnit.html#gst-vaapi-decoder-unit-clear" title="gst_vaapi_decoder_unit_clear ()">gst_vaapi_decoder_unit_clear</a>, function in <a class="link" href="libs-GstVaapiDecoderUnit.html" title="GstVaapiDecoderUnit">GstVaapiDecoderUnit</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libs-GstVaapiDecoderUnit.html#gst-vaapi-decoder-unit-init" title="gst_vaapi_decoder_unit_init ()">gst_vaapi_decoder_unit_init</a>, function in <a class="link" href="libs-GstVaapiDecoderUnit.html" title="GstVaapiDecoderUnit">GstVaapiDecoderUnit</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libs-GstVaapiDecoderUnit.html#gst-vaapi-decoder-unit-new" title="gst_vaapi_decoder_unit_new ()">gst_vaapi_decoder_unit_new</a>, function in <a class="link" href="libs-GstVaapiDecoderUnit.html" title="GstVaapiDecoderUnit">GstVaapiDecoderUnit</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libs-GstVaapiDecoderUnit.html#gst-vaapi-decoder-unit-set-parsed-info" title="gst_vaapi_decoder_unit_set_parsed_info ()">gst_vaapi_decoder_unit_set_parsed_info</a>, function in <a class="link" href="libs-GstVaapiDecoderUnit.html" title="GstVaapiDecoderUnit">GstVaapiDecoderUnit</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="libs-GstVaapiDecoderVC1.html#gst-vaapi-decoder-vc1-new" title="gst_vaapi_decoder_vc1_new ()">gst_vaapi_decoder_vc1_new</a>, function in <a class="link" href="libs-GstVaapiDecoderVC1.html" title="GstVaapiDecoderVC1">GstVaapiDecoderVC1</a>
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="libs-GstVaapiDecoderVp8.html#gst-vaapi-decoder-vp8-new" title="gst_vaapi_decoder_vp8_new ()">gst_vaapi_decoder_vp8_new</a>, function in <a class="link" href="libs-GstVaapiDecoderVp8.html" title="GstVaapiDecoderVp8">GstVaapiDecoderVp8</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libs-GstVaapiDisplayDRM.html#gst-vaapi-display-drm-get-device" title="gst_vaapi_display_drm_get_device ()">gst_vaapi_display_drm_get_device</a>, function in <a class="link" href="libs-GstVaapiDisplayDRM.html" title="GstVaapiDisplayDRM">GstVaapiDisplayDRM</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libs-GstVaapiDisplayDRM.html#gst-vaapi-display-drm-get-device-path" title="gst_vaapi_display_drm_get_device_path ()">gst_vaapi_display_drm_get_device_path</a>, function in <a class="link" href="libs-GstVaapiDisplayDRM.html" title="GstVaapiDisplayDRM">GstVaapiDisplayDRM</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libs-GstVaapiDisplayDRM.html#gst-vaapi-display-drm-new" title="gst_vaapi_display_drm_new ()">gst_vaapi_display_drm_new</a>, function in <a class="link" href="libs-GstVaapiDisplayDRM.html" title="GstVaapiDisplayDRM">GstVaapiDisplayDRM</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libs-GstVaapiDisplayDRM.html#gst-vaapi-display-drm-new-with-device" title="gst_vaapi_display_drm_new_with_device ()">gst_vaapi_display_drm_new_with_device</a>, function in <a class="link" href="libs-GstVaapiDisplayDRM.html" title="GstVaapiDisplayDRM">GstVaapiDisplayDRM</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libs-GstVaapiDisplayEGL.html#gst-vaapi-display-egl-get-gl-context" title="gst_vaapi_display_egl_get_gl_context ()">gst_vaapi_display_egl_get_gl_context</a>, function in <a class="link" href="libs-GstVaapiDisplayEGL.html" title="GstVaapiDisplayEGL">GstVaapiDisplayEGL</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libs-GstVaapiDisplayEGL.html#gst-vaapi-display-egl-get-gl-display" title="gst_vaapi_display_egl_get_gl_display ()">gst_vaapi_display_egl_get_gl_display</a>, function in <a class="link" href="libs-GstVaapiDisplayEGL.html" title="GstVaapiDisplayEGL">GstVaapiDisplayEGL</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libs-GstVaapiDisplayEGL.html#gst-vaapi-display-egl-new" title="gst_vaapi_display_egl_new ()">gst_vaapi_display_egl_new</a>, function in <a class="link" href="libs-GstVaapiDisplayEGL.html" title="GstVaapiDisplayEGL">GstVaapiDisplayEGL</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libs-GstVaapiDisplayEGL.html#gst-vaapi-display-egl-new-with-native-display" title="gst_vaapi_display_egl_new_with_native_display ()">gst_vaapi_display_egl_new_with_native_display</a>, function in <a class="link" href="libs-GstVaapiDisplayEGL.html" title="GstVaapiDisplayEGL">GstVaapiDisplayEGL</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libs-GstVaapiDisplayEGL.html#gst-vaapi-display-egl-set-gl-context" title="gst_vaapi_display_egl_set_gl_context ()">gst_vaapi_display_egl_set_gl_context</a>, function in <a class="link" href="libs-GstVaapiDisplayEGL.html" title="GstVaapiDisplayEGL">GstVaapiDisplayEGL</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="libs-GstVaapiDisplay.html#gst-vaapi-display-flush" title="gst_vaapi_display_flush ()">gst_vaapi_display_flush</a>, function in <a class="link" href="libs-GstVaapiDisplay.html" title="GstVaapiDisplay">GstVaapiDisplay</a>
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="libs-GstVaapiDisplay.html#gst-vaapi-display-get-class-type" title="gst_vaapi_display_get_class_type ()">gst_vaapi_display_get_class_type</a>, function in <a class="link" href="libs-GstVaapiDisplay.html" title="GstVaapiDisplay">GstVaapiDisplay</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libs-GstVaapiDisplay.html#gst-vaapi-display-get-decode-profiles" title="gst_vaapi_display_get_decode_profiles ()">gst_vaapi_display_get_decode_profiles</a>, function in <a class="link" href="libs-GstVaapiDisplay.html" title="GstVaapiDisplay">GstVaapiDisplay</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="libs-GstVaapiDisplay.html#gst-vaapi-display-get-display" title="gst_vaapi_display_get_display ()">gst_vaapi_display_get_display</a>, function in <a class="link" href="libs-GstVaapiDisplay.html" title="GstVaapiDisplay">GstVaapiDisplay</a>
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="libs-GstVaapiDisplay.html#gst-vaapi-display-get-display-name" title="gst_vaapi_display_get_display_name ()">gst_vaapi_display_get_display_name</a>, function in <a class="link" href="libs-GstVaapiDisplay.html" title="GstVaapiDisplay">GstVaapiDisplay</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libs-GstVaapiDisplay.html#gst-vaapi-display-get-display-type" title="gst_vaapi_display_get_display_type ()">gst_vaapi_display_get_display_type</a>, function in <a class="link" href="libs-GstVaapiDisplay.html" title="GstVaapiDisplay">GstVaapiDisplay</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libs-GstVaapiDisplay.html#gst-vaapi-display-get-encode-profiles" title="gst_vaapi_display_get_encode_profiles ()">gst_vaapi_display_get_encode_profiles</a>, function in <a class="link" href="libs-GstVaapiDisplay.html" title="GstVaapiDisplay">GstVaapiDisplay</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="libs-GstVaapiDisplay.html#gst-vaapi-display-get-height" title="gst_vaapi_display_get_height ()">gst_vaapi_display_get_height</a>, function in <a class="link" href="libs-GstVaapiDisplay.html" title="GstVaapiDisplay">GstVaapiDisplay</a>
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="libs-GstVaapiDisplay.html#gst-vaapi-display-get-image-formats" title="gst_vaapi_display_get_image_formats ()">gst_vaapi_display_get_image_formats</a>, function in <a class="link" href="libs-GstVaapiDisplay.html" title="GstVaapiDisplay">GstVaapiDisplay</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="libs-GstVaapiDisplay.html#gst-vaapi-display-get-pixel-aspect-ratio" title="gst_vaapi_display_get_pixel_aspect_ratio ()">gst_vaapi_display_get_pixel_aspect_ratio</a>, function in <a class="link" href="libs-GstVaapiDisplay.html" title="GstVaapiDisplay">GstVaapiDisplay</a>
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="libs-GstVaapiDisplay.html#gst-vaapi-display-get-property" title="gst_vaapi_display_get_property ()">gst_vaapi_display_get_property</a>, function in <a class="link" href="libs-GstVaapiDisplay.html" title="GstVaapiDisplay">GstVaapiDisplay</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="libs-GstVaapiDisplay.html#gst-vaapi-display-get-render-mode" title="gst_vaapi_display_get_render_mode ()">gst_vaapi_display_get_render_mode</a>, function in <a class="link" href="libs-GstVaapiDisplay.html" title="GstVaapiDisplay">GstVaapiDisplay</a>
 </dt>
 <dd></dd>
@@ -239,6 +408,14 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="libs-GstVaapiDisplay.html#gst-vaapi-display-get-subpicture-formats" title="gst_vaapi_display_get_subpicture_formats ()">gst_vaapi_display_get_subpicture_formats</a>, function in <a class="link" href="libs-GstVaapiDisplay.html" title="GstVaapiDisplay">GstVaapiDisplay</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libs-GstVaapiDisplay.html#gst-vaapi-display-get-vendor-string" title="gst_vaapi_display_get_vendor_string ()">gst_vaapi_display_get_vendor_string</a>, function in <a class="link" href="libs-GstVaapiDisplay.html" title="GstVaapiDisplay">GstVaapiDisplay</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="libs-GstVaapiDisplay.html#gst-vaapi-display-get-width" title="gst_vaapi_display_get_width ()">gst_vaapi_display_get_width</a>, function in <a class="link" href="libs-GstVaapiDisplay.html" title="GstVaapiDisplay">GstVaapiDisplay</a>
 </dt>
 <dd></dd>
@@ -263,6 +440,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="libs-GstVaapiDisplay.html#gst-vaapi-display-has-opengl" title="gst_vaapi_display_has_opengl ()">gst_vaapi_display_has_opengl</a>, function in <a class="link" href="libs-GstVaapiDisplay.html" title="GstVaapiDisplay">GstVaapiDisplay</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="libs-GstVaapiDisplay.html#gst-vaapi-display-has-property" title="gst_vaapi_display_has_property ()">gst_vaapi_display_has_property</a>, function in <a class="link" href="libs-GstVaapiDisplay.html" title="GstVaapiDisplay">GstVaapiDisplay</a>
 </dt>
 <dd></dd>
@@ -271,6 +452,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="libs-GstVaapiDisplay.html#gst-vaapi-display-has-video-processing" title="gst_vaapi_display_has_video_processing ()">gst_vaapi_display_has_video_processing</a>, function in <a class="link" href="libs-GstVaapiDisplay.html" title="GstVaapiDisplay">GstVaapiDisplay</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="libs-GstVaapiDisplay.html#gst-vaapi-display-lock" title="gst_vaapi_display_lock ()">gst_vaapi_display_lock</a>, function in <a class="link" href="libs-GstVaapiDisplay.html" title="GstVaapiDisplay">GstVaapiDisplay</a>
 </dt>
 <dd></dd>
@@ -279,6 +464,18 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="libs-GstVaapiDisplay.html#gst-vaapi-display-ref" title="gst_vaapi_display_ref ()">gst_vaapi_display_ref</a>, function in <a class="link" href="libs-GstVaapiDisplay.html" title="GstVaapiDisplay">GstVaapiDisplay</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libs-GstVaapiDisplay.html#gst-vaapi-display-replace" title="gst_vaapi_display_replace ()">gst_vaapi_display_replace</a>, function in <a class="link" href="libs-GstVaapiDisplay.html" title="GstVaapiDisplay">GstVaapiDisplay</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libs-GstVaapiDisplay.html#gst-vaapi-display-set-property" title="gst_vaapi_display_set_property ()">gst_vaapi_display_set_property</a>, function in <a class="link" href="libs-GstVaapiDisplay.html" title="GstVaapiDisplay">GstVaapiDisplay</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="libs-GstVaapiDisplay.html#gst-vaapi-display-set-render-mode" title="gst_vaapi_display_set_render_mode ()">gst_vaapi_display_set_render_mode</a>, function in <a class="link" href="libs-GstVaapiDisplay.html" title="GstVaapiDisplay">GstVaapiDisplay</a>
 </dt>
 <dd></dd>
@@ -295,6 +492,22 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="libs-GstVaapiDisplay.html#gst-vaapi-display-unref" title="gst_vaapi_display_unref ()">gst_vaapi_display_unref</a>, function in <a class="link" href="libs-GstVaapiDisplay.html" title="GstVaapiDisplay">GstVaapiDisplay</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libs-GstVaapiDisplayWayland.html#gst-vaapi-display-wayland-get-display" title="gst_vaapi_display_wayland_get_display ()">gst_vaapi_display_wayland_get_display</a>, function in <a class="link" href="libs-GstVaapiDisplayWayland.html" title="GstVaapiDisplayWayland">GstVaapiDisplayWayland</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libs-GstVaapiDisplayWayland.html#gst-vaapi-display-wayland-new" title="gst_vaapi_display_wayland_new ()">gst_vaapi_display_wayland_new</a>, function in <a class="link" href="libs-GstVaapiDisplayWayland.html" title="GstVaapiDisplayWayland">GstVaapiDisplayWayland</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libs-GstVaapiDisplayWayland.html#gst-vaapi-display-wayland-new-with-display" title="gst_vaapi_display_wayland_new_with_display ()">gst_vaapi_display_wayland_new_with_display</a>, function in <a class="link" href="libs-GstVaapiDisplayWayland.html" title="GstVaapiDisplayWayland">GstVaapiDisplayWayland</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="libs-GstVaapiDisplayX11.html#gst-vaapi-display-x11-get-display" title="gst_vaapi_display_x11_get_display ()">gst_vaapi_display_x11_get_display</a>, function in <a class="link" href="libs-GstVaapiDisplayX11.html" title="GstVaapiDisplayX11">GstVaapiDisplayX11</a>
 </dt>
 <dd></dd>
@@ -511,6 +724,30 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="libs-GstVaapiParserFrame.html#gst-vaapi-parser-frame-append-unit" title="gst_vaapi_parser_frame_append_unit ()">gst_vaapi_parser_frame_append_unit</a>, function in <a class="link" href="libs-GstVaapiParserFrame.html" title="GstVaapiParserFrame">GstVaapiParserFrame</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libs-GstVaapiParserFrame.html#gst-vaapi-parser-frame-free" title="gst_vaapi_parser_frame_free ()">gst_vaapi_parser_frame_free</a>, function in <a class="link" href="libs-GstVaapiParserFrame.html" title="GstVaapiParserFrame">GstVaapiParserFrame</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libs-GstVaapiParserFrame.html#gst-vaapi-parser-frame-new" title="gst_vaapi_parser_frame_new ()">gst_vaapi_parser_frame_new</a>, function in <a class="link" href="libs-GstVaapiParserFrame.html" title="GstVaapiParserFrame">GstVaapiParserFrame</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libs-GstVaapiParserFrame.html#gst-vaapi-parser-frame-ref" title="gst_vaapi_parser_frame_ref()">gst_vaapi_parser_frame_ref</a>, macro in <a class="link" href="libs-GstVaapiParserFrame.html" title="GstVaapiParserFrame">GstVaapiParserFrame</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libs-GstVaapiParserFrame.html#gst-vaapi-parser-frame-replace" title="gst_vaapi_parser_frame_replace()">gst_vaapi_parser_frame_replace</a>, macro in <a class="link" href="libs-GstVaapiParserFrame.html" title="GstVaapiParserFrame">GstVaapiParserFrame</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libs-GstVaapiParserFrame.html#gst-vaapi-parser-frame-unref" title="gst_vaapi_parser_frame_unref()">gst_vaapi_parser_frame_unref</a>, macro in <a class="link" href="libs-GstVaapiParserFrame.html" title="GstVaapiParserFrame">GstVaapiParserFrame</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="libs-GstVaapiPixmap.html#gst-vaapi-pixmap-get-format" title="gst_vaapi_pixmap_get_format ()">gst_vaapi_pixmap_get_format</a>, function in <a class="link" href="libs-GstVaapiPixmap.html" title="GstVaapiPixmap">GstVaapiPixmap</a>
 </dt>
 <dd></dd>
@@ -563,6 +800,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="libs-GstVaapiValue.html#GST-VAAPI-POPCOUNT32:CAPS" title="GST_VAAPI_POPCOUNT32()">GST_VAAPI_POPCOUNT32</a>, macro in <a class="link" href="libs-GstVaapiValue.html" title="GstVaapiValue">GstVaapiValue</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="libs-GstVaapiProfile.html#gst-vaapi-profile" title="gst_vaapi_profile ()">gst_vaapi_profile</a>, function in <a class="link" href="libs-GstVaapiProfile.html" title="GstVaapiProfile">GstVaapiProfile</a>
 </dt>
 <dd></dd>
@@ -723,6 +964,14 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="libs-GstVaapiTextureEGL.html#gst-vaapi-texture-egl-new" title="gst_vaapi_texture_egl_new ()">gst_vaapi_texture_egl_new</a>, function in <a class="link" href="libs-GstVaapiTextureEGL.html" title="GstVaapiTextureEGL">GstVaapiTextureEGL</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libs-GstVaapiTextureEGL.html#gst-vaapi-texture-egl-new-wrapped" title="gst_vaapi_texture_egl_new_wrapped ()">gst_vaapi_texture_egl_new_wrapped</a>, function in <a class="link" href="libs-GstVaapiTextureEGL.html" title="GstVaapiTextureEGL">GstVaapiTextureEGL</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="libs-GstVaapiTexture.html#gst-vaapi-texture-get-format" title="gst_vaapi_texture_get_format ()">gst_vaapi_texture_get_format</a>, function in <a class="link" href="libs-GstVaapiTexture.html" title="GstVaapiTexture">GstVaapiTexture</a>
 </dt>
 <dd></dd>
@@ -735,6 +984,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="libs-GstVaapiTexture.html#gst-vaapi-texture-get-orientation-flags" title="gst_vaapi_texture_get_orientation_flags ()">gst_vaapi_texture_get_orientation_flags</a>, function in <a class="link" href="libs-GstVaapiTexture.html" title="GstVaapiTexture">GstVaapiTexture</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="libs-GstVaapiTexture.html#gst-vaapi-texture-get-size" title="gst_vaapi_texture_get_size ()">gst_vaapi_texture_get_size</a>, function in <a class="link" href="libs-GstVaapiTexture.html" title="GstVaapiTexture">GstVaapiTexture</a>
 </dt>
 <dd></dd>
@@ -747,18 +1000,70 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="libs-GstVaapiTextureGLX.html#gst-vaapi-texture-glx-new" title="gst_vaapi_texture_glx_new ()">gst_vaapi_texture_glx_new</a>, function in <a class="link" href="libs-GstVaapiTextureGLX.html" title="GstVaapiTextureGLX">GstVaapiTextureGLX</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libs-GstVaapiTextureGLX.html#gst-vaapi-texture-glx-new-wrapped" title="gst_vaapi_texture_glx_new_wrapped ()">gst_vaapi_texture_glx_new_wrapped</a>, function in <a class="link" href="libs-GstVaapiTextureGLX.html" title="GstVaapiTextureGLX">GstVaapiTextureGLX</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="libs-GstVaapiTexture.html#gst-vaapi-texture-new" title="gst_vaapi_texture_new ()">gst_vaapi_texture_new</a>, function in <a class="link" href="libs-GstVaapiTexture.html" title="GstVaapiTexture">GstVaapiTexture</a>
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="libs-GstVaapiTexture.html#gst-vaapi-texture-new-wrapped" title="gst_vaapi_texture_new_wrapped ()">gst_vaapi_texture_new_wrapped</a>, function in <a class="link" href="libs-GstVaapiTexture.html" title="GstVaapiTexture">GstVaapiTexture</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="libs-GstVaapiTexture.html#gst-vaapi-texture-put-surface" title="gst_vaapi_texture_put_surface ()">gst_vaapi_texture_put_surface</a>, function in <a class="link" href="libs-GstVaapiTexture.html" title="GstVaapiTexture">GstVaapiTexture</a>
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="libs-GstVaapiTexture.html#gst-vaapi-texture-ref" title="gst_vaapi_texture_ref ()">gst_vaapi_texture_ref</a>, function in <a class="link" href="libs-GstVaapiTexture.html" title="GstVaapiTexture">GstVaapiTexture</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libs-GstVaapiTexture.html#gst-vaapi-texture-replace" title="gst_vaapi_texture_replace ()">gst_vaapi_texture_replace</a>, function in <a class="link" href="libs-GstVaapiTexture.html" title="GstVaapiTexture">GstVaapiTexture</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libs-GstVaapiTexture.html#gst-vaapi-texture-set-orientation-flags" title="gst_vaapi_texture_set_orientation_flags ()">gst_vaapi_texture_set_orientation_flags</a>, function in <a class="link" href="libs-GstVaapiTexture.html" title="GstVaapiTexture">GstVaapiTexture</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libs-GstVaapiTexture.html#gst-vaapi-texture-unref" title="gst_vaapi_texture_unref ()">gst_vaapi_texture_unref</a>, function in <a class="link" href="libs-GstVaapiTexture.html" title="GstVaapiTexture">GstVaapiTexture</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libs-GstVaapiValue.html#GST-VAAPI-TYPE-POINT:CAPS" title="GST_VAAPI_TYPE_POINT">GST_VAAPI_TYPE_POINT</a>, macro in <a class="link" href="libs-GstVaapiValue.html" title="GstVaapiValue">GstVaapiValue</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libs-GstVaapiValue.html#GST-VAAPI-TYPE-RATE-CONTROL:CAPS" title="GST_VAAPI_TYPE_RATE_CONTROL">GST_VAAPI_TYPE_RATE_CONTROL</a>, macro in <a class="link" href="libs-GstVaapiValue.html" title="GstVaapiValue">GstVaapiValue</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libs-GstVaapiValue.html#GST-VAAPI-TYPE-RECTANGLE:CAPS" title="GST_VAAPI_TYPE_RECTANGLE">GST_VAAPI_TYPE_RECTANGLE</a>, macro in <a class="link" href="libs-GstVaapiValue.html" title="GstVaapiValue">GstVaapiValue</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libs-GstVaapiValue.html#GST-VAAPI-TYPE-RENDER-MODE:CAPS" title="GST_VAAPI_TYPE_RENDER_MODE">GST_VAAPI_TYPE_RENDER_MODE</a>, macro in <a class="link" href="libs-GstVaapiValue.html" title="GstVaapiValue">GstVaapiValue</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libs-GstVaapiValue.html#GST-VAAPI-TYPE-ROTATION:CAPS" title="GST_VAAPI_TYPE_ROTATION">GST_VAAPI_TYPE_ROTATION</a>, macro in <a class="link" href="libs-GstVaapiValue.html" title="GstVaapiValue">GstVaapiValue</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="libs-GstVideoFormat.html#gst-vaapi-video-format-from-va-format" title="gst_vaapi_video_format_from_va_format ()">gst_vaapi_video_format_from_va_format</a>, function in <a class="link" href="libs-GstVideoFormat.html" title="GstVideoFormat">GstVideoFormat</a>
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="libs-GstVideoFormat.html#gst-vaapi-video-format-from-va-fourcc" title="gst_vaapi_video_format_from_va_fourcc ()">gst_vaapi_video_format_from_va_fourcc</a>, function in <a class="link" href="libs-GstVideoFormat.html" title="GstVideoFormat">GstVideoFormat</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="libs-GstVideoFormat.html#gst-vaapi-video-format-get-chroma-type" title="gst_vaapi_video_format_get_chroma_type ()">gst_vaapi_video_format_get_chroma_type</a>, function in <a class="link" href="libs-GstVideoFormat.html" title="GstVideoFormat">GstVideoFormat</a>
 </dt>
 <dd></dd>
@@ -823,6 +1128,14 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="libs-GstVaapiWindowDRM.html#gst-vaapi-window-drm-new" title="gst_vaapi_window_drm_new ()">gst_vaapi_window_drm_new</a>, function in <a class="link" href="libs-GstVaapiWindowDRM.html" title="GstVaapiWindowDRM">GstVaapiWindowDRM</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libs-GstVaapiWindowEGL.html#gst-vaapi-window-egl-new" title="gst_vaapi_window_egl_new ()">gst_vaapi_window_egl_new</a>, function in <a class="link" href="libs-GstVaapiWindowEGL.html" title="GstVaapiWindowEGL">GstVaapiWindowEGL</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="libs-GstVaapiWindow.html#gst-vaapi-window-get-display" title="gst_vaapi_window_get_display ()">gst_vaapi_window_get_display</a>, function in <a class="link" href="libs-GstVaapiWindow.html" title="GstVaapiWindow">GstVaapiWindow</a>
 </dt>
 <dd></dd>
@@ -903,6 +1216,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="libs-GstVaapiWindowWayland.html#gst-vaapi-window-wayland-new" title="gst_vaapi_window_wayland_new ()">gst_vaapi_window_wayland_new</a>, function in <a class="link" href="libs-GstVaapiWindowWayland.html" title="GstVaapiWindowWayland">GstVaapiWindowWayland</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="libs-GstVaapiWindowX11.html#gst-vaapi-window-x11-get-xid" title="gst_vaapi_window_x11_get_xid ()">gst_vaapi_window_x11_get_xid</a>, function in <a class="link" href="libs-GstVaapiWindowX11.html" title="GstVaapiWindowX11">GstVaapiWindowX11</a>
 </dt>
 <dd></dd>
diff -Nru gstreamer-vaapi-0.5.10/docs/reference/libs/html/ch01.html gstreamer-vaapi-0.6.0/docs/reference/libs/html/ch01.html
--- gstreamer-vaapi-0.5.10/docs/reference/libs/html/ch01.html	2015-02-03 08:45:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/docs/reference/libs/html/ch01.html	2015-07-15 12:52:27.000000000 +0000
@@ -21,7 +21,7 @@
 </tr></table>
 <div class="chapter">
 <div class="titlepage"><div><div><h1 class="title">
-<a name="id-1.2"></a>gst-plugins-vaapi Library</h1></div></div></div>
+<a name="id-1.3"></a>gst-plugins-vaapi Library</h1></div></div></div>
 <div class="toc"><dl class="toc">
 <dt>
 <span class="refentrytitle"><a href="libs-GstVideoFormat.html">GstVideoFormat</a></span><span class="refpurpose"> — Video format helpers for VA-API</span>
@@ -39,13 +39,31 @@
 <span class="refentrytitle"><a href="libs-GstVaapiDisplayGLX.html">GstVaapiDisplayGLX</a></span><span class="refpurpose"> — VA/GLX display abstraction</span>
 </dt>
 <dt>
+<span class="refentrytitle"><a href="libs-GstVaapiDisplayEGL.html">GstVaapiDisplayEGL</a></span><span class="refpurpose"></span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="libs-GstVaapiDisplayDRM.html">GstVaapiDisplayDRM</a></span><span class="refpurpose"> — VA/DRM display abstraction</span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="libs-GstVaapiDisplayWayland.html">GstVaapiDisplayWayland</a></span><span class="refpurpose"> — VA/Wayland display abstraction</span>
+</dt>
+<dt>
 <span class="refentrytitle"><a href="libs-GstVaapiWindow.html">GstVaapiWindow</a></span><span class="refpurpose"> — VA window abstraction</span>
 </dt>
 <dt>
 <span class="refentrytitle"><a href="libs-GstVaapiWindowX11.html">GstVaapiWindowX11</a></span><span class="refpurpose"> — VA/X11 window abstraction</span>
 </dt>
 <dt>
-<span class="refentrytitle"><a href="libs-GstVaapiWindowGLX.html">GstVaapiWindowGLX</a></span><span class="refpurpose"> — VA/GLX window abstraction</span>
+<span class="refentrytitle"><a href="libs-GstVaapiWindowGLX.html">GstVaapiWindowGLX</a></span><span class="refpurpose"></span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="libs-GstVaapiWindowEGL.html">GstVaapiWindowEGL</a></span><span class="refpurpose"> — VA/EGL window abstraction</span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="libs-GstVaapiWindowDRM.html">GstVaapiWindowDRM</a></span><span class="refpurpose"> — VA/DRM dummy window abstraction</span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="libs-GstVaapiWindowWayland.html">GstVaapiWindowWayland</a></span><span class="refpurpose"> — VA/Wayland window abstraction</span>
 </dt>
 <dt>
 <span class="refentrytitle"><a href="libs-GstVaapiPixmap.html">GstVaapiPixmap</a></span><span class="refpurpose"> — Pixmap abstraction</span>
@@ -69,6 +87,12 @@
 <span class="refentrytitle"><a href="libs-GstVaapiTexture.html">GstVaapiTexture</a></span><span class="refpurpose"> — VA/GLX texture abstraction</span>
 </dt>
 <dt>
+<span class="refentrytitle"><a href="libs-GstVaapiTextureEGL.html">GstVaapiTextureEGL</a></span><span class="refpurpose"> — VA/EGL texture abstraction</span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="libs-GstVaapiTextureGLX.html">GstVaapiTextureGLX</a></span><span class="refpurpose"> — VA/GLX texture abstraction</span>
+</dt>
+<dt>
 <span class="refentrytitle"><a href="libs-GstVaapiProfile.html">GstVaapiProfile</a></span><span class="refpurpose"> — VA profile abstraction</span>
 </dt>
 <dt>
@@ -99,11 +123,29 @@
 <span class="refentrytitle"><a href="libs-GstVaapiDecoderVC1.html">GstVaapiDecoderVC1</a></span><span class="refpurpose"> — VC-1 decoder</span>
 </dt>
 <dt>
+<span class="refentrytitle"><a href="libs-GstVaapiDecoderVp8.html">GstVaapiDecoderVp8</a></span><span class="refpurpose"> — VP8 decoder</span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="libs-GstVaapiDecoderH265.html">GstVaapiDecoderH265</a></span><span class="refpurpose"> — H.265 decoder</span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="libs-GstVaapiDecoderUnit.html">GstVaapiDecoderUnit</a></span><span class="refpurpose"> — Decoder unit</span>
+</dt>
+<dt>
 <span class="refentrytitle"><a href="libs-GstVaapiSurfaceProxy.html">GstVaapiSurfaceProxy</a></span><span class="refpurpose"> — VA surface proxy</span>
 </dt>
 <dt>
 <span class="refentrytitle"><a href="libs-GstVaapiFilter.html">GstVaapiFilter</a></span><span class="refpurpose"></span>
 </dt>
+<dt>
+<span class="refentrytitle"><a href="libs-GstVaapiValue.html">GstVaapiValue</a></span><span class="refpurpose"> — GValue implementations specific to VA-API</span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="libs-GstVaapiParserFrame.html">GstVaapiParserFrame</a></span><span class="refpurpose"> — VA decoder frame</span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="libs-GstVaapiContext.html">GstVaapiContext</a></span><span class="refpurpose"> — VA context abstraction</span>
+</dt>
 </dl></div>
 </div>
 <div class="footer">
diff -Nru gstreamer-vaapi-0.5.10/docs/reference/libs/html/index.html gstreamer-vaapi-0.6.0/docs/reference/libs/html/index.html
--- gstreamer-vaapi-0.5.10/docs/reference/libs/html/index.html	2015-02-03 08:45:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/docs/reference/libs/html/index.html	2015-07-15 12:52:27.000000000 +0000
@@ -34,13 +34,31 @@
 <span class="refentrytitle"><a href="libs-GstVaapiDisplayGLX.html">GstVaapiDisplayGLX</a></span><span class="refpurpose"> — VA/GLX display abstraction</span>
 </dt>
 <dt>
+<span class="refentrytitle"><a href="libs-GstVaapiDisplayEGL.html">GstVaapiDisplayEGL</a></span><span class="refpurpose"></span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="libs-GstVaapiDisplayDRM.html">GstVaapiDisplayDRM</a></span><span class="refpurpose"> — VA/DRM display abstraction</span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="libs-GstVaapiDisplayWayland.html">GstVaapiDisplayWayland</a></span><span class="refpurpose"> — VA/Wayland display abstraction</span>
+</dt>
+<dt>
 <span class="refentrytitle"><a href="libs-GstVaapiWindow.html">GstVaapiWindow</a></span><span class="refpurpose"> — VA window abstraction</span>
 </dt>
 <dt>
 <span class="refentrytitle"><a href="libs-GstVaapiWindowX11.html">GstVaapiWindowX11</a></span><span class="refpurpose"> — VA/X11 window abstraction</span>
 </dt>
 <dt>
-<span class="refentrytitle"><a href="libs-GstVaapiWindowGLX.html">GstVaapiWindowGLX</a></span><span class="refpurpose"> — VA/GLX window abstraction</span>
+<span class="refentrytitle"><a href="libs-GstVaapiWindowGLX.html">GstVaapiWindowGLX</a></span><span class="refpurpose"></span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="libs-GstVaapiWindowEGL.html">GstVaapiWindowEGL</a></span><span class="refpurpose"> — VA/EGL window abstraction</span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="libs-GstVaapiWindowDRM.html">GstVaapiWindowDRM</a></span><span class="refpurpose"> — VA/DRM dummy window abstraction</span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="libs-GstVaapiWindowWayland.html">GstVaapiWindowWayland</a></span><span class="refpurpose"> — VA/Wayland window abstraction</span>
 </dt>
 <dt>
 <span class="refentrytitle"><a href="libs-GstVaapiPixmap.html">GstVaapiPixmap</a></span><span class="refpurpose"> — Pixmap abstraction</span>
@@ -64,6 +82,12 @@
 <span class="refentrytitle"><a href="libs-GstVaapiTexture.html">GstVaapiTexture</a></span><span class="refpurpose"> — VA/GLX texture abstraction</span>
 </dt>
 <dt>
+<span class="refentrytitle"><a href="libs-GstVaapiTextureEGL.html">GstVaapiTextureEGL</a></span><span class="refpurpose"> — VA/EGL texture abstraction</span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="libs-GstVaapiTextureGLX.html">GstVaapiTextureGLX</a></span><span class="refpurpose"> — VA/GLX texture abstraction</span>
+</dt>
+<dt>
 <span class="refentrytitle"><a href="libs-GstVaapiProfile.html">GstVaapiProfile</a></span><span class="refpurpose"> — VA profile abstraction</span>
 </dt>
 <dt>
@@ -94,15 +118,38 @@
 <span class="refentrytitle"><a href="libs-GstVaapiDecoderVC1.html">GstVaapiDecoderVC1</a></span><span class="refpurpose"> — VC-1 decoder</span>
 </dt>
 <dt>
+<span class="refentrytitle"><a href="libs-GstVaapiDecoderVp8.html">GstVaapiDecoderVp8</a></span><span class="refpurpose"> — VP8 decoder</span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="libs-GstVaapiDecoderH265.html">GstVaapiDecoderH265</a></span><span class="refpurpose"> — H.265 decoder</span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="libs-GstVaapiDecoderUnit.html">GstVaapiDecoderUnit</a></span><span class="refpurpose"> — Decoder unit</span>
+</dt>
+<dt>
 <span class="refentrytitle"><a href="libs-GstVaapiSurfaceProxy.html">GstVaapiSurfaceProxy</a></span><span class="refpurpose"> — VA surface proxy</span>
 </dt>
 <dt>
 <span class="refentrytitle"><a href="libs-GstVaapiFilter.html">GstVaapiFilter</a></span><span class="refpurpose"></span>
 </dt>
+<dt>
+<span class="refentrytitle"><a href="libs-GstVaapiValue.html">GstVaapiValue</a></span><span class="refpurpose"> — GValue implementations specific to VA-API</span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="libs-GstVaapiParserFrame.html">GstVaapiParserFrame</a></span><span class="refpurpose"> — VA decoder frame</span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="libs-GstVaapiContext.html">GstVaapiContext</a></span><span class="refpurpose"> — VA context abstraction</span>
+</dt>
 </dl></dd>
 <dt><span class="chapter"><a href="object-tree.html">Object Hierarchy</a></span></dt>
 <dt><span class="index"><a href="api-index-full.html">API Index</a></span></dt>
+<dt><span class="glossary"><a href="annotation-glossary.html">Annotation Glossary</a></span></dt>
 </dl></div>
+<p>
+    To ease the creation of plugins, a Gstreamer-oriented library was created,
+    which wraps <a class="ulink" href="https://wiki.freedesktop.org/www/Software/vaapi/" target="_top">VA-API</a>.
+  </p>
 </div>
 <div class="footer">
 <hr>
diff -Nru gstreamer-vaapi-0.5.10/docs/reference/libs/html/index.sgml gstreamer-vaapi-0.6.0/docs/reference/libs/html/index.sgml
--- gstreamer-vaapi-0.5.10/docs/reference/libs/html/index.sgml	2015-02-03 08:45:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/docs/reference/libs/html/index.sgml	2015-07-15 12:52:26.000000000 +0000
@@ -3,6 +3,7 @@
 <ANCHOR id="libs-GstVideoFormat.description" href="libs/libs-GstVideoFormat.html#libs-GstVideoFormat.description">
 <ANCHOR id="libs-GstVideoFormat.functions_details" href="libs/libs-GstVideoFormat.html#libs-GstVideoFormat.functions_details">
 <ANCHOR id="gst-vaapi-video-format-to-string" href="libs/libs-GstVideoFormat.html#gst-vaapi-video-format-to-string">
+<ANCHOR id="gst-vaapi-video-format-from-va-fourcc" href="libs/libs-GstVideoFormat.html#gst-vaapi-video-format-from-va-fourcc">
 <ANCHOR id="gst-vaapi-video-format-from-va-format" href="libs/libs-GstVideoFormat.html#gst-vaapi-video-format-from-va-format">
 <ANCHOR id="gst-vaapi-video-format-get-chroma-type" href="libs/libs-GstVideoFormat.html#gst-vaapi-video-format-get-chroma-type">
 <ANCHOR id="gst-vaapi-video-format-get-score" href="libs/libs-GstVideoFormat.html#gst-vaapi-video-format-get-score">
@@ -27,26 +28,43 @@
 <ANCHOR id="libs-GstVaapiDisplay.description" href="libs/libs-GstVaapiDisplay.html#libs-GstVaapiDisplay.description">
 <ANCHOR id="libs-GstVaapiDisplay.functions_details" href="libs/libs-GstVaapiDisplay.html#libs-GstVaapiDisplay.functions_details">
 <ANCHOR id="gst-vaapi-display-new-with-display" href="libs/libs-GstVaapiDisplay.html#gst-vaapi-display-new-with-display">
+<ANCHOR id="gst-vaapi-display-ref" href="libs/libs-GstVaapiDisplay.html#gst-vaapi-display-ref">
+<ANCHOR id="gst-vaapi-display-unref" href="libs/libs-GstVaapiDisplay.html#gst-vaapi-display-unref">
+<ANCHOR id="gst-vaapi-display-replace" href="libs/libs-GstVaapiDisplay.html#gst-vaapi-display-replace">
 <ANCHOR id="gst-vaapi-display-lock" href="libs/libs-GstVaapiDisplay.html#gst-vaapi-display-lock">
 <ANCHOR id="gst-vaapi-display-unlock" href="libs/libs-GstVaapiDisplay.html#gst-vaapi-display-unlock">
 <ANCHOR id="gst-vaapi-display-sync" href="libs/libs-GstVaapiDisplay.html#gst-vaapi-display-sync">
 <ANCHOR id="gst-vaapi-display-flush" href="libs/libs-GstVaapiDisplay.html#gst-vaapi-display-flush">
+<ANCHOR id="gst-vaapi-display-get-class-type" href="libs/libs-GstVaapiDisplay.html#gst-vaapi-display-get-class-type">
+<ANCHOR id="gst-vaapi-display-get-display-type" href="libs/libs-GstVaapiDisplay.html#gst-vaapi-display-get-display-type">
+<ANCHOR id="gst-vaapi-display-get-display-name" href="libs/libs-GstVaapiDisplay.html#gst-vaapi-display-get-display-name">
 <ANCHOR id="gst-vaapi-display-get-display" href="libs/libs-GstVaapiDisplay.html#gst-vaapi-display-get-display">
 <ANCHOR id="gst-vaapi-display-get-width" href="libs/libs-GstVaapiDisplay.html#gst-vaapi-display-get-width">
 <ANCHOR id="gst-vaapi-display-get-height" href="libs/libs-GstVaapiDisplay.html#gst-vaapi-display-get-height">
 <ANCHOR id="gst-vaapi-display-get-size" href="libs/libs-GstVaapiDisplay.html#gst-vaapi-display-get-size">
 <ANCHOR id="gst-vaapi-display-get-pixel-aspect-ratio" href="libs/libs-GstVaapiDisplay.html#gst-vaapi-display-get-pixel-aspect-ratio">
+<ANCHOR id="gst-vaapi-display-has-video-processing" href="libs/libs-GstVaapiDisplay.html#gst-vaapi-display-has-video-processing">
+<ANCHOR id="gst-vaapi-display-get-decode-profiles" href="libs/libs-GstVaapiDisplay.html#gst-vaapi-display-get-decode-profiles">
 <ANCHOR id="gst-vaapi-display-has-decoder" href="libs/libs-GstVaapiDisplay.html#gst-vaapi-display-has-decoder">
+<ANCHOR id="gst-vaapi-display-get-encode-profiles" href="libs/libs-GstVaapiDisplay.html#gst-vaapi-display-get-encode-profiles">
 <ANCHOR id="gst-vaapi-display-has-encoder" href="libs/libs-GstVaapiDisplay.html#gst-vaapi-display-has-encoder">
+<ANCHOR id="gst-vaapi-display-get-image-formats" href="libs/libs-GstVaapiDisplay.html#gst-vaapi-display-get-image-formats">
 <ANCHOR id="gst-vaapi-display-has-image-format" href="libs/libs-GstVaapiDisplay.html#gst-vaapi-display-has-image-format">
+<ANCHOR id="gst-vaapi-display-get-subpicture-formats" href="libs/libs-GstVaapiDisplay.html#gst-vaapi-display-get-subpicture-formats">
 <ANCHOR id="gst-vaapi-display-has-subpicture-format" href="libs/libs-GstVaapiDisplay.html#gst-vaapi-display-has-subpicture-format">
 <ANCHOR id="gst-vaapi-display-has-property" href="libs/libs-GstVaapiDisplay.html#gst-vaapi-display-has-property">
-<ANCHOR id="gst-vaapi-display-get-rotation" href="libs/libs-GstVaapiDisplay.html#gst-vaapi-display-get-rotation">
-<ANCHOR id="gst-vaapi-display-set-rotation" href="libs/libs-GstVaapiDisplay.html#gst-vaapi-display-set-rotation">
+<ANCHOR id="gst-vaapi-display-get-property" href="libs/libs-GstVaapiDisplay.html#gst-vaapi-display-get-property">
+<ANCHOR id="gst-vaapi-display-set-property" href="libs/libs-GstVaapiDisplay.html#gst-vaapi-display-set-property">
 <ANCHOR id="gst-vaapi-display-get-render-mode" href="libs/libs-GstVaapiDisplay.html#gst-vaapi-display-get-render-mode">
 <ANCHOR id="gst-vaapi-display-set-render-mode" href="libs/libs-GstVaapiDisplay.html#gst-vaapi-display-set-render-mode">
+<ANCHOR id="gst-vaapi-display-get-rotation" href="libs/libs-GstVaapiDisplay.html#gst-vaapi-display-get-rotation">
+<ANCHOR id="gst-vaapi-display-set-rotation" href="libs/libs-GstVaapiDisplay.html#gst-vaapi-display-set-rotation">
+<ANCHOR id="gst-vaapi-display-get-vendor-string" href="libs/libs-GstVaapiDisplay.html#gst-vaapi-display-get-vendor-string">
+<ANCHOR id="gst-vaapi-display-has-opengl" href="libs/libs-GstVaapiDisplay.html#gst-vaapi-display-has-opengl">
 <ANCHOR id="libs-GstVaapiDisplay.other_details" href="libs/libs-GstVaapiDisplay.html#libs-GstVaapiDisplay.other_details">
+<ANCHOR id="GstVaapiDisplayType" href="libs/libs-GstVaapiDisplay.html#GstVaapiDisplayType">
 <ANCHOR id="GstVaapiDisplay" href="libs/libs-GstVaapiDisplay.html#GstVaapiDisplay">
+<ANCHOR id="GstVaapiDisplayInfo" href="libs/libs-GstVaapiDisplay.html#GstVaapiDisplayInfo">
 <ANCHOR id="libs-GstVaapiDisplayX11" href="libs/libs-GstVaapiDisplayX11.html">
 <ANCHOR id="libs-GstVaapiDisplayX11.functions" href="libs/libs-GstVaapiDisplayX11.html#libs-GstVaapiDisplayX11.functions">
 <ANCHOR id="libs-GstVaapiDisplayX11.other" href="libs/libs-GstVaapiDisplayX11.html#libs-GstVaapiDisplayX11.other">
@@ -67,6 +85,35 @@
 <ANCHOR id="gst-vaapi-display-glx-new-with-display" href="libs/libs-GstVaapiDisplayGLX.html#gst-vaapi-display-glx-new-with-display">
 <ANCHOR id="libs-GstVaapiDisplayGLX.other_details" href="libs/libs-GstVaapiDisplayGLX.html#libs-GstVaapiDisplayGLX.other_details">
 <ANCHOR id="GstVaapiDisplayGLX" href="libs/libs-GstVaapiDisplayGLX.html#GstVaapiDisplayGLX">
+<ANCHOR id="libs-GstVaapiDisplayEGL" href="libs/libs-GstVaapiDisplayEGL.html">
+<ANCHOR id="libs-GstVaapiDisplayEGL.functions" href="libs/libs-GstVaapiDisplayEGL.html#libs-GstVaapiDisplayEGL.functions">
+<ANCHOR id="libs-GstVaapiDisplayEGL.other" href="libs/libs-GstVaapiDisplayEGL.html#libs-GstVaapiDisplayEGL.other">
+<ANCHOR id="libs-GstVaapiDisplayEGL.description" href="libs/libs-GstVaapiDisplayEGL.html#libs-GstVaapiDisplayEGL.description">
+<ANCHOR id="libs-GstVaapiDisplayEGL.functions_details" href="libs/libs-GstVaapiDisplayEGL.html#libs-GstVaapiDisplayEGL.functions_details">
+<ANCHOR id="gst-vaapi-display-egl-new" href="libs/libs-GstVaapiDisplayEGL.html#gst-vaapi-display-egl-new">
+<ANCHOR id="gst-vaapi-display-egl-new-with-native-display" href="libs/libs-GstVaapiDisplayEGL.html#gst-vaapi-display-egl-new-with-native-display">
+<ANCHOR id="gst-vaapi-display-egl-get-gl-display" href="libs/libs-GstVaapiDisplayEGL.html#gst-vaapi-display-egl-get-gl-display">
+<ANCHOR id="gst-vaapi-display-egl-set-gl-context" href="libs/libs-GstVaapiDisplayEGL.html#gst-vaapi-display-egl-set-gl-context">
+<ANCHOR id="gst-vaapi-display-egl-get-gl-context" href="libs/libs-GstVaapiDisplayEGL.html#gst-vaapi-display-egl-get-gl-context">
+<ANCHOR id="libs-GstVaapiDisplayEGL.other_details" href="libs/libs-GstVaapiDisplayEGL.html#libs-GstVaapiDisplayEGL.other_details">
+<ANCHOR id="GstVaapiDisplayEGL" href="libs/libs-GstVaapiDisplayEGL.html#GstVaapiDisplayEGL">
+<ANCHOR id="libs-GstVaapiDisplayDRM" href="libs/libs-GstVaapiDisplayDRM.html">
+<ANCHOR id="libs-GstVaapiDisplayDRM.functions" href="libs/libs-GstVaapiDisplayDRM.html#libs-GstVaapiDisplayDRM.functions">
+<ANCHOR id="libs-GstVaapiDisplayDRM.description" href="libs/libs-GstVaapiDisplayDRM.html#libs-GstVaapiDisplayDRM.description">
+<ANCHOR id="libs-GstVaapiDisplayDRM.functions_details" href="libs/libs-GstVaapiDisplayDRM.html#libs-GstVaapiDisplayDRM.functions_details">
+<ANCHOR id="gst-vaapi-display-drm-new" href="libs/libs-GstVaapiDisplayDRM.html#gst-vaapi-display-drm-new">
+<ANCHOR id="gst-vaapi-display-drm-new-with-device" href="libs/libs-GstVaapiDisplayDRM.html#gst-vaapi-display-drm-new-with-device">
+<ANCHOR id="gst-vaapi-display-drm-get-device" href="libs/libs-GstVaapiDisplayDRM.html#gst-vaapi-display-drm-get-device">
+<ANCHOR id="gst-vaapi-display-drm-get-device-path" href="libs/libs-GstVaapiDisplayDRM.html#gst-vaapi-display-drm-get-device-path">
+<ANCHOR id="libs-GstVaapiDisplayDRM.other_details" href="libs/libs-GstVaapiDisplayDRM.html#libs-GstVaapiDisplayDRM.other_details">
+<ANCHOR id="libs-GstVaapiDisplayWayland" href="libs/libs-GstVaapiDisplayWayland.html">
+<ANCHOR id="libs-GstVaapiDisplayWayland.functions" href="libs/libs-GstVaapiDisplayWayland.html#libs-GstVaapiDisplayWayland.functions">
+<ANCHOR id="libs-GstVaapiDisplayWayland.description" href="libs/libs-GstVaapiDisplayWayland.html#libs-GstVaapiDisplayWayland.description">
+<ANCHOR id="libs-GstVaapiDisplayWayland.functions_details" href="libs/libs-GstVaapiDisplayWayland.html#libs-GstVaapiDisplayWayland.functions_details">
+<ANCHOR id="gst-vaapi-display-wayland-new" href="libs/libs-GstVaapiDisplayWayland.html#gst-vaapi-display-wayland-new">
+<ANCHOR id="gst-vaapi-display-wayland-new-with-display" href="libs/libs-GstVaapiDisplayWayland.html#gst-vaapi-display-wayland-new-with-display">
+<ANCHOR id="gst-vaapi-display-wayland-get-display" href="libs/libs-GstVaapiDisplayWayland.html#gst-vaapi-display-wayland-get-display">
+<ANCHOR id="libs-GstVaapiDisplayWayland.other_details" href="libs/libs-GstVaapiDisplayWayland.html#libs-GstVaapiDisplayWayland.other_details">
 <ANCHOR id="libs-GstVaapiWindow" href="libs/libs-GstVaapiWindow.html">
 <ANCHOR id="libs-GstVaapiWindow.functions" href="libs/libs-GstVaapiWindow.html#libs-GstVaapiWindow.functions">
 <ANCHOR id="libs-GstVaapiWindow.other" href="libs/libs-GstVaapiWindow.html#libs-GstVaapiWindow.other">
@@ -113,6 +160,24 @@
 <ANCHOR id="gst-vaapi-window-glx-put-texture" href="libs/libs-GstVaapiWindowGLX.html#gst-vaapi-window-glx-put-texture">
 <ANCHOR id="libs-GstVaapiWindowGLX.other_details" href="libs/libs-GstVaapiWindowGLX.html#libs-GstVaapiWindowGLX.other_details">
 <ANCHOR id="GstVaapiWindowGLX" href="libs/libs-GstVaapiWindowGLX.html#GstVaapiWindowGLX">
+<ANCHOR id="libs-GstVaapiWindowEGL" href="libs/libs-GstVaapiWindowEGL.html">
+<ANCHOR id="libs-GstVaapiWindowEGL.functions" href="libs/libs-GstVaapiWindowEGL.html#libs-GstVaapiWindowEGL.functions">
+<ANCHOR id="libs-GstVaapiWindowEGL.description" href="libs/libs-GstVaapiWindowEGL.html#libs-GstVaapiWindowEGL.description">
+<ANCHOR id="libs-GstVaapiWindowEGL.functions_details" href="libs/libs-GstVaapiWindowEGL.html#libs-GstVaapiWindowEGL.functions_details">
+<ANCHOR id="gst-vaapi-window-egl-new" href="libs/libs-GstVaapiWindowEGL.html#gst-vaapi-window-egl-new">
+<ANCHOR id="libs-GstVaapiWindowEGL.other_details" href="libs/libs-GstVaapiWindowEGL.html#libs-GstVaapiWindowEGL.other_details">
+<ANCHOR id="libs-GstVaapiWindowDRM" href="libs/libs-GstVaapiWindowDRM.html">
+<ANCHOR id="libs-GstVaapiWindowDRM.functions" href="libs/libs-GstVaapiWindowDRM.html#libs-GstVaapiWindowDRM.functions">
+<ANCHOR id="libs-GstVaapiWindowDRM.description" href="libs/libs-GstVaapiWindowDRM.html#libs-GstVaapiWindowDRM.description">
+<ANCHOR id="libs-GstVaapiWindowDRM.functions_details" href="libs/libs-GstVaapiWindowDRM.html#libs-GstVaapiWindowDRM.functions_details">
+<ANCHOR id="gst-vaapi-window-drm-new" href="libs/libs-GstVaapiWindowDRM.html#gst-vaapi-window-drm-new">
+<ANCHOR id="libs-GstVaapiWindowDRM.other_details" href="libs/libs-GstVaapiWindowDRM.html#libs-GstVaapiWindowDRM.other_details">
+<ANCHOR id="libs-GstVaapiWindowWayland" href="libs/libs-GstVaapiWindowWayland.html">
+<ANCHOR id="libs-GstVaapiWindowWayland.functions" href="libs/libs-GstVaapiWindowWayland.html#libs-GstVaapiWindowWayland.functions">
+<ANCHOR id="libs-GstVaapiWindowWayland.description" href="libs/libs-GstVaapiWindowWayland.html#libs-GstVaapiWindowWayland.description">
+<ANCHOR id="libs-GstVaapiWindowWayland.functions_details" href="libs/libs-GstVaapiWindowWayland.html#libs-GstVaapiWindowWayland.functions_details">
+<ANCHOR id="gst-vaapi-window-wayland-new" href="libs/libs-GstVaapiWindowWayland.html#gst-vaapi-window-wayland-new">
+<ANCHOR id="libs-GstVaapiWindowWayland.other_details" href="libs/libs-GstVaapiWindowWayland.html#libs-GstVaapiWindowWayland.other_details">
 <ANCHOR id="libs-GstVaapiPixmap" href="libs/libs-GstVaapiPixmap.html">
 <ANCHOR id="libs-GstVaapiPixmap.functions" href="libs/libs-GstVaapiPixmap.html#libs-GstVaapiPixmap.functions">
 <ANCHOR id="libs-GstVaapiPixmap.other" href="libs/libs-GstVaapiPixmap.html#libs-GstVaapiPixmap.other">
@@ -226,15 +291,35 @@
 <ANCHOR id="libs-GstVaapiTexture.description" href="libs/libs-GstVaapiTexture.html#libs-GstVaapiTexture.description">
 <ANCHOR id="libs-GstVaapiTexture.functions_details" href="libs/libs-GstVaapiTexture.html#libs-GstVaapiTexture.functions_details">
 <ANCHOR id="gst-vaapi-texture-new" href="libs/libs-GstVaapiTexture.html#gst-vaapi-texture-new">
+<ANCHOR id="gst-vaapi-texture-new-wrapped" href="libs/libs-GstVaapiTexture.html#gst-vaapi-texture-new-wrapped">
+<ANCHOR id="gst-vaapi-texture-ref" href="libs/libs-GstVaapiTexture.html#gst-vaapi-texture-ref">
+<ANCHOR id="gst-vaapi-texture-unref" href="libs/libs-GstVaapiTexture.html#gst-vaapi-texture-unref">
+<ANCHOR id="gst-vaapi-texture-replace" href="libs/libs-GstVaapiTexture.html#gst-vaapi-texture-replace">
 <ANCHOR id="gst-vaapi-texture-get-id" href="libs/libs-GstVaapiTexture.html#gst-vaapi-texture-get-id">
 <ANCHOR id="gst-vaapi-texture-get-target" href="libs/libs-GstVaapiTexture.html#gst-vaapi-texture-get-target">
 <ANCHOR id="gst-vaapi-texture-get-format" href="libs/libs-GstVaapiTexture.html#gst-vaapi-texture-get-format">
 <ANCHOR id="gst-vaapi-texture-get-width" href="libs/libs-GstVaapiTexture.html#gst-vaapi-texture-get-width">
 <ANCHOR id="gst-vaapi-texture-get-height" href="libs/libs-GstVaapiTexture.html#gst-vaapi-texture-get-height">
 <ANCHOR id="gst-vaapi-texture-get-size" href="libs/libs-GstVaapiTexture.html#gst-vaapi-texture-get-size">
+<ANCHOR id="gst-vaapi-texture-get-orientation-flags" href="libs/libs-GstVaapiTexture.html#gst-vaapi-texture-get-orientation-flags">
+<ANCHOR id="gst-vaapi-texture-set-orientation-flags" href="libs/libs-GstVaapiTexture.html#gst-vaapi-texture-set-orientation-flags">
 <ANCHOR id="gst-vaapi-texture-put-surface" href="libs/libs-GstVaapiTexture.html#gst-vaapi-texture-put-surface">
 <ANCHOR id="libs-GstVaapiTexture.other_details" href="libs/libs-GstVaapiTexture.html#libs-GstVaapiTexture.other_details">
 <ANCHOR id="GstVaapiTexture" href="libs/libs-GstVaapiTexture.html#GstVaapiTexture">
+<ANCHOR id="libs-GstVaapiTextureEGL" href="libs/libs-GstVaapiTextureEGL.html">
+<ANCHOR id="libs-GstVaapiTextureEGL.functions" href="libs/libs-GstVaapiTextureEGL.html#libs-GstVaapiTextureEGL.functions">
+<ANCHOR id="libs-GstVaapiTextureEGL.description" href="libs/libs-GstVaapiTextureEGL.html#libs-GstVaapiTextureEGL.description">
+<ANCHOR id="libs-GstVaapiTextureEGL.functions_details" href="libs/libs-GstVaapiTextureEGL.html#libs-GstVaapiTextureEGL.functions_details">
+<ANCHOR id="gst-vaapi-texture-egl-new" href="libs/libs-GstVaapiTextureEGL.html#gst-vaapi-texture-egl-new">
+<ANCHOR id="gst-vaapi-texture-egl-new-wrapped" href="libs/libs-GstVaapiTextureEGL.html#gst-vaapi-texture-egl-new-wrapped">
+<ANCHOR id="libs-GstVaapiTextureEGL.other_details" href="libs/libs-GstVaapiTextureEGL.html#libs-GstVaapiTextureEGL.other_details">
+<ANCHOR id="libs-GstVaapiTextureGLX" href="libs/libs-GstVaapiTextureGLX.html">
+<ANCHOR id="libs-GstVaapiTextureGLX.functions" href="libs/libs-GstVaapiTextureGLX.html#libs-GstVaapiTextureGLX.functions">
+<ANCHOR id="libs-GstVaapiTextureGLX.description" href="libs/libs-GstVaapiTextureGLX.html#libs-GstVaapiTextureGLX.description">
+<ANCHOR id="libs-GstVaapiTextureGLX.functions_details" href="libs/libs-GstVaapiTextureGLX.html#libs-GstVaapiTextureGLX.functions_details">
+<ANCHOR id="gst-vaapi-texture-glx-new" href="libs/libs-GstVaapiTextureGLX.html#gst-vaapi-texture-glx-new">
+<ANCHOR id="gst-vaapi-texture-glx-new-wrapped" href="libs/libs-GstVaapiTextureGLX.html#gst-vaapi-texture-glx-new-wrapped">
+<ANCHOR id="libs-GstVaapiTextureGLX.other_details" href="libs/libs-GstVaapiTextureGLX.html#libs-GstVaapiTextureGLX.other_details">
 <ANCHOR id="libs-GstVaapiProfile" href="libs/libs-GstVaapiProfile.html">
 <ANCHOR id="libs-GstVaapiProfile.functions" href="libs/libs-GstVaapiProfile.html#libs-GstVaapiProfile.functions">
 <ANCHOR id="libs-GstVaapiProfile.other" href="libs/libs-GstVaapiProfile.html#libs-GstVaapiProfile.other">
@@ -341,6 +426,36 @@
 <ANCHOR id="gst-vaapi-decoder-vc1-new" href="libs/libs-GstVaapiDecoderVC1.html#gst-vaapi-decoder-vc1-new">
 <ANCHOR id="libs-GstVaapiDecoderVC1.other_details" href="libs/libs-GstVaapiDecoderVC1.html#libs-GstVaapiDecoderVC1.other_details">
 <ANCHOR id="GstVaapiDecoderVC1" href="libs/libs-GstVaapiDecoderVC1.html#GstVaapiDecoderVC1">
+<ANCHOR id="libs-GstVaapiDecoderVp8" href="libs/libs-GstVaapiDecoderVp8.html">
+<ANCHOR id="libs-GstVaapiDecoderVp8.functions" href="libs/libs-GstVaapiDecoderVp8.html#libs-GstVaapiDecoderVp8.functions">
+<ANCHOR id="libs-GstVaapiDecoderVp8.other" href="libs/libs-GstVaapiDecoderVp8.html#libs-GstVaapiDecoderVp8.other">
+<ANCHOR id="libs-GstVaapiDecoderVp8.description" href="libs/libs-GstVaapiDecoderVp8.html#libs-GstVaapiDecoderVp8.description">
+<ANCHOR id="libs-GstVaapiDecoderVp8.functions_details" href="libs/libs-GstVaapiDecoderVp8.html#libs-GstVaapiDecoderVp8.functions_details">
+<ANCHOR id="gst-vaapi-decoder-vp8-new" href="libs/libs-GstVaapiDecoderVp8.html#gst-vaapi-decoder-vp8-new">
+<ANCHOR id="libs-GstVaapiDecoderVp8.other_details" href="libs/libs-GstVaapiDecoderVp8.html#libs-GstVaapiDecoderVp8.other_details">
+<ANCHOR id="GstVaapiDecoderVp8" href="libs/libs-GstVaapiDecoderVp8.html#GstVaapiDecoderVp8">
+<ANCHOR id="libs-GstVaapiDecoderH265" href="libs/libs-GstVaapiDecoderH265.html">
+<ANCHOR id="libs-GstVaapiDecoderH265.functions" href="libs/libs-GstVaapiDecoderH265.html#libs-GstVaapiDecoderH265.functions">
+<ANCHOR id="libs-GstVaapiDecoderH265.other" href="libs/libs-GstVaapiDecoderH265.html#libs-GstVaapiDecoderH265.other">
+<ANCHOR id="libs-GstVaapiDecoderH265.description" href="libs/libs-GstVaapiDecoderH265.html#libs-GstVaapiDecoderH265.description">
+<ANCHOR id="libs-GstVaapiDecoderH265.functions_details" href="libs/libs-GstVaapiDecoderH265.html#libs-GstVaapiDecoderH265.functions_details">
+<ANCHOR id="gst-vaapi-decoder-h265-new" href="libs/libs-GstVaapiDecoderH265.html#gst-vaapi-decoder-h265-new">
+<ANCHOR id="gst-vaapi-decoder-h265-set-alignment" href="libs/libs-GstVaapiDecoderH265.html#gst-vaapi-decoder-h265-set-alignment">
+<ANCHOR id="libs-GstVaapiDecoderH265.other_details" href="libs/libs-GstVaapiDecoderH265.html#libs-GstVaapiDecoderH265.other_details">
+<ANCHOR id="GstVaapiDecoderH265" href="libs/libs-GstVaapiDecoderH265.html#GstVaapiDecoderH265">
+<ANCHOR id="GstVaapiStreamAlignH265" href="libs/libs-GstVaapiDecoderH265.html#GstVaapiStreamAlignH265">
+<ANCHOR id="libs-GstVaapiDecoderUnit" href="libs/libs-GstVaapiDecoderUnit.html">
+<ANCHOR id="libs-GstVaapiDecoderUnit.functions" href="libs/libs-GstVaapiDecoderUnit.html#libs-GstVaapiDecoderUnit.functions">
+<ANCHOR id="libs-GstVaapiDecoderUnit.other" href="libs/libs-GstVaapiDecoderUnit.html#libs-GstVaapiDecoderUnit.other">
+<ANCHOR id="libs-GstVaapiDecoderUnit.description" href="libs/libs-GstVaapiDecoderUnit.html#libs-GstVaapiDecoderUnit.description">
+<ANCHOR id="libs-GstVaapiDecoderUnit.functions_details" href="libs/libs-GstVaapiDecoderUnit.html#libs-GstVaapiDecoderUnit.functions_details">
+<ANCHOR id="gst-vaapi-decoder-unit-init" href="libs/libs-GstVaapiDecoderUnit.html#gst-vaapi-decoder-unit-init">
+<ANCHOR id="gst-vaapi-decoder-unit-clear" href="libs/libs-GstVaapiDecoderUnit.html#gst-vaapi-decoder-unit-clear">
+<ANCHOR id="gst-vaapi-decoder-unit-new" href="libs/libs-GstVaapiDecoderUnit.html#gst-vaapi-decoder-unit-new">
+<ANCHOR id="gst-vaapi-decoder-unit-set-parsed-info" href="libs/libs-GstVaapiDecoderUnit.html#gst-vaapi-decoder-unit-set-parsed-info">
+<ANCHOR id="libs-GstVaapiDecoderUnit.other_details" href="libs/libs-GstVaapiDecoderUnit.html#libs-GstVaapiDecoderUnit.other_details">
+<ANCHOR id="GstVaapiDecoderUnitFlags" href="libs/libs-GstVaapiDecoderUnit.html#GstVaapiDecoderUnitFlags">
+<ANCHOR id="GstVaapiDecoderUnit" href="libs/libs-GstVaapiDecoderUnit.html#GstVaapiDecoderUnit">
 <ANCHOR id="libs-GstVaapiSurfaceProxy" href="libs/libs-GstVaapiSurfaceProxy.html">
 <ANCHOR id="libs-GstVaapiSurfaceProxy.functions" href="libs/libs-GstVaapiSurfaceProxy.html#libs-GstVaapiSurfaceProxy.functions">
 <ANCHOR id="libs-GstVaapiSurfaceProxy.description" href="libs/libs-GstVaapiSurfaceProxy.html#libs-GstVaapiSurfaceProxy.description">
@@ -377,9 +492,50 @@
 <ANCHOR id="gst-vaapi-filter-set-denoising-level" href="libs/libs-GstVaapiFilter.html#gst-vaapi-filter-set-denoising-level">
 <ANCHOR id="gst-vaapi-filter-set-sharpening-level" href="libs/libs-GstVaapiFilter.html#gst-vaapi-filter-set-sharpening-level">
 <ANCHOR id="gst-vaapi-filter-set-hue" href="libs/libs-GstVaapiFilter.html#gst-vaapi-filter-set-hue">
-<ANCHOR id="gst-vaapi-filter-set-saturation" href="libs/libs-GstVaapiFilter.html#gst-vaapi-filter-set-saturation">
 <ANCHOR id="gst-vaapi-filter-set-brightness" href="libs/libs-GstVaapiFilter.html#gst-vaapi-filter-set-brightness">
+<ANCHOR id="gst-vaapi-filter-set-saturation" href="libs/libs-GstVaapiFilter.html#gst-vaapi-filter-set-saturation">
 <ANCHOR id="gst-vaapi-filter-set-deinterlacing" href="libs/libs-GstVaapiFilter.html#gst-vaapi-filter-set-deinterlacing">
 <ANCHOR id="gst-vaapi-filter-set-deinterlacing-references" href="libs/libs-GstVaapiFilter.html#gst-vaapi-filter-set-deinterlacing-references">
 <ANCHOR id="libs-GstVaapiFilter.other_details" href="libs/libs-GstVaapiFilter.html#libs-GstVaapiFilter.other_details">
 <ANCHOR id="GstVaapiFilter" href="libs/libs-GstVaapiFilter.html#GstVaapiFilter">
+<ANCHOR id="GstVaapiFilterOp" href="libs/libs-GstVaapiFilter.html#GstVaapiFilterOp">
+<ANCHOR id="libs-GstVaapiValue" href="libs/libs-GstVaapiValue.html">
+<ANCHOR id="libs-GstVaapiValue.functions" href="libs/libs-GstVaapiValue.html#libs-GstVaapiValue.functions">
+<ANCHOR id="libs-GstVaapiValue.other" href="libs/libs-GstVaapiValue.html#libs-GstVaapiValue.other">
+<ANCHOR id="libs-GstVaapiValue.description" href="libs/libs-GstVaapiValue.html#libs-GstVaapiValue.description">
+<ANCHOR id="libs-GstVaapiValue.functions_details" href="libs/libs-GstVaapiValue.html#libs-GstVaapiValue.functions_details">
+<ANCHOR id="GST-VAAPI-POPCOUNT32:CAPS" href="libs/libs-GstVaapiValue.html#GST-VAAPI-POPCOUNT32:CAPS">
+<ANCHOR id="libs-GstVaapiValue.other_details" href="libs/libs-GstVaapiValue.html#libs-GstVaapiValue.other_details">
+<ANCHOR id="GstVaapiEnumSubset" href="libs/libs-GstVaapiValue.html#GstVaapiEnumSubset">
+<ANCHOR id="GST-VAAPI-TYPE-POINT:CAPS" href="libs/libs-GstVaapiValue.html#GST-VAAPI-TYPE-POINT:CAPS">
+<ANCHOR id="GST-VAAPI-TYPE-RECTANGLE:CAPS" href="libs/libs-GstVaapiValue.html#GST-VAAPI-TYPE-RECTANGLE:CAPS">
+<ANCHOR id="GST-VAAPI-TYPE-RENDER-MODE:CAPS" href="libs/libs-GstVaapiValue.html#GST-VAAPI-TYPE-RENDER-MODE:CAPS">
+<ANCHOR id="GST-VAAPI-TYPE-ROTATION:CAPS" href="libs/libs-GstVaapiValue.html#GST-VAAPI-TYPE-ROTATION:CAPS">
+<ANCHOR id="GST-VAAPI-TYPE-RATE-CONTROL:CAPS" href="libs/libs-GstVaapiValue.html#GST-VAAPI-TYPE-RATE-CONTROL:CAPS">
+<ANCHOR id="libs-GstVaapiParserFrame" href="libs/libs-GstVaapiParserFrame.html">
+<ANCHOR id="libs-GstVaapiParserFrame.functions" href="libs/libs-GstVaapiParserFrame.html#libs-GstVaapiParserFrame.functions">
+<ANCHOR id="libs-GstVaapiParserFrame.description" href="libs/libs-GstVaapiParserFrame.html#libs-GstVaapiParserFrame.description">
+<ANCHOR id="libs-GstVaapiParserFrame.functions_details" href="libs/libs-GstVaapiParserFrame.html#libs-GstVaapiParserFrame.functions_details">
+<ANCHOR id="gst-vaapi-parser-frame-new" href="libs/libs-GstVaapiParserFrame.html#gst-vaapi-parser-frame-new">
+<ANCHOR id="gst-vaapi-parser-frame-free" href="libs/libs-GstVaapiParserFrame.html#gst-vaapi-parser-frame-free">
+<ANCHOR id="gst-vaapi-parser-frame-append-unit" href="libs/libs-GstVaapiParserFrame.html#gst-vaapi-parser-frame-append-unit">
+<ANCHOR id="gst-vaapi-parser-frame-ref" href="libs/libs-GstVaapiParserFrame.html#gst-vaapi-parser-frame-ref">
+<ANCHOR id="gst-vaapi-parser-frame-unref" href="libs/libs-GstVaapiParserFrame.html#gst-vaapi-parser-frame-unref">
+<ANCHOR id="gst-vaapi-parser-frame-replace" href="libs/libs-GstVaapiParserFrame.html#gst-vaapi-parser-frame-replace">
+<ANCHOR id="libs-GstVaapiParserFrame.other_details" href="libs/libs-GstVaapiParserFrame.html#libs-GstVaapiParserFrame.other_details">
+<ANCHOR id="libs-GstVaapiContext" href="libs/libs-GstVaapiContext.html">
+<ANCHOR id="libs-GstVaapiContext.functions" href="libs/libs-GstVaapiContext.html#libs-GstVaapiContext.functions">
+<ANCHOR id="libs-GstVaapiContext.other" href="libs/libs-GstVaapiContext.html#libs-GstVaapiContext.other">
+<ANCHOR id="libs-GstVaapiContext.description" href="libs/libs-GstVaapiContext.html#libs-GstVaapiContext.description">
+<ANCHOR id="libs-GstVaapiContext.functions_details" href="libs/libs-GstVaapiContext.html#libs-GstVaapiContext.functions_details">
+<ANCHOR id="gst-vaapi-context-new" href="libs/libs-GstVaapiContext.html#gst-vaapi-context-new">
+<ANCHOR id="gst-vaapi-context-reset" href="libs/libs-GstVaapiContext.html#gst-vaapi-context-reset">
+<ANCHOR id="gst-vaapi-context-get-id" href="libs/libs-GstVaapiContext.html#gst-vaapi-context-get-id">
+<ANCHOR id="gst-vaapi-context-get-surface-proxy" href="libs/libs-GstVaapiContext.html#gst-vaapi-context-get-surface-proxy">
+<ANCHOR id="gst-vaapi-context-get-surface-count" href="libs/libs-GstVaapiContext.html#gst-vaapi-context-get-surface-count">
+<ANCHOR id="libs-GstVaapiContext.other_details" href="libs/libs-GstVaapiContext.html#libs-GstVaapiContext.other_details">
+<ANCHOR id="GstVaapiConfigInfoEncoder" href="libs/libs-GstVaapiContext.html#GstVaapiConfigInfoEncoder">
+<ANCHOR id="GstVaapiContextInfo" href="libs/libs-GstVaapiContext.html#GstVaapiContextInfo">
+<ANCHOR id="GstVaapiContext" href="libs/libs-GstVaapiContext.html#GstVaapiContext">
+<ANCHOR id="GstVaapiContextUsage" href="libs/libs-GstVaapiContext.html#GstVaapiContextUsage">
+<ANCHOR id="annotation-glossterm-closure" href="libs/annotation-glossary.html#annotation-glossterm-closure">
diff -Nru gstreamer-vaapi-0.5.10/docs/reference/libs/html/libs-Basic-data-structures.html gstreamer-vaapi-0.6.0/docs/reference/libs/html/libs-Basic-data-structures.html
--- gstreamer-vaapi-0.5.10/docs/reference/libs/html/libs-Basic-data-structures.html	2015-02-03 08:45:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/docs/reference/libs/html/libs-Basic-data-structures.html	2015-07-15 12:52:27.000000000 +0000
@@ -87,7 +87,7 @@
 <p>Can be used together with <a class="link" href="libs-Basic-data-structures.html#GST-VAAPI-ID-FORMAT:CAPS" title="GST_VAAPI_ID_FORMAT"><span class="type">GST_VAAPI_ID_FORMAT</span></a> to properly output
 an integer value in a <code class="function">printf()</code>-style text message.</p>
 <div class="refsect3">
-<a name="id-1.2.3.6.2.5"></a><h4>Parameters</h4>
+<a name="id-1.3.3.6.2.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -133,7 +133,7 @@
 </pre>
 <p>A location within a surface.</p>
 <div class="refsect3">
-<a name="id-1.2.3.7.4.5"></a><h4>Members</h4>
+<a name="id-1.3.3.7.4.5"></a><h4>Members</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="300px" class="struct_members_name">
@@ -167,7 +167,7 @@
 </pre>
 <p>A rectangle region within a surface.</p>
 <div class="refsect3">
-<a name="id-1.2.3.7.5.5"></a><h4>Members</h4>
+<a name="id-1.3.3.7.5.5"></a><h4>Members</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="300px" class="struct_members_name">
diff -Nru gstreamer-vaapi-0.5.10/docs/reference/libs/html/libs.devhelp2 gstreamer-vaapi-0.6.0/docs/reference/libs/html/libs.devhelp2
--- gstreamer-vaapi-0.5.10/docs/reference/libs/html/libs.devhelp2	2015-02-03 08:45:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/docs/reference/libs/html/libs.devhelp2	2015-07-15 12:52:26.000000000 +0000
@@ -8,9 +8,15 @@
       <sub name="GstVaapiDisplay" link="libs-GstVaapiDisplay.html"/>
       <sub name="GstVaapiDisplayX11" link="libs-GstVaapiDisplayX11.html"/>
       <sub name="GstVaapiDisplayGLX" link="libs-GstVaapiDisplayGLX.html"/>
+      <sub name="GstVaapiDisplayEGL" link="libs-GstVaapiDisplayEGL.html"/>
+      <sub name="GstVaapiDisplayDRM" link="libs-GstVaapiDisplayDRM.html"/>
+      <sub name="GstVaapiDisplayWayland" link="libs-GstVaapiDisplayWayland.html"/>
       <sub name="GstVaapiWindow" link="libs-GstVaapiWindow.html"/>
       <sub name="GstVaapiWindowX11" link="libs-GstVaapiWindowX11.html"/>
       <sub name="GstVaapiWindowGLX" link="libs-GstVaapiWindowGLX.html"/>
+      <sub name="GstVaapiWindowEGL" link="libs-GstVaapiWindowEGL.html"/>
+      <sub name="GstVaapiWindowDRM" link="libs-GstVaapiWindowDRM.html"/>
+      <sub name="GstVaapiWindowWayland" link="libs-GstVaapiWindowWayland.html"/>
       <sub name="GstVaapiPixmap" link="libs-GstVaapiPixmap.html"/>
       <sub name="GstVaapiPixmapX11" link="libs-GstVaapiPixmapX11.html"/>
       <sub name="GstVaapiObject" link="libs-GstVaapiObject.html"/>
@@ -18,6 +24,8 @@
       <sub name="GstVaapiImage" link="libs-gstvaapiimage.html"/>
       <sub name="GstVaapiSubpicture" link="libs-GstVaapiSubpicture.html"/>
       <sub name="GstVaapiTexture" link="libs-GstVaapiTexture.html"/>
+      <sub name="GstVaapiTextureEGL" link="libs-GstVaapiTextureEGL.html"/>
+      <sub name="GstVaapiTextureGLX" link="libs-GstVaapiTextureGLX.html"/>
       <sub name="GstVaapiProfile" link="libs-GstVaapiProfile.html"/>
       <sub name="GstVaapiVideoPool" link="libs-GstVaapiVideoPool.html"/>
       <sub name="GstVaapiSurfacePool" link="libs-GstVaapiSurfacePool.html"/>
@@ -28,14 +36,22 @@
       <sub name="GstVaapiDecoderMpeg4" link="libs-GstVaapiDecoderMpeg4.html"/>
       <sub name="GstVaapiDecoderH264" link="libs-GstVaapiDecoderH264.html"/>
       <sub name="GstVaapiDecoderVC1" link="libs-GstVaapiDecoderVC1.html"/>
+      <sub name="GstVaapiDecoderVp8" link="libs-GstVaapiDecoderVp8.html"/>
+      <sub name="GstVaapiDecoderH265" link="libs-GstVaapiDecoderH265.html"/>
+      <sub name="GstVaapiDecoderUnit" link="libs-GstVaapiDecoderUnit.html"/>
       <sub name="GstVaapiSurfaceProxy" link="libs-GstVaapiSurfaceProxy.html"/>
       <sub name="GstVaapiFilter" link="libs-GstVaapiFilter.html"/>
+      <sub name="GstVaapiValue" link="libs-GstVaapiValue.html"/>
+      <sub name="GstVaapiParserFrame" link="libs-GstVaapiParserFrame.html"/>
+      <sub name="GstVaapiContext" link="libs-GstVaapiContext.html"/>
     </sub>
     <sub name="Object Hierarchy" link="object-tree.html"/>
     <sub name="API Index" link="api-index-full.html"/>
+    <sub name="Annotation Glossary" link="annotation-glossary.html"/>
   </chapters>
   <functions>
     <keyword type="function" name="gst_vaapi_video_format_to_string ()" link="libs-GstVideoFormat.html#gst-vaapi-video-format-to-string"/>
+    <keyword type="function" name="gst_vaapi_video_format_from_va_fourcc ()" link="libs-GstVideoFormat.html#gst-vaapi-video-format-from-va-fourcc"/>
     <keyword type="function" name="gst_vaapi_video_format_from_va_format ()" link="libs-GstVideoFormat.html#gst-vaapi-video-format-from-va-format"/>
     <keyword type="function" name="gst_vaapi_video_format_get_chroma_type ()" link="libs-GstVideoFormat.html#gst-vaapi-video-format-get-chroma-type"/>
     <keyword type="function" name="gst_vaapi_video_format_get_score ()" link="libs-GstVideoFormat.html#gst-vaapi-video-format-get-score"/>
@@ -48,25 +64,42 @@
     <keyword type="struct" name="struct GstVaapiPoint" link="libs-Basic-data-structures.html#GstVaapiPoint"/>
     <keyword type="struct" name="struct GstVaapiRectangle" link="libs-Basic-data-structures.html#GstVaapiRectangle"/>
     <keyword type="function" name="gst_vaapi_display_new_with_display ()" link="libs-GstVaapiDisplay.html#gst-vaapi-display-new-with-display"/>
+    <keyword type="function" name="gst_vaapi_display_ref ()" link="libs-GstVaapiDisplay.html#gst-vaapi-display-ref"/>
+    <keyword type="function" name="gst_vaapi_display_unref ()" link="libs-GstVaapiDisplay.html#gst-vaapi-display-unref"/>
+    <keyword type="function" name="gst_vaapi_display_replace ()" link="libs-GstVaapiDisplay.html#gst-vaapi-display-replace"/>
     <keyword type="function" name="gst_vaapi_display_lock ()" link="libs-GstVaapiDisplay.html#gst-vaapi-display-lock"/>
     <keyword type="function" name="gst_vaapi_display_unlock ()" link="libs-GstVaapiDisplay.html#gst-vaapi-display-unlock"/>
     <keyword type="function" name="gst_vaapi_display_sync ()" link="libs-GstVaapiDisplay.html#gst-vaapi-display-sync"/>
     <keyword type="function" name="gst_vaapi_display_flush ()" link="libs-GstVaapiDisplay.html#gst-vaapi-display-flush"/>
+    <keyword type="function" name="gst_vaapi_display_get_class_type ()" link="libs-GstVaapiDisplay.html#gst-vaapi-display-get-class-type"/>
+    <keyword type="function" name="gst_vaapi_display_get_display_type ()" link="libs-GstVaapiDisplay.html#gst-vaapi-display-get-display-type"/>
+    <keyword type="function" name="gst_vaapi_display_get_display_name ()" link="libs-GstVaapiDisplay.html#gst-vaapi-display-get-display-name"/>
     <keyword type="function" name="gst_vaapi_display_get_display ()" link="libs-GstVaapiDisplay.html#gst-vaapi-display-get-display"/>
     <keyword type="function" name="gst_vaapi_display_get_width ()" link="libs-GstVaapiDisplay.html#gst-vaapi-display-get-width"/>
     <keyword type="function" name="gst_vaapi_display_get_height ()" link="libs-GstVaapiDisplay.html#gst-vaapi-display-get-height"/>
     <keyword type="function" name="gst_vaapi_display_get_size ()" link="libs-GstVaapiDisplay.html#gst-vaapi-display-get-size"/>
     <keyword type="function" name="gst_vaapi_display_get_pixel_aspect_ratio ()" link="libs-GstVaapiDisplay.html#gst-vaapi-display-get-pixel-aspect-ratio"/>
+    <keyword type="function" name="gst_vaapi_display_has_video_processing ()" link="libs-GstVaapiDisplay.html#gst-vaapi-display-has-video-processing"/>
+    <keyword type="function" name="gst_vaapi_display_get_decode_profiles ()" link="libs-GstVaapiDisplay.html#gst-vaapi-display-get-decode-profiles"/>
     <keyword type="function" name="gst_vaapi_display_has_decoder ()" link="libs-GstVaapiDisplay.html#gst-vaapi-display-has-decoder"/>
+    <keyword type="function" name="gst_vaapi_display_get_encode_profiles ()" link="libs-GstVaapiDisplay.html#gst-vaapi-display-get-encode-profiles"/>
     <keyword type="function" name="gst_vaapi_display_has_encoder ()" link="libs-GstVaapiDisplay.html#gst-vaapi-display-has-encoder"/>
+    <keyword type="function" name="gst_vaapi_display_get_image_formats ()" link="libs-GstVaapiDisplay.html#gst-vaapi-display-get-image-formats"/>
     <keyword type="function" name="gst_vaapi_display_has_image_format ()" link="libs-GstVaapiDisplay.html#gst-vaapi-display-has-image-format"/>
+    <keyword type="function" name="gst_vaapi_display_get_subpicture_formats ()" link="libs-GstVaapiDisplay.html#gst-vaapi-display-get-subpicture-formats"/>
     <keyword type="function" name="gst_vaapi_display_has_subpicture_format ()" link="libs-GstVaapiDisplay.html#gst-vaapi-display-has-subpicture-format"/>
     <keyword type="function" name="gst_vaapi_display_has_property ()" link="libs-GstVaapiDisplay.html#gst-vaapi-display-has-property"/>
-    <keyword type="function" name="gst_vaapi_display_get_rotation ()" link="libs-GstVaapiDisplay.html#gst-vaapi-display-get-rotation"/>
-    <keyword type="function" name="gst_vaapi_display_set_rotation ()" link="libs-GstVaapiDisplay.html#gst-vaapi-display-set-rotation"/>
+    <keyword type="function" name="gst_vaapi_display_get_property ()" link="libs-GstVaapiDisplay.html#gst-vaapi-display-get-property"/>
+    <keyword type="function" name="gst_vaapi_display_set_property ()" link="libs-GstVaapiDisplay.html#gst-vaapi-display-set-property"/>
     <keyword type="function" name="gst_vaapi_display_get_render_mode ()" link="libs-GstVaapiDisplay.html#gst-vaapi-display-get-render-mode"/>
     <keyword type="function" name="gst_vaapi_display_set_render_mode ()" link="libs-GstVaapiDisplay.html#gst-vaapi-display-set-render-mode"/>
+    <keyword type="function" name="gst_vaapi_display_get_rotation ()" link="libs-GstVaapiDisplay.html#gst-vaapi-display-get-rotation"/>
+    <keyword type="function" name="gst_vaapi_display_set_rotation ()" link="libs-GstVaapiDisplay.html#gst-vaapi-display-set-rotation"/>
+    <keyword type="function" name="gst_vaapi_display_get_vendor_string ()" link="libs-GstVaapiDisplay.html#gst-vaapi-display-get-vendor-string"/>
+    <keyword type="function" name="gst_vaapi_display_has_opengl ()" link="libs-GstVaapiDisplay.html#gst-vaapi-display-has-opengl"/>
+    <keyword type="enum" name="enum GstVaapiDisplayType" link="libs-GstVaapiDisplay.html#GstVaapiDisplayType"/>
     <keyword type="struct" name="GstVaapiDisplay" link="libs-GstVaapiDisplay.html#GstVaapiDisplay"/>
+    <keyword type="struct" name="struct GstVaapiDisplayInfo" link="libs-GstVaapiDisplay.html#GstVaapiDisplayInfo"/>
     <keyword type="function" name="gst_vaapi_display_x11_new ()" link="libs-GstVaapiDisplayX11.html#gst-vaapi-display-x11-new"/>
     <keyword type="function" name="gst_vaapi_display_x11_new_with_display ()" link="libs-GstVaapiDisplayX11.html#gst-vaapi-display-x11-new-with-display"/>
     <keyword type="function" name="gst_vaapi_display_x11_get_display ()" link="libs-GstVaapiDisplayX11.html#gst-vaapi-display-x11-get-display"/>
@@ -75,6 +108,19 @@
     <keyword type="function" name="gst_vaapi_display_glx_new ()" link="libs-GstVaapiDisplayGLX.html#gst-vaapi-display-glx-new"/>
     <keyword type="function" name="gst_vaapi_display_glx_new_with_display ()" link="libs-GstVaapiDisplayGLX.html#gst-vaapi-display-glx-new-with-display"/>
     <keyword type="struct" name="GstVaapiDisplayGLX" link="libs-GstVaapiDisplayGLX.html#GstVaapiDisplayGLX"/>
+    <keyword type="function" name="gst_vaapi_display_egl_new ()" link="libs-GstVaapiDisplayEGL.html#gst-vaapi-display-egl-new"/>
+    <keyword type="function" name="gst_vaapi_display_egl_new_with_native_display ()" link="libs-GstVaapiDisplayEGL.html#gst-vaapi-display-egl-new-with-native-display"/>
+    <keyword type="function" name="gst_vaapi_display_egl_get_gl_display ()" link="libs-GstVaapiDisplayEGL.html#gst-vaapi-display-egl-get-gl-display"/>
+    <keyword type="function" name="gst_vaapi_display_egl_set_gl_context ()" link="libs-GstVaapiDisplayEGL.html#gst-vaapi-display-egl-set-gl-context"/>
+    <keyword type="function" name="gst_vaapi_display_egl_get_gl_context ()" link="libs-GstVaapiDisplayEGL.html#gst-vaapi-display-egl-get-gl-context"/>
+    <keyword type="struct" name="GstVaapiDisplayEGL" link="libs-GstVaapiDisplayEGL.html#GstVaapiDisplayEGL"/>
+    <keyword type="function" name="gst_vaapi_display_drm_new ()" link="libs-GstVaapiDisplayDRM.html#gst-vaapi-display-drm-new"/>
+    <keyword type="function" name="gst_vaapi_display_drm_new_with_device ()" link="libs-GstVaapiDisplayDRM.html#gst-vaapi-display-drm-new-with-device"/>
+    <keyword type="function" name="gst_vaapi_display_drm_get_device ()" link="libs-GstVaapiDisplayDRM.html#gst-vaapi-display-drm-get-device"/>
+    <keyword type="function" name="gst_vaapi_display_drm_get_device_path ()" link="libs-GstVaapiDisplayDRM.html#gst-vaapi-display-drm-get-device-path"/>
+    <keyword type="function" name="gst_vaapi_display_wayland_new ()" link="libs-GstVaapiDisplayWayland.html#gst-vaapi-display-wayland-new"/>
+    <keyword type="function" name="gst_vaapi_display_wayland_new_with_display ()" link="libs-GstVaapiDisplayWayland.html#gst-vaapi-display-wayland-new-with-display"/>
+    <keyword type="function" name="gst_vaapi_display_wayland_get_display ()" link="libs-GstVaapiDisplayWayland.html#gst-vaapi-display-wayland-get-display"/>
     <keyword type="function" name="gst_vaapi_window_get_display ()" link="libs-GstVaapiWindow.html#gst-vaapi-window-get-display"/>
     <keyword type="function" name="gst_vaapi_window_show ()" link="libs-GstVaapiWindow.html#gst-vaapi-window-show"/>
     <keyword type="function" name="gst_vaapi_window_hide ()" link="libs-GstVaapiWindow.html#gst-vaapi-window-hide"/>
@@ -103,6 +149,9 @@
     <keyword type="function" name="gst_vaapi_window_glx_swap_buffers ()" link="libs-GstVaapiWindowGLX.html#gst-vaapi-window-glx-swap-buffers"/>
     <keyword type="function" name="gst_vaapi_window_glx_put_texture ()" link="libs-GstVaapiWindowGLX.html#gst-vaapi-window-glx-put-texture"/>
     <keyword type="struct" name="GstVaapiWindowGLX" link="libs-GstVaapiWindowGLX.html#GstVaapiWindowGLX"/>
+    <keyword type="function" name="gst_vaapi_window_egl_new ()" link="libs-GstVaapiWindowEGL.html#gst-vaapi-window-egl-new"/>
+    <keyword type="function" name="gst_vaapi_window_drm_new ()" link="libs-GstVaapiWindowDRM.html#gst-vaapi-window-drm-new"/>
+    <keyword type="function" name="gst_vaapi_window_wayland_new ()" link="libs-GstVaapiWindowWayland.html#gst-vaapi-window-wayland-new"/>
     <keyword type="function" name="gst_vaapi_pixmap_ref ()" link="libs-GstVaapiPixmap.html#gst-vaapi-pixmap-ref"/>
     <keyword type="function" name="gst_vaapi_pixmap_unref ()" link="libs-GstVaapiPixmap.html#gst-vaapi-pixmap-unref"/>
     <keyword type="function" name="gst_vaapi_pixmap_replace ()" link="libs-GstVaapiPixmap.html#gst-vaapi-pixmap-replace"/>
@@ -175,14 +224,24 @@
     <keyword type="function" name="gst_vaapi_subpicture_set_image ()" link="libs-GstVaapiSubpicture.html#gst-vaapi-subpicture-set-image"/>
     <keyword type="struct" name="GstVaapiSubpicture" link="libs-GstVaapiSubpicture.html#GstVaapiSubpicture"/>
     <keyword type="function" name="gst_vaapi_texture_new ()" link="libs-GstVaapiTexture.html#gst-vaapi-texture-new"/>
+    <keyword type="function" name="gst_vaapi_texture_new_wrapped ()" link="libs-GstVaapiTexture.html#gst-vaapi-texture-new-wrapped"/>
+    <keyword type="function" name="gst_vaapi_texture_ref ()" link="libs-GstVaapiTexture.html#gst-vaapi-texture-ref"/>
+    <keyword type="function" name="gst_vaapi_texture_unref ()" link="libs-GstVaapiTexture.html#gst-vaapi-texture-unref"/>
+    <keyword type="function" name="gst_vaapi_texture_replace ()" link="libs-GstVaapiTexture.html#gst-vaapi-texture-replace"/>
     <keyword type="function" name="gst_vaapi_texture_get_id ()" link="libs-GstVaapiTexture.html#gst-vaapi-texture-get-id"/>
     <keyword type="function" name="gst_vaapi_texture_get_target ()" link="libs-GstVaapiTexture.html#gst-vaapi-texture-get-target"/>
     <keyword type="function" name="gst_vaapi_texture_get_format ()" link="libs-GstVaapiTexture.html#gst-vaapi-texture-get-format"/>
     <keyword type="function" name="gst_vaapi_texture_get_width ()" link="libs-GstVaapiTexture.html#gst-vaapi-texture-get-width"/>
     <keyword type="function" name="gst_vaapi_texture_get_height ()" link="libs-GstVaapiTexture.html#gst-vaapi-texture-get-height"/>
     <keyword type="function" name="gst_vaapi_texture_get_size ()" link="libs-GstVaapiTexture.html#gst-vaapi-texture-get-size"/>
+    <keyword type="function" name="gst_vaapi_texture_get_orientation_flags ()" link="libs-GstVaapiTexture.html#gst-vaapi-texture-get-orientation-flags"/>
+    <keyword type="function" name="gst_vaapi_texture_set_orientation_flags ()" link="libs-GstVaapiTexture.html#gst-vaapi-texture-set-orientation-flags"/>
     <keyword type="function" name="gst_vaapi_texture_put_surface ()" link="libs-GstVaapiTexture.html#gst-vaapi-texture-put-surface"/>
     <keyword type="struct" name="GstVaapiTexture" link="libs-GstVaapiTexture.html#GstVaapiTexture"/>
+    <keyword type="function" name="gst_vaapi_texture_egl_new ()" link="libs-GstVaapiTextureEGL.html#gst-vaapi-texture-egl-new"/>
+    <keyword type="function" name="gst_vaapi_texture_egl_new_wrapped ()" link="libs-GstVaapiTextureEGL.html#gst-vaapi-texture-egl-new-wrapped"/>
+    <keyword type="function" name="gst_vaapi_texture_glx_new ()" link="libs-GstVaapiTextureGLX.html#gst-vaapi-texture-glx-new"/>
+    <keyword type="function" name="gst_vaapi_texture_glx_new_wrapped ()" link="libs-GstVaapiTextureGLX.html#gst-vaapi-texture-glx-new-wrapped"/>
     <keyword type="function" name="gst_vaapi_profile ()" link="libs-GstVaapiProfile.html#gst-vaapi-profile"/>
     <keyword type="function" name="gst_vaapi_profile_from_caps ()" link="libs-GstVaapiProfile.html#gst-vaapi-profile-from-caps"/>
     <keyword type="function" name="gst_vaapi_profile_get_va_profile ()" link="libs-GstVaapiProfile.html#gst-vaapi-profile-get-va-profile"/>
@@ -229,6 +288,18 @@
     <keyword type="struct" name="GstVaapiDecoderH264" link="libs-GstVaapiDecoderH264.html#GstVaapiDecoderH264"/>
     <keyword type="function" name="gst_vaapi_decoder_vc1_new ()" link="libs-GstVaapiDecoderVC1.html#gst-vaapi-decoder-vc1-new"/>
     <keyword type="struct" name="GstVaapiDecoderVC1" link="libs-GstVaapiDecoderVC1.html#GstVaapiDecoderVC1"/>
+    <keyword type="function" name="gst_vaapi_decoder_vp8_new ()" link="libs-GstVaapiDecoderVp8.html#gst-vaapi-decoder-vp8-new"/>
+    <keyword type="struct" name="GstVaapiDecoderVp8" link="libs-GstVaapiDecoderVp8.html#GstVaapiDecoderVp8"/>
+    <keyword type="function" name="gst_vaapi_decoder_h265_new ()" link="libs-GstVaapiDecoderH265.html#gst-vaapi-decoder-h265-new"/>
+    <keyword type="function" name="gst_vaapi_decoder_h265_set_alignment ()" link="libs-GstVaapiDecoderH265.html#gst-vaapi-decoder-h265-set-alignment"/>
+    <keyword type="struct" name="GstVaapiDecoderH265" link="libs-GstVaapiDecoderH265.html#GstVaapiDecoderH265"/>
+    <keyword type="enum" name="enum GstVaapiStreamAlignH265" link="libs-GstVaapiDecoderH265.html#GstVaapiStreamAlignH265"/>
+    <keyword type="function" name="gst_vaapi_decoder_unit_init ()" link="libs-GstVaapiDecoderUnit.html#gst-vaapi-decoder-unit-init"/>
+    <keyword type="function" name="gst_vaapi_decoder_unit_clear ()" link="libs-GstVaapiDecoderUnit.html#gst-vaapi-decoder-unit-clear"/>
+    <keyword type="function" name="gst_vaapi_decoder_unit_new ()" link="libs-GstVaapiDecoderUnit.html#gst-vaapi-decoder-unit-new"/>
+    <keyword type="function" name="gst_vaapi_decoder_unit_set_parsed_info ()" link="libs-GstVaapiDecoderUnit.html#gst-vaapi-decoder-unit-set-parsed-info"/>
+    <keyword type="enum" name="enum GstVaapiDecoderUnitFlags" link="libs-GstVaapiDecoderUnit.html#GstVaapiDecoderUnitFlags"/>
+    <keyword type="struct" name="struct GstVaapiDecoderUnit" link="libs-GstVaapiDecoderUnit.html#GstVaapiDecoderUnit"/>
     <keyword type="function" name="gst_vaapi_surface_proxy_get_duration ()" link="libs-GstVaapiSurfaceProxy.html#gst-vaapi-surface-proxy-get-duration"/>
     <keyword type="function" name="gst_vaapi_surface_proxy_get_flags ()" link="libs-GstVaapiSurfaceProxy.html#gst-vaapi-surface-proxy-get-flags"/>
     <keyword type="function" name="gst_vaapi_surface_proxy_get_surface ()" link="libs-GstVaapiSurfaceProxy.html#gst-vaapi-surface-proxy-get-surface"/>
@@ -255,10 +326,33 @@
     <keyword type="function" name="gst_vaapi_filter_set_denoising_level ()" link="libs-GstVaapiFilter.html#gst-vaapi-filter-set-denoising-level"/>
     <keyword type="function" name="gst_vaapi_filter_set_sharpening_level ()" link="libs-GstVaapiFilter.html#gst-vaapi-filter-set-sharpening-level"/>
     <keyword type="function" name="gst_vaapi_filter_set_hue ()" link="libs-GstVaapiFilter.html#gst-vaapi-filter-set-hue"/>
-    <keyword type="function" name="gst_vaapi_filter_set_saturation ()" link="libs-GstVaapiFilter.html#gst-vaapi-filter-set-saturation"/>
     <keyword type="function" name="gst_vaapi_filter_set_brightness ()" link="libs-GstVaapiFilter.html#gst-vaapi-filter-set-brightness"/>
+    <keyword type="function" name="gst_vaapi_filter_set_saturation ()" link="libs-GstVaapiFilter.html#gst-vaapi-filter-set-saturation"/>
     <keyword type="function" name="gst_vaapi_filter_set_deinterlacing ()" link="libs-GstVaapiFilter.html#gst-vaapi-filter-set-deinterlacing"/>
     <keyword type="function" name="gst_vaapi_filter_set_deinterlacing_references ()" link="libs-GstVaapiFilter.html#gst-vaapi-filter-set-deinterlacing-references"/>
     <keyword type="struct" name="GstVaapiFilter" link="libs-GstVaapiFilter.html#GstVaapiFilter"/>
+    <keyword type="enum" name="enum GstVaapiFilterOp" link="libs-GstVaapiFilter.html#GstVaapiFilterOp"/>
+    <keyword type="macro" name="GST_VAAPI_POPCOUNT32()" link="libs-GstVaapiValue.html#GST-VAAPI-POPCOUNT32:CAPS"/>
+    <keyword type="struct" name="GstVaapiEnumSubset" link="libs-GstVaapiValue.html#GstVaapiEnumSubset"/>
+    <keyword type="macro" name="GST_VAAPI_TYPE_POINT" link="libs-GstVaapiValue.html#GST-VAAPI-TYPE-POINT:CAPS"/>
+    <keyword type="macro" name="GST_VAAPI_TYPE_RECTANGLE" link="libs-GstVaapiValue.html#GST-VAAPI-TYPE-RECTANGLE:CAPS"/>
+    <keyword type="macro" name="GST_VAAPI_TYPE_RENDER_MODE" link="libs-GstVaapiValue.html#GST-VAAPI-TYPE-RENDER-MODE:CAPS"/>
+    <keyword type="macro" name="GST_VAAPI_TYPE_ROTATION" link="libs-GstVaapiValue.html#GST-VAAPI-TYPE-ROTATION:CAPS"/>
+    <keyword type="macro" name="GST_VAAPI_TYPE_RATE_CONTROL" link="libs-GstVaapiValue.html#GST-VAAPI-TYPE-RATE-CONTROL:CAPS"/>
+    <keyword type="function" name="gst_vaapi_parser_frame_new ()" link="libs-GstVaapiParserFrame.html#gst-vaapi-parser-frame-new"/>
+    <keyword type="function" name="gst_vaapi_parser_frame_free ()" link="libs-GstVaapiParserFrame.html#gst-vaapi-parser-frame-free"/>
+    <keyword type="function" name="gst_vaapi_parser_frame_append_unit ()" link="libs-GstVaapiParserFrame.html#gst-vaapi-parser-frame-append-unit"/>
+    <keyword type="macro" name="gst_vaapi_parser_frame_ref()" link="libs-GstVaapiParserFrame.html#gst-vaapi-parser-frame-ref"/>
+    <keyword type="macro" name="gst_vaapi_parser_frame_unref()" link="libs-GstVaapiParserFrame.html#gst-vaapi-parser-frame-unref"/>
+    <keyword type="macro" name="gst_vaapi_parser_frame_replace()" link="libs-GstVaapiParserFrame.html#gst-vaapi-parser-frame-replace"/>
+    <keyword type="function" name="gst_vaapi_context_new ()" link="libs-GstVaapiContext.html#gst-vaapi-context-new"/>
+    <keyword type="function" name="gst_vaapi_context_reset ()" link="libs-GstVaapiContext.html#gst-vaapi-context-reset"/>
+    <keyword type="function" name="gst_vaapi_context_get_id ()" link="libs-GstVaapiContext.html#gst-vaapi-context-get-id"/>
+    <keyword type="function" name="gst_vaapi_context_get_surface_proxy ()" link="libs-GstVaapiContext.html#gst-vaapi-context-get-surface-proxy"/>
+    <keyword type="function" name="gst_vaapi_context_get_surface_count ()" link="libs-GstVaapiContext.html#gst-vaapi-context-get-surface-count"/>
+    <keyword type="struct" name="struct GstVaapiConfigInfoEncoder" link="libs-GstVaapiContext.html#GstVaapiConfigInfoEncoder"/>
+    <keyword type="struct" name="struct GstVaapiContextInfo" link="libs-GstVaapiContext.html#GstVaapiContextInfo"/>
+    <keyword type="struct" name="struct GstVaapiContext" link="libs-GstVaapiContext.html#GstVaapiContext"/>
+    <keyword type="enum" name="enum GstVaapiContextUsage" link="libs-GstVaapiContext.html#GstVaapiContextUsage"/>
   </functions>
 </book>
diff -Nru gstreamer-vaapi-0.5.10/docs/reference/libs/html/libs-GstVaapiContext.html gstreamer-vaapi-0.6.0/docs/reference/libs/html/libs-GstVaapiContext.html
--- gstreamer-vaapi-0.5.10/docs/reference/libs/html/libs-GstVaapiContext.html	1970-01-01 00:00:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/docs/reference/libs/html/libs-GstVaapiContext.html	2015-07-15 12:52:27.000000000 +0000
@@ -0,0 +1,381 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>GStreamer VA-API Plugins 1.4 Library Reference Manual: GstVaapiContext</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="GStreamer VA-API Plugins 1.4 Library Reference Manual">
+<link rel="up" href="ch01.html" title="gst-plugins-vaapi Library">
+<link rel="prev" href="libs-GstVaapiParserFrame.html" title="GstVaapiParserFrame">
+<link rel="next" href="object-tree.html" title="Object Hierarchy">
+<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts">
+<a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
+                  <a href="#libs-GstVaapiContext.description" class="shortcut">Description</a></span>
+</td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><a accesskey="u" href="ch01.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="libs-GstVaapiParserFrame.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="object-tree.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+</tr></table>
+<div class="refentry">
+<a name="libs-GstVaapiContext"></a><div class="titlepage"></div>
+<div class="refnamediv"><table width="100%"><tr>
+<td valign="top">
+<h2><span class="refentrytitle"><a name="libs-GstVaapiContext.top_of_page"></a>GstVaapiContext</span></h2>
+<p>GstVaapiContext — VA context abstraction</p>
+</td>
+<td class="gallery_image" valign="top" align="right"></td>
+</tr></table></div>
+<div class="refsect1">
+<a name="libs-GstVaapiContext.functions"></a><h2>Functions</h2>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="functions_return">
+<col class="functions_name">
+</colgroup>
+<tbody>
+<tr>
+<td class="function_type">
+<a class="link" href="libs-GstVaapiContext.html#GstVaapiContext" title="struct GstVaapiContext"><span class="returnvalue">GstVaapiContext</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libs-GstVaapiContext.html#gst-vaapi-context-new" title="gst_vaapi_context_new ()">gst_vaapi_context_new</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="libs-GstVaapiContext.html#gst-vaapi-context-reset" title="gst_vaapi_context_reset ()">gst_vaapi_context_reset</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a class="link" href="libs-Basic-data-structures.html#GstVaapiID" title="GstVaapiID"><span class="returnvalue">GstVaapiID</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="libs-GstVaapiContext.html#gst-vaapi-context-get-id" title="gst_vaapi_context_get_id ()">gst_vaapi_context_get_id</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">GstVaapiSurfaceProxy</span> *
+</td>
+<td class="function_name">
+<a class="link" href="libs-GstVaapiContext.html#gst-vaapi-context-get-surface-proxy" title="gst_vaapi_context_get_surface_proxy ()">gst_vaapi_context_get_surface_proxy</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="libs-GstVaapiContext.html#gst-vaapi-context-get-surface-count" title="gst_vaapi_context_get_surface_count ()">gst_vaapi_context_get_surface_count</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="libs-GstVaapiContext.other"></a><h2>Types and Values</h2>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="name">
+<col class="description">
+</colgroup>
+<tbody>
+<tr>
+<td class="datatype_keyword">struct</td>
+<td class="function_name"><a class="link" href="libs-GstVaapiContext.html#GstVaapiConfigInfoEncoder" title="struct GstVaapiConfigInfoEncoder">GstVaapiConfigInfoEncoder</a></td>
+</tr>
+<tr>
+<td class="datatype_keyword">struct</td>
+<td class="function_name"><a class="link" href="libs-GstVaapiContext.html#GstVaapiContextInfo" title="struct GstVaapiContextInfo">GstVaapiContextInfo</a></td>
+</tr>
+<tr>
+<td class="datatype_keyword">struct</td>
+<td class="function_name"><a class="link" href="libs-GstVaapiContext.html#GstVaapiContext" title="struct GstVaapiContext">GstVaapiContext</a></td>
+</tr>
+<tr>
+<td class="datatype_keyword">enum</td>
+<td class="function_name"><a class="link" href="libs-GstVaapiContext.html#GstVaapiContextUsage" title="enum GstVaapiContextUsage">GstVaapiContextUsage</a></td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="libs-GstVaapiContext.description"></a><h2>Description</h2>
+</div>
+<div class="refsect1">
+<a name="libs-GstVaapiContext.functions_details"></a><h2>Functions</h2>
+<div class="refsect2">
+<a name="gst-vaapi-context-new"></a><h3>gst_vaapi_context_new ()</h3>
+<pre class="programlisting"><a class="link" href="libs-GstVaapiContext.html#GstVaapiContext" title="struct GstVaapiContext"><span class="returnvalue">GstVaapiContext</span></a> *
+gst_vaapi_context_new (<em class="parameter"><code><a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a> *display</code></em>,
+                       <em class="parameter"><code>const <a class="link" href="libs-GstVaapiContext.html#GstVaapiContextInfo" title="struct GstVaapiContextInfo"><span class="type">GstVaapiContextInfo</span></a> *cip</code></em>);</pre>
+<p>Creates a new <a class="link" href="libs-GstVaapiContext.html#GstVaapiContext" title="struct GstVaapiContext"><span class="type">GstVaapiContext</span></a> with the configuration specified by
+<em class="parameter"><code>cip</code></em>
+, thus including profile, entry-point, encoded size and maximum
+number of reference frames reported by the bitstream.</p>
+<div class="refsect3">
+<a name="id-1.3.42.6.2.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>display</p></td>
+<td class="parameter_description"><p>a <a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>cip</p></td>
+<td class="parameter_description"><p>a pointer to the <a class="link" href="libs-GstVaapiContext.html#GstVaapiContextInfo" title="struct GstVaapiContextInfo"><span class="type">GstVaapiContextInfo</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="id-1.3.42.6.2.6"></a><h4>Returns</h4>
+<p> the newly allocated <a class="link" href="libs-GstVaapiContext.html#GstVaapiContext" title="struct GstVaapiContext"><span class="type">GstVaapiContext</span></a> object</p>
+<p></p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="gst-vaapi-context-reset"></a><h3>gst_vaapi_context_reset ()</h3>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+gst_vaapi_context_reset (<em class="parameter"><code><a class="link" href="libs-GstVaapiContext.html#GstVaapiContext" title="struct GstVaapiContext"><span class="type">GstVaapiContext</span></a> *context</code></em>,
+                         <em class="parameter"><code>const <a class="link" href="libs-GstVaapiContext.html#GstVaapiContextInfo" title="struct GstVaapiContextInfo"><span class="type">GstVaapiContextInfo</span></a> *new_cip</code></em>);</pre>
+<p>Resets <em class="parameter"><code>context</code></em>
+ to the configuration specified by <em class="parameter"><code>new_cip</code></em>
+, thus
+including profile, entry-point, encoded size and maximum number of
+reference frames reported by the bitstream.</p>
+<div class="refsect3">
+<a name="id-1.3.42.6.3.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>context</p></td>
+<td class="parameter_description"><p>a <a class="link" href="libs-GstVaapiContext.html#GstVaapiContext" title="struct GstVaapiContext"><span class="type">GstVaapiContext</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>new_cip</p></td>
+<td class="parameter_description"><p>a pointer to the new <a class="link" href="libs-GstVaapiContext.html#GstVaapiContextInfo" title="struct GstVaapiContextInfo"><span class="type">GstVaapiContextInfo</span></a> details</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="id-1.3.42.6.3.6"></a><h4>Returns</h4>
+<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> on success</p>
+<p></p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="gst-vaapi-context-get-id"></a><h3>gst_vaapi_context_get_id ()</h3>
+<pre class="programlisting"><a class="link" href="libs-Basic-data-structures.html#GstVaapiID" title="GstVaapiID"><span class="returnvalue">GstVaapiID</span></a>
+gst_vaapi_context_get_id (<em class="parameter"><code><a class="link" href="libs-GstVaapiContext.html#GstVaapiContext" title="struct GstVaapiContext"><span class="type">GstVaapiContext</span></a> *context</code></em>);</pre>
+<p>Returns the underlying VAContextID of the <em class="parameter"><code>context</code></em>
+.</p>
+<div class="refsect3">
+<a name="id-1.3.42.6.4.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>context</p></td>
+<td class="parameter_description"><p>a <a class="link" href="libs-GstVaapiContext.html#GstVaapiContext" title="struct GstVaapiContext"><span class="type">GstVaapiContext</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="id-1.3.42.6.4.6"></a><h4>Returns</h4>
+<p> the underlying VA context id</p>
+<p></p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="gst-vaapi-context-get-surface-proxy"></a><h3>gst_vaapi_context_get_surface_proxy ()</h3>
+<pre class="programlisting"><span class="returnvalue">GstVaapiSurfaceProxy</span> *
+gst_vaapi_context_get_surface_proxy (<em class="parameter"><code><a class="link" href="libs-GstVaapiContext.html#GstVaapiContext" title="struct GstVaapiContext"><span class="type">GstVaapiContext</span></a> *context</code></em>);</pre>
+<p>Acquires a free surface, wrapped into a <span class="type">GstVaapiSurfaceProxy</span>. The
+returned surface will be automatically released when the proxy is
+destroyed. So, it is enough to call <a class="link" href="libs-GstVaapiSurfaceProxy.html#gst-vaapi-surface-proxy-unref" title="gst_vaapi_surface_proxy_unref ()"><code class="function">gst_vaapi_surface_proxy_unref()</code></a>
+after usage.</p>
+<p>This function returns <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if there is no free surface available
+in the pool. The surfaces are pre-allocated during context creation
+though.</p>
+<div class="refsect3">
+<a name="id-1.3.42.6.5.6"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>context</p></td>
+<td class="parameter_description"><p>a <a class="link" href="libs-GstVaapiContext.html#GstVaapiContext" title="struct GstVaapiContext"><span class="type">GstVaapiContext</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="id-1.3.42.6.5.7"></a><h4>Returns</h4>
+<p> a free surface, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if none is available</p>
+<p></p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="gst-vaapi-context-get-surface-count"></a><h3>gst_vaapi_context_get_surface_count ()</h3>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a>
+gst_vaapi_context_get_surface_count (<em class="parameter"><code><a class="link" href="libs-GstVaapiContext.html#GstVaapiContext" title="struct GstVaapiContext"><span class="type">GstVaapiContext</span></a> *context</code></em>);</pre>
+<p>Retrieves the number of free surfaces left in the pool.</p>
+<div class="refsect3">
+<a name="id-1.3.42.6.6.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>context</p></td>
+<td class="parameter_description"><p>a <a class="link" href="libs-GstVaapiContext.html#GstVaapiContext" title="struct GstVaapiContext"><span class="type">GstVaapiContext</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="id-1.3.42.6.6.6"></a><h4>Returns</h4>
+<p> the number of free surfaces available in the pool</p>
+<p></p>
+</div>
+</div>
+</div>
+<div class="refsect1">
+<a name="libs-GstVaapiContext.other_details"></a><h2>Types and Values</h2>
+<div class="refsect2">
+<a name="GstVaapiConfigInfoEncoder"></a><h3>struct GstVaapiConfigInfoEncoder</h3>
+<pre class="programlisting">struct GstVaapiConfigInfoEncoder {
+  GstVaapiRateControl rc_mode;
+  guint packed_headers;
+};
+</pre>
+<p>Extra configuration for encoding.</p>
+<div class="refsect3">
+<a name="id-1.3.42.7.2.5"></a><h4>Members</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="300px" class="struct_members_name">
+<col class="struct_members_description">
+<col width="200px" class="struct_members_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="struct_member_name"><p><span class="type">GstVaapiRateControl</span> <em class="structfield"><code><a name="GstVaapiConfigInfoEncoder.rc-mode"></a>rc_mode</code></em>;</p></td>
+<td class="struct_member_description"><p>rate-control mode (<span class="type">GstVaapiRateControl</span>).</p></td>
+<td class="struct_member_annotations"> </td>
+</tr>
+<tr>
+<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> <em class="structfield"><code><a name="GstVaapiConfigInfoEncoder.packed-headers"></a>packed_headers</code></em>;</p></td>
+<td class="struct_member_description"><p>notify encoder that packed headers are submitted (mask).</p></td>
+<td class="struct_member_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="GstVaapiContextInfo"></a><h3>struct GstVaapiContextInfo</h3>
+<pre class="programlisting">struct GstVaapiContextInfo {
+  GstVaapiContextUsage usage;
+  GstVaapiProfile profile;
+  GstVaapiEntrypoint entrypoint;
+  GstVaapiChromaType chroma_type;
+  guint width;
+  guint height;
+  guint ref_frames;
+  union _GstVaapiConfigInfo {
+    GstVaapiConfigInfoEncoder encoder;
+  } config;
+};
+</pre>
+<p>Structure holding VA context info like encoded size, decoder
+profile and entry-point to use, and maximum number of reference
+frames reported by the bitstream.</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="GstVaapiContext"></a><h3>struct GstVaapiContext</h3>
+<pre class="programlisting">struct GstVaapiContext {
+};
+</pre>
+<p>A VA context wrapper.</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="GstVaapiContextUsage"></a><h3>enum GstVaapiContextUsage</h3>
+<p>The set of supported VA context usages.</p>
+<div class="refsect3">
+<a name="id-1.3.42.7.5.4"></a><h4>Members</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="300px" class="enum_members_name">
+<col class="enum_members_description">
+<col width="200px" class="enum_members_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="enum_member_name"><p><a name="GST-VAAPI-CONTEXT-USAGE-DECODE:CAPS"></a>GST_VAAPI_CONTEXT_USAGE_DECODE</p></td>
+<td class="enum_member_description"> </td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="GST-VAAPI-CONTEXT-USAGE-ENCODE:CAPS"></a>GST_VAAPI_CONTEXT_USAGE_ENCODE</p></td>
+<td class="enum_member_description"> </td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="GST-VAAPI-CONTEXT-USAGE-VPP:CAPS"></a>GST_VAAPI_CONTEXT_USAGE_VPP</p></td>
+<td class="enum_member_description"> </td>
+<td class="enum_member_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+</div>
+</div>
+<div class="footer">
+<hr>
+          Generated by GTK-Doc V1.21</div>
+</body>
+</html>
\ No newline at end of file
diff -Nru gstreamer-vaapi-0.5.10/docs/reference/libs/html/libs-GstVaapiDecoderH264.html gstreamer-vaapi-0.6.0/docs/reference/libs/html/libs-GstVaapiDecoderH264.html
--- gstreamer-vaapi-0.5.10/docs/reference/libs/html/libs-GstVaapiDecoderH264.html	2015-02-03 08:45:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/docs/reference/libs/html/libs-GstVaapiDecoderH264.html	2015-07-15 12:52:27.000000000 +0000
@@ -75,7 +75,7 @@
  can
 hold extra information like codec-data and pictured coded size.</p>
 <div class="refsect3">
-<a name="id-1.2.25.6.2.5"></a><h4>Parameters</h4>
+<a name="id-1.3.33.6.2.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -97,7 +97,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.25.6.2.6"></a><h4>Returns</h4>
+<a name="id-1.3.33.6.2.6"></a><h4>Returns</h4>
 <p> the newly allocated <a class="link" href="libs-gstvaapidecoder.html#GstVaapiDecoder" title="GstVaapiDecoder"><span class="type">GstVaapiDecoder</span></a> object</p>
 <p></p>
 </div>
diff -Nru gstreamer-vaapi-0.5.10/docs/reference/libs/html/libs-GstVaapiDecoderH265.html gstreamer-vaapi-0.6.0/docs/reference/libs/html/libs-GstVaapiDecoderH265.html
--- gstreamer-vaapi-0.5.10/docs/reference/libs/html/libs-GstVaapiDecoderH265.html	1970-01-01 00:00:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/docs/reference/libs/html/libs-GstVaapiDecoderH265.html	2015-07-15 12:52:27.000000000 +0000
@@ -0,0 +1,207 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>GStreamer VA-API Plugins 1.4 Library Reference Manual: GstVaapiDecoderH265</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="GStreamer VA-API Plugins 1.4 Library Reference Manual">
+<link rel="up" href="ch01.html" title="gst-plugins-vaapi Library">
+<link rel="prev" href="libs-GstVaapiDecoderVp8.html" title="GstVaapiDecoderVp8">
+<link rel="next" href="libs-GstVaapiDecoderUnit.html" title="GstVaapiDecoderUnit">
+<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts">
+<a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
+                  <a href="#libs-GstVaapiDecoderH265.description" class="shortcut">Description</a></span>
+</td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><a accesskey="u" href="ch01.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="libs-GstVaapiDecoderVp8.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="libs-GstVaapiDecoderUnit.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+</tr></table>
+<div class="refentry">
+<a name="libs-GstVaapiDecoderH265"></a><div class="titlepage"></div>
+<div class="refnamediv"><table width="100%"><tr>
+<td valign="top">
+<h2><span class="refentrytitle"><a name="libs-GstVaapiDecoderH265.top_of_page"></a>GstVaapiDecoderH265</span></h2>
+<p>GstVaapiDecoderH265 — H.265 decoder</p>
+</td>
+<td class="gallery_image" valign="top" align="right"></td>
+</tr></table></div>
+<div class="refsect1">
+<a name="libs-GstVaapiDecoderH265.functions"></a><h2>Functions</h2>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="functions_return">
+<col class="functions_name">
+</colgroup>
+<tbody>
+<tr>
+<td class="function_type">
+<a class="link" href="libs-gstvaapidecoder.html#GstVaapiDecoder" title="GstVaapiDecoder"><span class="returnvalue">GstVaapiDecoder</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libs-GstVaapiDecoderH265.html#gst-vaapi-decoder-h265-new" title="gst_vaapi_decoder_h265_new ()">gst_vaapi_decoder_h265_new</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="libs-GstVaapiDecoderH265.html#gst-vaapi-decoder-h265-set-alignment" title="gst_vaapi_decoder_h265_set_alignment ()">gst_vaapi_decoder_h265_set_alignment</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="libs-GstVaapiDecoderH265.other"></a><h2>Types and Values</h2>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="name">
+<col class="description">
+</colgroup>
+<tbody>
+<tr>
+<td class="datatype_keyword"> </td>
+<td class="function_name"><a class="link" href="libs-GstVaapiDecoderH265.html#GstVaapiDecoderH265" title="GstVaapiDecoderH265">GstVaapiDecoderH265</a></td>
+</tr>
+<tr>
+<td class="datatype_keyword">enum</td>
+<td class="function_name"><a class="link" href="libs-GstVaapiDecoderH265.html#GstVaapiStreamAlignH265" title="enum GstVaapiStreamAlignH265">GstVaapiStreamAlignH265</a></td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="libs-GstVaapiDecoderH265.description"></a><h2>Description</h2>
+</div>
+<div class="refsect1">
+<a name="libs-GstVaapiDecoderH265.functions_details"></a><h2>Functions</h2>
+<div class="refsect2">
+<a name="gst-vaapi-decoder-h265-new"></a><h3>gst_vaapi_decoder_h265_new ()</h3>
+<pre class="programlisting"><a class="link" href="libs-gstvaapidecoder.html#GstVaapiDecoder" title="GstVaapiDecoder"><span class="returnvalue">GstVaapiDecoder</span></a> *
+gst_vaapi_decoder_h265_new (<em class="parameter"><code><a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a> *display</code></em>,
+                            <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstCaps.html"><span class="type">GstCaps</span></a> *caps</code></em>);</pre>
+<p>Creates a new <a class="link" href="libs-gstvaapidecoder.html#GstVaapiDecoder" title="GstVaapiDecoder"><span class="type">GstVaapiDecoder</span></a> for MPEG-2 decoding.  The <em class="parameter"><code>caps</code></em>
+ can
+hold extra information like codec-data and pictured coded size.</p>
+<div class="refsect3">
+<a name="id-1.3.36.6.2.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>display</p></td>
+<td class="parameter_description"><p>a <a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>caps</p></td>
+<td class="parameter_description"><p>a <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstCaps.html"><span class="type">GstCaps</span></a> holding codec information</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="id-1.3.36.6.2.6"></a><h4>Returns</h4>
+<p> the newly allocated <a class="link" href="libs-gstvaapidecoder.html#GstVaapiDecoder" title="GstVaapiDecoder"><span class="type">GstVaapiDecoder</span></a> object</p>
+<p></p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="gst-vaapi-decoder-h265-set-alignment"></a><h3>gst_vaapi_decoder_h265_set_alignment ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+gst_vaapi_decoder_h265_set_alignment (<em class="parameter"><code><a class="link" href="libs-GstVaapiDecoderH265.html#GstVaapiDecoderH265" title="GstVaapiDecoderH265"><span class="type">GstVaapiDecoderH265</span></a> *decoder</code></em>,
+                                      <em class="parameter"><code><a class="link" href="libs-GstVaapiDecoderH265.html#GstVaapiStreamAlignH265" title="enum GstVaapiStreamAlignH265"><span class="type">GstVaapiStreamAlignH265</span></a> alignment</code></em>);</pre>
+<p>Specifies how stream buffers are aligned / fed, i.e. the boundaries
+of each buffer that is supplied to the decoder. This could be no
+specific alignment, NAL unit boundaries, or access unit boundaries.</p>
+<div class="refsect3">
+<a name="id-1.3.36.6.3.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>decoder</p></td>
+<td class="parameter_description"><p>a <a class="link" href="libs-GstVaapiDecoderH265.html#GstVaapiDecoderH265" title="GstVaapiDecoderH265"><span class="type">GstVaapiDecoderH265</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>alignment</p></td>
+<td class="parameter_description"><p>the <a class="link" href="libs-GstVaapiDecoderH265.html#GstVaapiStreamAlignH265" title="enum GstVaapiStreamAlignH265"><span class="type">GstVaapiStreamAlignH265</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+</div>
+<div class="refsect1">
+<a name="libs-GstVaapiDecoderH265.other_details"></a><h2>Types and Values</h2>
+<div class="refsect2">
+<a name="GstVaapiDecoderH265"></a><h3>GstVaapiDecoderH265</h3>
+<pre class="programlisting">typedef struct _GstVaapiDecoderH265 GstVaapiDecoderH265;</pre>
+<p>A decoder based on H265.</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="GstVaapiStreamAlignH265"></a><h3>enum GstVaapiStreamAlignH265</h3>
+<p>Set of possible buffer alignments for H.265 streams.</p>
+<div class="refsect3">
+<a name="id-1.3.36.7.3.4"></a><h4>Members</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="300px" class="enum_members_name">
+<col class="enum_members_description">
+<col width="200px" class="enum_members_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="enum_member_name"><p><a name="GST-VAAPI-STREAM-ALIGN-H265-NONE:CAPS"></a>GST_VAAPI_STREAM_ALIGN_H265_NONE</p></td>
+<td class="enum_member_description">
+<p>Generic H.265 stream buffers</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="GST-VAAPI-STREAM-ALIGN-H265-NALU:CAPS"></a>GST_VAAPI_STREAM_ALIGN_H265_NALU</p></td>
+<td class="enum_member_description">
+<p>H.265 stream buffers aligned NAL
+  unit boundaries</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="GST-VAAPI-STREAM-ALIGN-H265-AU:CAPS"></a>GST_VAAPI_STREAM_ALIGN_H265_AU</p></td>
+<td class="enum_member_description">
+<p>H.265 stream buffers aligned on
+  access unit boundaries</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+</div>
+</div>
+<div class="footer">
+<hr>
+          Generated by GTK-Doc V1.21</div>
+</body>
+</html>
\ No newline at end of file
diff -Nru gstreamer-vaapi-0.5.10/docs/reference/libs/html/libs-gstvaapidecoder.html gstreamer-vaapi-0.6.0/docs/reference/libs/html/libs-gstvaapidecoder.html
--- gstreamer-vaapi-0.5.10/docs/reference/libs/html/libs-gstvaapidecoder.html	2015-02-03 08:45:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/docs/reference/libs/html/libs-gstvaapidecoder.html	2015-07-15 12:52:27.000000000 +0000
@@ -146,7 +146,7 @@
  caps. The decoder owns the returned caps, so
 use <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstCaps.html#gst-caps-ref"><code class="function">gst_caps_ref()</code></a> whenever necessary.</p>
 <div class="refsect3">
-<a name="id-1.2.21.6.2.5"></a><h4>Parameters</h4>
+<a name="id-1.3.29.6.2.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -161,7 +161,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.21.6.2.6"></a><h4>Returns</h4>
+<a name="id-1.3.29.6.2.6"></a><h4>Returns</h4>
 <p> the <em class="parameter"><code>decoder</code></em>
 caps</p>
 <p></p>
@@ -175,7 +175,7 @@
 <p>Retrieves the <em class="parameter"><code>decoder</code></em>
  codec type.</p>
 <div class="refsect3">
-<a name="id-1.2.21.6.3.5"></a><h4>Parameters</h4>
+<a name="id-1.3.29.6.3.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -190,7 +190,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.21.6.3.6"></a><h4>Returns</h4>
+<a name="id-1.3.29.6.3.6"></a><h4>Returns</h4>
 <p> the <a class="link" href="libs-GstVaapiProfile.html#GstVaapiCodec" title="enum GstVaapiCodec"><span class="type">GstVaapiCodec</span></a> type for <em class="parameter"><code>decoder</code></em>
 </p>
 <p></p>
@@ -206,7 +206,7 @@
 <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gst-plugins-base-libs/html/gst-plugins-base-libs-gstvideoutils.html#GstVideoCodecState"><span class="type">GstVideoCodecState</span></a> structure, so use <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gst-plugins-base-libs/html/gst-plugins-base-libs-gstvideoutils.html#gst-video-codec-state-ref"><code class="function">gst_video_codec_state_ref()</code></a>
 whenever necessary.</p>
 <div class="refsect3">
-<a name="id-1.2.21.6.4.5"></a><h4>Parameters</h4>
+<a name="id-1.3.29.6.4.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -221,7 +221,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.21.6.4.6"></a><h4>Returns</h4>
+<a name="id-1.3.29.6.4.6"></a><h4>Returns</h4>
 <p> the <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gst-plugins-base-libs/html/gst-plugins-base-libs-gstvideoutils.html#GstVideoCodecState"><span class="type">GstVideoCodecState</span></a> object for <em class="parameter"><code>decoder</code></em>
 </p>
 <p></p>
@@ -242,7 +242,7 @@
 or size equals to zero, then the function ignores this buffer and
 returns <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a>.</p>
 <div class="refsect3">
-<a name="id-1.2.21.6.5.6"></a><h4>Parameters</h4>
+<a name="id-1.3.29.6.5.6"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -264,7 +264,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.21.6.5.7"></a><h4>Returns</h4>
+<a name="id-1.3.29.6.5.7"></a><h4>Returns</h4>
 <p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> on success</p>
 <p></p>
 </div>
@@ -282,7 +282,7 @@
 as a <span class="type">GstVaapiSurfaceProxy</span>. The caller owns this object, so
 <a class="link" href="libs-GstVaapiSurfaceProxy.html#gst-vaapi-surface-proxy-unref" title="gst_vaapi_surface_proxy_unref ()"><code class="function">gst_vaapi_surface_proxy_unref()</code></a> shall be called after usage.</p>
 <div class="refsect3">
-<a name="id-1.2.21.6.6.6"></a><h4>Parameters</h4>
+<a name="id-1.3.29.6.6.6"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -304,7 +304,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.21.6.6.7"></a><h4>Returns</h4>
+<a name="id-1.3.29.6.6.7"></a><h4>Returns</h4>
 <p> a <a class="link" href="libs-gstvaapidecoder.html#GstVaapiDecoderStatus" title="enum GstVaapiDecoderStatus"><span class="type">GstVaapiDecoderStatus</span></a></p>
 <p></p>
 </div>
@@ -328,7 +328,7 @@
 <p>This is equivalent to <a class="link" href="libs-gstvaapidecoder.html#gst-vaapi-decoder-get-frame-with-timeout" title="gst_vaapi_decoder_get_frame_with_timeout ()"><code class="function">gst_vaapi_decoder_get_frame_with_timeout()</code></a>
 with a timeout value of zero.</p>
 <div class="refsect3">
-<a name="id-1.2.21.6.7.7"></a><h4>Parameters</h4>
+<a name="id-1.3.29.6.7.7"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -350,7 +350,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.21.6.7.8"></a><h4>Returns</h4>
+<a name="id-1.3.29.6.7.8"></a><h4>Returns</h4>
 <p> a <a class="link" href="libs-gstvaapidecoder.html#GstVaapiDecoderStatus" title="enum GstVaapiDecoderStatus"><span class="type">GstVaapiDecoderStatus</span></a></p>
 <p></p>
 </div>
@@ -374,7 +374,7 @@
 to the user-data anchor of the output frame. Ownership of the proxy
 is transferred to the frame.</p>
 <div class="refsect3">
-<a name="id-1.2.21.6.8.6"></a><h4>Parameters</h4>
+<a name="id-1.3.29.6.8.6"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -401,7 +401,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.21.6.8.7"></a><h4>Returns</h4>
+<a name="id-1.3.29.6.8.7"></a><h4>Returns</h4>
 <p> a <a class="link" href="libs-gstvaapidecoder.html#GstVaapiDecoderStatus" title="enum GstVaapiDecoderStatus"><span class="type">GstVaapiDecoderStatus</span></a></p>
 <p></p>
 </div>
@@ -419,7 +419,7 @@
 <p>
 </p>
 <div class="refsect3">
-<a name="id-1.2.21.6.9.5"></a><h4>Returns</h4>
+<a name="id-1.3.29.6.9.5"></a><h4>Returns</h4>
 <p></p>
 </div>
 </div>
@@ -432,7 +432,7 @@
 <p>
 </p>
 <div class="refsect3">
-<a name="id-1.2.21.6.10.5"></a><h4>Returns</h4>
+<a name="id-1.3.29.6.10.5"></a><h4>Returns</h4>
 <p></p>
 </div>
 </div>
@@ -443,7 +443,7 @@
 <a name="GstVaapiDecoderStatus"></a><h3>enum GstVaapiDecoderStatus</h3>
 <p>Decoder status for <a class="link" href="libs-gstvaapidecoder.html#gst-vaapi-decoder-get-surface" title="gst_vaapi_decoder_get_surface ()"><code class="function">gst_vaapi_decoder_get_surface()</code></a>.</p>
 <div class="refsect3">
-<a name="id-1.2.21.7.2.4"></a><h4>Members</h4>
+<a name="id-1.3.29.7.2.4"></a><h4>Members</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="300px" class="enum_members_name">
diff -Nru gstreamer-vaapi-0.5.10/docs/reference/libs/html/libs-GstVaapiDecoderJpeg.html gstreamer-vaapi-0.6.0/docs/reference/libs/html/libs-GstVaapiDecoderJpeg.html
--- gstreamer-vaapi-0.5.10/docs/reference/libs/html/libs-GstVaapiDecoderJpeg.html	2015-02-03 08:45:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/docs/reference/libs/html/libs-GstVaapiDecoderJpeg.html	2015-07-15 12:52:27.000000000 +0000
@@ -75,7 +75,7 @@
  can
 hold extra information like codec-data and pictured coded size.</p>
 <div class="refsect3">
-<a name="id-1.2.22.6.2.5"></a><h4>Parameters</h4>
+<a name="id-1.3.30.6.2.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -97,7 +97,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.22.6.2.6"></a><h4>Returns</h4>
+<a name="id-1.3.30.6.2.6"></a><h4>Returns</h4>
 <p> the newly allocated <a class="link" href="libs-gstvaapidecoder.html#GstVaapiDecoder" title="GstVaapiDecoder"><span class="type">GstVaapiDecoder</span></a> object</p>
 <p></p>
 </div>
diff -Nru gstreamer-vaapi-0.5.10/docs/reference/libs/html/libs-GstVaapiDecoderMpeg2.html gstreamer-vaapi-0.6.0/docs/reference/libs/html/libs-GstVaapiDecoderMpeg2.html
--- gstreamer-vaapi-0.5.10/docs/reference/libs/html/libs-GstVaapiDecoderMpeg2.html	2015-02-03 08:45:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/docs/reference/libs/html/libs-GstVaapiDecoderMpeg2.html	2015-07-15 12:52:27.000000000 +0000
@@ -75,7 +75,7 @@
  can
 hold extra information like codec-data and pictured coded size.</p>
 <div class="refsect3">
-<a name="id-1.2.23.6.2.5"></a><h4>Parameters</h4>
+<a name="id-1.3.31.6.2.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -97,7 +97,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.23.6.2.6"></a><h4>Returns</h4>
+<a name="id-1.3.31.6.2.6"></a><h4>Returns</h4>
 <p> the newly allocated <a class="link" href="libs-gstvaapidecoder.html#GstVaapiDecoder" title="GstVaapiDecoder"><span class="type">GstVaapiDecoder</span></a> object</p>
 <p></p>
 </div>
diff -Nru gstreamer-vaapi-0.5.10/docs/reference/libs/html/libs-GstVaapiDecoderMpeg4.html gstreamer-vaapi-0.6.0/docs/reference/libs/html/libs-GstVaapiDecoderMpeg4.html
--- gstreamer-vaapi-0.5.10/docs/reference/libs/html/libs-GstVaapiDecoderMpeg4.html	2015-02-03 08:45:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/docs/reference/libs/html/libs-GstVaapiDecoderMpeg4.html	2015-07-15 12:52:27.000000000 +0000
@@ -75,7 +75,7 @@
  can
 hold extra information like codec-data and pictured coded size.</p>
 <div class="refsect3">
-<a name="id-1.2.24.6.2.5"></a><h4>Parameters</h4>
+<a name="id-1.3.32.6.2.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -97,7 +97,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.24.6.2.6"></a><h4>Returns</h4>
+<a name="id-1.3.32.6.2.6"></a><h4>Returns</h4>
 <p> the newly allocated <a class="link" href="libs-gstvaapidecoder.html#GstVaapiDecoder" title="GstVaapiDecoder"><span class="type">GstVaapiDecoder</span></a> object</p>
 <p></p>
 </div>
diff -Nru gstreamer-vaapi-0.5.10/docs/reference/libs/html/libs-GstVaapiDecoderUnit.html gstreamer-vaapi-0.6.0/docs/reference/libs/html/libs-GstVaapiDecoderUnit.html
--- gstreamer-vaapi-0.5.10/docs/reference/libs/html/libs-GstVaapiDecoderUnit.html	1970-01-01 00:00:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/docs/reference/libs/html/libs-GstVaapiDecoderUnit.html	2015-07-15 12:52:27.000000000 +0000
@@ -0,0 +1,326 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>GStreamer VA-API Plugins 1.4 Library Reference Manual: GstVaapiDecoderUnit</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="GStreamer VA-API Plugins 1.4 Library Reference Manual">
+<link rel="up" href="ch01.html" title="gst-plugins-vaapi Library">
+<link rel="prev" href="libs-GstVaapiDecoderH265.html" title="GstVaapiDecoderH265">
+<link rel="next" href="libs-GstVaapiSurfaceProxy.html" title="GstVaapiSurfaceProxy">
+<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts">
+<a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
+                  <a href="#libs-GstVaapiDecoderUnit.description" class="shortcut">Description</a></span>
+</td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><a accesskey="u" href="ch01.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="libs-GstVaapiDecoderH265.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="libs-GstVaapiSurfaceProxy.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+</tr></table>
+<div class="refentry">
+<a name="libs-GstVaapiDecoderUnit"></a><div class="titlepage"></div>
+<div class="refnamediv"><table width="100%"><tr>
+<td valign="top">
+<h2><span class="refentrytitle"><a name="libs-GstVaapiDecoderUnit.top_of_page"></a>GstVaapiDecoderUnit</span></h2>
+<p>GstVaapiDecoderUnit — Decoder unit</p>
+</td>
+<td class="gallery_image" valign="top" align="right"></td>
+</tr></table></div>
+<div class="refsect1">
+<a name="libs-GstVaapiDecoderUnit.functions"></a><h2>Functions</h2>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="functions_return">
+<col class="functions_name">
+</colgroup>
+<tbody>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="libs-GstVaapiDecoderUnit.html#gst-vaapi-decoder-unit-init" title="gst_vaapi_decoder_unit_init ()">gst_vaapi_decoder_unit_init</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="libs-GstVaapiDecoderUnit.html#gst-vaapi-decoder-unit-clear" title="gst_vaapi_decoder_unit_clear ()">gst_vaapi_decoder_unit_clear</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a class="link" href="libs-GstVaapiDecoderUnit.html#GstVaapiDecoderUnit" title="struct GstVaapiDecoderUnit"><span class="returnvalue">GstVaapiDecoderUnit</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libs-GstVaapiDecoderUnit.html#gst-vaapi-decoder-unit-new" title="gst_vaapi_decoder_unit_new ()">gst_vaapi_decoder_unit_new</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="libs-GstVaapiDecoderUnit.html#gst-vaapi-decoder-unit-set-parsed-info" title="gst_vaapi_decoder_unit_set_parsed_info ()">gst_vaapi_decoder_unit_set_parsed_info</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="libs-GstVaapiDecoderUnit.other"></a><h2>Types and Values</h2>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="name">
+<col class="description">
+</colgroup>
+<tbody>
+<tr>
+<td class="datatype_keyword">enum</td>
+<td class="function_name"><a class="link" href="libs-GstVaapiDecoderUnit.html#GstVaapiDecoderUnitFlags" title="enum GstVaapiDecoderUnitFlags">GstVaapiDecoderUnitFlags</a></td>
+</tr>
+<tr>
+<td class="datatype_keyword">struct</td>
+<td class="function_name"><a class="link" href="libs-GstVaapiDecoderUnit.html#GstVaapiDecoderUnit" title="struct GstVaapiDecoderUnit">GstVaapiDecoderUnit</a></td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="libs-GstVaapiDecoderUnit.description"></a><h2>Description</h2>
+</div>
+<div class="refsect1">
+<a name="libs-GstVaapiDecoderUnit.functions_details"></a><h2>Functions</h2>
+<div class="refsect2">
+<a name="gst-vaapi-decoder-unit-init"></a><h3>gst_vaapi_decoder_unit_init ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+gst_vaapi_decoder_unit_init (<em class="parameter"><code><a class="link" href="libs-GstVaapiDecoderUnit.html#GstVaapiDecoderUnit" title="struct GstVaapiDecoderUnit"><span class="type">GstVaapiDecoderUnit</span></a> *unit</code></em>);</pre>
+<p>Initializes internal resources bound to the supplied decoder <em class="parameter"><code>unit</code></em>
+.</p>
+<p><em class="parameter"><code>note</code></em>
+ This is an internal function used to implement lightweight
+sub-classes.</p>
+<div class="refsect3">
+<a name="id-1.3.37.6.2.6"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>unit</p></td>
+<td class="parameter_description"><p>a <a class="link" href="libs-GstVaapiDecoderUnit.html#GstVaapiDecoderUnit" title="struct GstVaapiDecoderUnit"><span class="type">GstVaapiDecoderUnit</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="gst-vaapi-decoder-unit-clear"></a><h3>gst_vaapi_decoder_unit_clear ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+gst_vaapi_decoder_unit_clear (<em class="parameter"><code><a class="link" href="libs-GstVaapiDecoderUnit.html#GstVaapiDecoderUnit" title="struct GstVaapiDecoderUnit"><span class="type">GstVaapiDecoderUnit</span></a> *unit</code></em>);</pre>
+<p>Deallocates any internal resources bound to the supplied decoder
+<em class="parameter"><code>unit</code></em>
+.</p>
+<p><em class="parameter"><code>note</code></em>
+ This is an internal function used to implement lightweight
+sub-classes.</p>
+<div class="refsect3">
+<a name="id-1.3.37.6.3.6"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>unit</p></td>
+<td class="parameter_description"><p>a <a class="link" href="libs-GstVaapiDecoderUnit.html#GstVaapiDecoderUnit" title="struct GstVaapiDecoderUnit"><span class="type">GstVaapiDecoderUnit</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="gst-vaapi-decoder-unit-new"></a><h3>gst_vaapi_decoder_unit_new ()</h3>
+<pre class="programlisting"><a class="link" href="libs-GstVaapiDecoderUnit.html#GstVaapiDecoderUnit" title="struct GstVaapiDecoderUnit"><span class="returnvalue">GstVaapiDecoderUnit</span></a> *
+gst_vaapi_decoder_unit_new (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
+<p>
+</p>
+<div class="refsect3">
+<a name="id-1.3.37.6.4.5"></a><h4>Returns</h4>
+<p></p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="gst-vaapi-decoder-unit-set-parsed-info"></a><h3>gst_vaapi_decoder_unit_set_parsed_info ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+gst_vaapi_decoder_unit_set_parsed_info
+                               (<em class="parameter"><code><a class="link" href="libs-GstVaapiDecoderUnit.html#GstVaapiDecoderUnit" title="struct GstVaapiDecoderUnit"><span class="type">GstVaapiDecoderUnit</span></a> *unit</code></em>,
+                                <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> parsed_info</code></em>,
+                                <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Datasets.html#GDestroyNotify"><span class="type">GDestroyNotify</span></a> destroy_notify</code></em>);</pre>
+<p>Sets <em class="parameter"><code>parsed_info</code></em>
+ on the object and the <a href="https://developer.gnome.org/glib/unstable/glib-Datasets.html#GDestroyNotify"><span class="type">GDestroyNotify</span></a> that will be
+called when the data is freed.</p>
+<p>If some <em class="parameter"><code>parsed_info</code></em>
+ was previously set, then the former <em class="parameter"><code>destroy_notify</code></em>
+
+function will be called before the <em class="parameter"><code>parsed_info</code></em>
+ is replaced.</p>
+<div class="refsect3">
+<a name="id-1.3.37.6.5.6"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>unit</p></td>
+<td class="parameter_description"><p>a <a class="link" href="libs-GstVaapiDecoderUnit.html#GstVaapiDecoderUnit" title="struct GstVaapiDecoderUnit"><span class="type">GstVaapiDecoderUnit</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>parsed_info</p></td>
+<td class="parameter_description"><p>parser info</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>destroy_notify</p></td>
+<td class="parameter_description"><p> a <a href="https://developer.gnome.org/glib/unstable/glib-Datasets.html#GDestroyNotify"><span class="type">GDestroyNotify</span></a>. </p></td>
+<td class="parameter_annotations"><span class="annotation">[<acronym title="This parameter is a 'user_data', for callbacks; many bindings can pass NULL here."><span class="acronym">closure</span></acronym> parsed_info]</span></td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+</div>
+<div class="refsect1">
+<a name="libs-GstVaapiDecoderUnit.other_details"></a><h2>Types and Values</h2>
+<div class="refsect2">
+<a name="GstVaapiDecoderUnitFlags"></a><h3>enum GstVaapiDecoderUnitFlags</h3>
+<p>Flags for <a class="link" href="libs-GstVaapiDecoderUnit.html#GstVaapiDecoderUnit" title="struct GstVaapiDecoderUnit"><span class="type">GstVaapiDecoderUnit</span></a>.</p>
+<div class="refsect3">
+<a name="id-1.3.37.7.2.4"></a><h4>Members</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="300px" class="enum_members_name">
+<col class="enum_members_description">
+<col width="200px" class="enum_members_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="enum_member_name"><p><a name="GST-VAAPI-DECODER-UNIT-FLAG-FRAME-START:CAPS"></a>GST_VAAPI_DECODER_UNIT_FLAG_FRAME_START</p></td>
+<td class="enum_member_description">
+<p>marks the start of a frame.</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="GST-VAAPI-DECODER-UNIT-FLAG-FRAME-END:CAPS"></a>GST_VAAPI_DECODER_UNIT_FLAG_FRAME_END</p></td>
+<td class="enum_member_description">
+<p>marks the end of a frame.</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="GST-VAAPI-DECODER-UNIT-FLAG-STREAM-END:CAPS"></a>GST_VAAPI_DECODER_UNIT_FLAG_STREAM_END</p></td>
+<td class="enum_member_description">
+<p>marks the end of a stream.</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="GST-VAAPI-DECODER-UNIT-FLAG-SLICE:CAPS"></a>GST_VAAPI_DECODER_UNIT_FLAG_SLICE</p></td>
+<td class="enum_member_description">
+<p>the unit contains slice data.</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="GST-VAAPI-DECODER-UNIT-FLAG-SKIP:CAPS"></a>GST_VAAPI_DECODER_UNIT_FLAG_SKIP</p></td>
+<td class="enum_member_description">
+<p>marks the unit as unused/skipped.</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="GST-VAAPI-DECODER-UNIT-FLAG-LAST:CAPS"></a>GST_VAAPI_DECODER_UNIT_FLAG_LAST</p></td>
+<td class="enum_member_description"> </td>
+<td class="enum_member_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="GstVaapiDecoderUnit"></a><h3>struct GstVaapiDecoderUnit</h3>
+<pre class="programlisting">struct GstVaapiDecoderUnit {
+    guint               flags;
+    guint               size;
+    guint               offset;
+    gpointer            parsed_info;
+    GDestroyNotify      parsed_info_destroy_notify;
+};
+</pre>
+<p>A chunk of bitstream data that was parsed.</p>
+<div class="refsect3">
+<a name="id-1.3.37.7.3.5"></a><h4>Members</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="300px" class="struct_members_name">
+<col class="struct_members_description">
+<col width="200px" class="struct_members_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> <em class="structfield"><code><a name="GstVaapiDecoderUnit.flags"></a>flags</code></em>;</p></td>
+<td class="struct_member_description"> </td>
+<td class="struct_member_annotations"> </td>
+</tr>
+<tr>
+<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> <em class="structfield"><code><a name="GstVaapiDecoderUnit.size"></a>size</code></em>;</p></td>
+<td class="struct_member_description"><p>size in bytes of this bitstream unit</p></td>
+<td class="struct_member_annotations"> </td>
+</tr>
+<tr>
+<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> <em class="structfield"><code><a name="GstVaapiDecoderUnit.offset"></a>offset</code></em>;</p></td>
+<td class="struct_member_description"><p>relative offset in bytes to bitstream unit within the
+associated <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gst-plugins-base-libs/html/gst-plugins-base-libs-gstvideoutils.html#GstVideoCodecFrame"><span class="type">GstVideoCodecFrame</span></a> input_buffer</p></td>
+<td class="struct_member_annotations"> </td>
+</tr>
+<tr>
+<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> <em class="structfield"><code><a name="GstVaapiDecoderUnit.parsed-info"></a>parsed_info</code></em>;</p></td>
+<td class="struct_member_description"><p>parser-specific data (this is codec specific)</p></td>
+<td class="struct_member_annotations"> </td>
+</tr>
+<tr>
+<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Datasets.html#GDestroyNotify"><span class="type">GDestroyNotify</span></a> <em class="structfield"><code><a name="GstVaapiDecoderUnit.parsed-info-destroy-notify"></a>parsed_info_destroy_notify</code></em>;</p></td>
+<td class="struct_member_description"><p>function used to release <em class="parameter"><code>parsed_info</code></em>
+data</p></td>
+<td class="struct_member_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+</div>
+</div>
+<div class="footer">
+<hr>
+          Generated by GTK-Doc V1.21</div>
+</body>
+</html>
\ No newline at end of file
diff -Nru gstreamer-vaapi-0.5.10/docs/reference/libs/html/libs-GstVaapiDecoderVC1.html gstreamer-vaapi-0.6.0/docs/reference/libs/html/libs-GstVaapiDecoderVC1.html
--- gstreamer-vaapi-0.5.10/docs/reference/libs/html/libs-GstVaapiDecoderVC1.html	2015-02-03 08:45:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/docs/reference/libs/html/libs-GstVaapiDecoderVC1.html	2015-07-15 12:52:27.000000000 +0000
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="GStreamer VA-API Plugins 1.4 Library Reference Manual">
 <link rel="up" href="ch01.html" title="gst-plugins-vaapi Library">
 <link rel="prev" href="libs-GstVaapiDecoderH264.html" title="GstVaapiDecoderH264">
-<link rel="next" href="libs-GstVaapiSurfaceProxy.html" title="GstVaapiSurfaceProxy">
+<link rel="next" href="libs-GstVaapiDecoderVp8.html" title="GstVaapiDecoderVp8">
 <meta name="generator" content="GTK-Doc V1.21 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
@@ -20,7 +20,7 @@
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
 <td><a accesskey="u" href="ch01.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
 <td><a accesskey="p" href="libs-GstVaapiDecoderH264.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
-<td><a accesskey="n" href="libs-GstVaapiSurfaceProxy.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+<td><a accesskey="n" href="libs-GstVaapiDecoderVp8.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
 </tr></table>
 <div class="refentry">
 <a name="libs-GstVaapiDecoderVC1"></a><div class="titlepage"></div>
@@ -75,7 +75,7 @@
  can
 hold extra information like codec-data and pictured coded size.</p>
 <div class="refsect3">
-<a name="id-1.2.26.6.2.5"></a><h4>Parameters</h4>
+<a name="id-1.3.34.6.2.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -97,7 +97,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.26.6.2.6"></a><h4>Returns</h4>
+<a name="id-1.3.34.6.2.6"></a><h4>Returns</h4>
 <p> the newly allocated <a class="link" href="libs-gstvaapidecoder.html#GstVaapiDecoder" title="GstVaapiDecoder"><span class="type">GstVaapiDecoder</span></a> object</p>
 <p></p>
 </div>
diff -Nru gstreamer-vaapi-0.5.10/docs/reference/libs/html/libs-GstVaapiDecoderVp8.html gstreamer-vaapi-0.6.0/docs/reference/libs/html/libs-GstVaapiDecoderVp8.html
--- gstreamer-vaapi-0.5.10/docs/reference/libs/html/libs-GstVaapiDecoderVp8.html	1970-01-01 00:00:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/docs/reference/libs/html/libs-GstVaapiDecoderVp8.html	2015-07-15 12:52:27.000000000 +0000
@@ -0,0 +1,119 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>GStreamer VA-API Plugins 1.4 Library Reference Manual: GstVaapiDecoderVp8</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="GStreamer VA-API Plugins 1.4 Library Reference Manual">
+<link rel="up" href="ch01.html" title="gst-plugins-vaapi Library">
+<link rel="prev" href="libs-GstVaapiDecoderVC1.html" title="GstVaapiDecoderVC1">
+<link rel="next" href="libs-GstVaapiDecoderH265.html" title="GstVaapiDecoderH265">
+<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts">
+<a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
+                  <a href="#libs-GstVaapiDecoderVp8.description" class="shortcut">Description</a></span>
+</td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><a accesskey="u" href="ch01.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="libs-GstVaapiDecoderVC1.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="libs-GstVaapiDecoderH265.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+</tr></table>
+<div class="refentry">
+<a name="libs-GstVaapiDecoderVp8"></a><div class="titlepage"></div>
+<div class="refnamediv"><table width="100%"><tr>
+<td valign="top">
+<h2><span class="refentrytitle"><a name="libs-GstVaapiDecoderVp8.top_of_page"></a>GstVaapiDecoderVp8</span></h2>
+<p>GstVaapiDecoderVp8 — VP8 decoder</p>
+</td>
+<td class="gallery_image" valign="top" align="right"></td>
+</tr></table></div>
+<div class="refsect1">
+<a name="libs-GstVaapiDecoderVp8.functions"></a><h2>Functions</h2>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="functions_return">
+<col class="functions_name">
+</colgroup>
+<tbody><tr>
+<td class="function_type">
+<a class="link" href="libs-gstvaapidecoder.html#GstVaapiDecoder" title="GstVaapiDecoder"><span class="returnvalue">GstVaapiDecoder</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libs-GstVaapiDecoderVp8.html#gst-vaapi-decoder-vp8-new" title="gst_vaapi_decoder_vp8_new ()">gst_vaapi_decoder_vp8_new</a> <span class="c_punctuation">()</span>
+</td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="libs-GstVaapiDecoderVp8.other"></a><h2>Types and Values</h2>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="name">
+<col class="description">
+</colgroup>
+<tbody><tr>
+<td class="datatype_keyword"> </td>
+<td class="function_name"><a class="link" href="libs-GstVaapiDecoderVp8.html#GstVaapiDecoderVp8" title="GstVaapiDecoderVp8">GstVaapiDecoderVp8</a></td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="libs-GstVaapiDecoderVp8.description"></a><h2>Description</h2>
+</div>
+<div class="refsect1">
+<a name="libs-GstVaapiDecoderVp8.functions_details"></a><h2>Functions</h2>
+<div class="refsect2">
+<a name="gst-vaapi-decoder-vp8-new"></a><h3>gst_vaapi_decoder_vp8_new ()</h3>
+<pre class="programlisting"><a class="link" href="libs-gstvaapidecoder.html#GstVaapiDecoder" title="GstVaapiDecoder"><span class="returnvalue">GstVaapiDecoder</span></a> *
+gst_vaapi_decoder_vp8_new (<em class="parameter"><code><a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a> *display</code></em>,
+                           <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstCaps.html"><span class="type">GstCaps</span></a> *caps</code></em>);</pre>
+<p>Creates a new <a class="link" href="libs-gstvaapidecoder.html#GstVaapiDecoder" title="GstVaapiDecoder"><span class="type">GstVaapiDecoder</span></a> for VP8 decoding.  The <em class="parameter"><code>caps</code></em>
+ can
+hold extra information like codec-data and pictured coded size.</p>
+<div class="refsect3">
+<a name="id-1.3.35.6.2.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>display</p></td>
+<td class="parameter_description"><p>a <a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>caps</p></td>
+<td class="parameter_description"><p>a <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstCaps.html"><span class="type">GstCaps</span></a> holding codec information</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="id-1.3.35.6.2.6"></a><h4>Returns</h4>
+<p> the newly allocated <a class="link" href="libs-gstvaapidecoder.html#GstVaapiDecoder" title="GstVaapiDecoder"><span class="type">GstVaapiDecoder</span></a> object</p>
+<p></p>
+</div>
+</div>
+</div>
+<div class="refsect1">
+<a name="libs-GstVaapiDecoderVp8.other_details"></a><h2>Types and Values</h2>
+<div class="refsect2">
+<a name="GstVaapiDecoderVp8"></a><h3>GstVaapiDecoderVp8</h3>
+<pre class="programlisting">typedef struct _GstVaapiDecoderVp8 GstVaapiDecoderVp8;</pre>
+<p>A decoder based on Vp8.</p>
+</div>
+</div>
+</div>
+<div class="footer">
+<hr>
+          Generated by GTK-Doc V1.21</div>
+</body>
+</html>
\ No newline at end of file
diff -Nru gstreamer-vaapi-0.5.10/docs/reference/libs/html/libs-GstVaapiDisplayDRM.html gstreamer-vaapi-0.6.0/docs/reference/libs/html/libs-GstVaapiDisplayDRM.html
--- gstreamer-vaapi-0.5.10/docs/reference/libs/html/libs-GstVaapiDisplayDRM.html	1970-01-01 00:00:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/docs/reference/libs/html/libs-GstVaapiDisplayDRM.html	2015-07-15 12:52:27.000000000 +0000
@@ -0,0 +1,216 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>GStreamer VA-API Plugins 1.4 Library Reference Manual: GstVaapiDisplayDRM</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="GStreamer VA-API Plugins 1.4 Library Reference Manual">
+<link rel="up" href="ch01.html" title="gst-plugins-vaapi Library">
+<link rel="prev" href="libs-GstVaapiDisplayEGL.html" title="GstVaapiDisplayEGL">
+<link rel="next" href="libs-GstVaapiDisplayWayland.html" title="GstVaapiDisplayWayland">
+<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts">
+<a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
+                  <a href="#libs-GstVaapiDisplayDRM.description" class="shortcut">Description</a></span>
+</td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><a accesskey="u" href="ch01.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="libs-GstVaapiDisplayEGL.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="libs-GstVaapiDisplayWayland.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+</tr></table>
+<div class="refentry">
+<a name="libs-GstVaapiDisplayDRM"></a><div class="titlepage"></div>
+<div class="refnamediv"><table width="100%"><tr>
+<td valign="top">
+<h2><span class="refentrytitle"><a name="libs-GstVaapiDisplayDRM.top_of_page"></a>GstVaapiDisplayDRM</span></h2>
+<p>GstVaapiDisplayDRM — VA/DRM display abstraction</p>
+</td>
+<td class="gallery_image" valign="top" align="right"></td>
+</tr></table></div>
+<div class="refsect1">
+<a name="libs-GstVaapiDisplayDRM.functions"></a><h2>Functions</h2>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="functions_return">
+<col class="functions_name">
+</colgroup>
+<tbody>
+<tr>
+<td class="function_type">
+<a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="returnvalue">GstVaapiDisplay</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libs-GstVaapiDisplayDRM.html#gst-vaapi-display-drm-new" title="gst_vaapi_display_drm_new ()">gst_vaapi_display_drm_new</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="returnvalue">GstVaapiDisplay</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libs-GstVaapiDisplayDRM.html#gst-vaapi-display-drm-new-with-device" title="gst_vaapi_display_drm_new_with_device ()">gst_vaapi_display_drm_new_with_device</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="libs-GstVaapiDisplayDRM.html#gst-vaapi-display-drm-get-device" title="gst_vaapi_display_drm_get_device ()">gst_vaapi_display_drm_get_device</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libs-GstVaapiDisplayDRM.html#gst-vaapi-display-drm-get-device-path" title="gst_vaapi_display_drm_get_device_path ()">gst_vaapi_display_drm_get_device_path</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="libs-GstVaapiDisplayDRM.description"></a><h2>Description</h2>
+</div>
+<div class="refsect1">
+<a name="libs-GstVaapiDisplayDRM.functions_details"></a><h2>Functions</h2>
+<div class="refsect2">
+<a name="gst-vaapi-display-drm-new"></a><h3>gst_vaapi_display_drm_new ()</h3>
+<pre class="programlisting"><a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="returnvalue">GstVaapiDisplay</span></a> *
+gst_vaapi_display_drm_new (<em class="parameter"><code>const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *device_path</code></em>);</pre>
+<p>Opens an DRM file descriptor using <em class="parameter"><code>device_path</code></em>
+ and returns a newly
+allocated <a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a> object. The DRM display will be cloed
+when the reference count of the object reaches zero.</p>
+<p>If <em class="parameter"><code>device_path</code></em>
+ is NULL, the DRM device path will be automatically
+determined as the first positive match in the list of available DRM
+devices.</p>
+<div class="refsect3">
+<a name="id-1.3.8.5.2.6"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>device_path</p></td>
+<td class="parameter_description"><p>the DRM device path</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="id-1.3.8.5.2.7"></a><h4>Returns</h4>
+<p> a newly allocated <a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a> object</p>
+<p></p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="gst-vaapi-display-drm-new-with-device"></a><h3>gst_vaapi_display_drm_new_with_device ()</h3>
+<pre class="programlisting"><a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="returnvalue">GstVaapiDisplay</span></a> *
+gst_vaapi_display_drm_new_with_device (<em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="type">gint</span></a> device</code></em>);</pre>
+<p>Creates a <a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a> based on the open DRM <em class="parameter"><code>device</code></em>
+. The
+caller still owns the device file descriptor and must call <code class="function">close()</code>
+when all <a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a> references are released. Doing so too
+early can yield undefined behaviour.</p>
+<div class="refsect3">
+<a name="id-1.3.8.5.3.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>device</p></td>
+<td class="parameter_description"><p>an open DRM device (file descriptor)</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="id-1.3.8.5.3.6"></a><h4>Returns</h4>
+<p> a newly allocated <a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a> object</p>
+<p></p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="gst-vaapi-display-drm-get-device"></a><h3>gst_vaapi_display_drm_get_device ()</h3>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>
+gst_vaapi_display_drm_get_device (<em class="parameter"><code><span class="type">GstVaapiDisplayDRM</span> *display</code></em>);</pre>
+<p>Returns the underlying DRM device file descriptor that was created
+by <a class="link" href="libs-GstVaapiDisplayDRM.html#gst-vaapi-display-drm-new" title="gst_vaapi_display_drm_new ()"><code class="function">gst_vaapi_display_drm_new()</code></a> or that was bound from
+<a class="link" href="libs-GstVaapiDisplayDRM.html#gst-vaapi-display-drm-new-with-device" title="gst_vaapi_display_drm_new_with_device ()"><code class="function">gst_vaapi_display_drm_new_with_device()</code></a>.</p>
+<div class="refsect3">
+<a name="id-1.3.8.5.4.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>display</p></td>
+<td class="parameter_description"><p>a <span class="type">GstVaapiDisplayDRM</span></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="id-1.3.8.5.4.6"></a><h4>Returns</h4>
+<p> the DRM file descriptor attached to <em class="parameter"><code>display</code></em>
+</p>
+<p></p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="gst-vaapi-display-drm-get-device-path"></a><h3>gst_vaapi_display_drm_get_device_path ()</h3>
+<pre class="programlisting">const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *
+gst_vaapi_display_drm_get_device_path (<em class="parameter"><code><span class="type">GstVaapiDisplayDRM</span> *display</code></em>);</pre>
+<p>Returns the underlying DRM device path name was created by
+<a class="link" href="libs-GstVaapiDisplayDRM.html#gst-vaapi-display-drm-new" title="gst_vaapi_display_drm_new ()"><code class="function">gst_vaapi_display_drm_new()</code></a> or that was bound from
+<a class="link" href="libs-GstVaapiDisplayDRM.html#gst-vaapi-display-drm-new-with-device" title="gst_vaapi_display_drm_new_with_device ()"><code class="function">gst_vaapi_display_drm_new_with_device()</code></a>.</p>
+<p>Note: the <span class="type">GstVaapiDisplayDRM</span> object owns the resulting string, so
+it shall not be deallocated.</p>
+<div class="refsect3">
+<a name="id-1.3.8.5.5.6"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>display</p></td>
+<td class="parameter_description"><p>a <span class="type">GstVaapiDisplayDRM</span></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="id-1.3.8.5.5.7"></a><h4>Returns</h4>
+<p> the DRM device path name attached to <em class="parameter"><code>display</code></em>
+</p>
+<p></p>
+</div>
+</div>
+</div>
+<div class="refsect1">
+<a name="libs-GstVaapiDisplayDRM.other_details"></a><h2>Types and Values</h2>
+</div>
+</div>
+<div class="footer">
+<hr>
+          Generated by GTK-Doc V1.21</div>
+</body>
+</html>
\ No newline at end of file
diff -Nru gstreamer-vaapi-0.5.10/docs/reference/libs/html/libs-GstVaapiDisplayEGL.html gstreamer-vaapi-0.6.0/docs/reference/libs/html/libs-GstVaapiDisplayEGL.html
--- gstreamer-vaapi-0.5.10/docs/reference/libs/html/libs-GstVaapiDisplayEGL.html	1970-01-01 00:00:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/docs/reference/libs/html/libs-GstVaapiDisplayEGL.html	2015-07-15 12:52:27.000000000 +0000
@@ -0,0 +1,248 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>GStreamer VA-API Plugins 1.4 Library Reference Manual: GstVaapiDisplayEGL</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="GStreamer VA-API Plugins 1.4 Library Reference Manual">
+<link rel="up" href="ch01.html" title="gst-plugins-vaapi Library">
+<link rel="prev" href="libs-GstVaapiDisplayGLX.html" title="GstVaapiDisplayGLX">
+<link rel="next" href="libs-GstVaapiDisplayDRM.html" title="GstVaapiDisplayDRM">
+<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts">
+<a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
+                  <a href="#libs-GstVaapiDisplayEGL.description" class="shortcut">Description</a></span>
+</td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><a accesskey="u" href="ch01.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="libs-GstVaapiDisplayGLX.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="libs-GstVaapiDisplayDRM.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+</tr></table>
+<div class="refentry">
+<a name="libs-GstVaapiDisplayEGL"></a><div class="titlepage"></div>
+<div class="refnamediv"><table width="100%"><tr>
+<td valign="top">
+<h2><span class="refentrytitle"><a name="libs-GstVaapiDisplayEGL.top_of_page"></a>GstVaapiDisplayEGL</span></h2>
+<p>GstVaapiDisplayEGL</p>
+</td>
+<td class="gallery_image" valign="top" align="right"></td>
+</tr></table></div>
+<div class="refsect1">
+<a name="libs-GstVaapiDisplayEGL.functions"></a><h2>Functions</h2>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="functions_return">
+<col class="functions_name">
+</colgroup>
+<tbody>
+<tr>
+<td class="function_type">
+<a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="returnvalue">GstVaapiDisplay</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libs-GstVaapiDisplayEGL.html#gst-vaapi-display-egl-new" title="gst_vaapi_display_egl_new ()">gst_vaapi_display_egl_new</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="returnvalue">GstVaapiDisplay</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libs-GstVaapiDisplayEGL.html#gst-vaapi-display-egl-new-with-native-display" title="gst_vaapi_display_egl_new_with_native_display ()">gst_vaapi_display_egl_new_with_native_display</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">EGLDisplay</span>
+</td>
+<td class="function_name">
+<a class="link" href="libs-GstVaapiDisplayEGL.html#gst-vaapi-display-egl-get-gl-display" title="gst_vaapi_display_egl_get_gl_display ()">gst_vaapi_display_egl_get_gl_display</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="libs-GstVaapiDisplayEGL.html#gst-vaapi-display-egl-set-gl-context" title="gst_vaapi_display_egl_set_gl_context ()">gst_vaapi_display_egl_set_gl_context</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">EGLContext</span>
+</td>
+<td class="function_name">
+<a class="link" href="libs-GstVaapiDisplayEGL.html#gst-vaapi-display-egl-get-gl-context" title="gst_vaapi_display_egl_get_gl_context ()">gst_vaapi_display_egl_get_gl_context</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="libs-GstVaapiDisplayEGL.other"></a><h2>Types and Values</h2>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="name">
+<col class="description">
+</colgroup>
+<tbody><tr>
+<td class="datatype_keyword"> </td>
+<td class="function_name"><a class="link" href="libs-GstVaapiDisplayEGL.html#GstVaapiDisplayEGL" title="GstVaapiDisplayEGL">GstVaapiDisplayEGL</a></td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="libs-GstVaapiDisplayEGL.description"></a><h2>Description</h2>
+<p>
+</p>
+</div>
+<div class="refsect1">
+<a name="libs-GstVaapiDisplayEGL.functions_details"></a><h2>Functions</h2>
+<div class="refsect2">
+<a name="gst-vaapi-display-egl-new"></a><h3>gst_vaapi_display_egl_new ()</h3>
+<pre class="programlisting"><a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="returnvalue">GstVaapiDisplay</span></a> *
+gst_vaapi_display_egl_new (<em class="parameter"><code><a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a> *display</code></em>,
+                           <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> gles_version</code></em>);</pre>
+<p>Creates a new <a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a> object suitable in EGL context. If
+the native <em class="parameter"><code>display</code></em>
+ is <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>, then any type of display is picked,
+i.e. one that can be successfully opened. The <em class="parameter"><code>gles_version</code></em>
+ will
+further ensure the OpenGL ES API to use, or zero to indicate
+"desktop" OpenGL.</p>
+<div class="refsect3">
+<a name="id-1.3.7.6.2.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>display</p></td>
+<td class="parameter_description"><p>a <a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a>, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> to pick any one</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>gles_version</p></td>
+<td class="parameter_description"><p>the OpenGL ES version API to use</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="id-1.3.7.6.2.6"></a><h4>Returns</h4>
+<p> a newly allocated <a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a> object</p>
+<p></p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="gst-vaapi-display-egl-new-with-native-display"></a><h3>gst_vaapi_display_egl_new_with_native_display ()</h3>
+<pre class="programlisting"><a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="returnvalue">GstVaapiDisplay</span></a> *
+gst_vaapi_display_egl_new_with_native_display
+                               (<em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> native_display</code></em>,
+                                <em class="parameter"><code><a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplayType" title="enum GstVaapiDisplayType"><span class="type">GstVaapiDisplayType</span></a> display_type</code></em>,
+                                <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> gles_version</code></em>);</pre>
+<p>Creates a <a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a> based on the native display supplied in
+as <em class="parameter"><code>native_display</code></em>
+. The caller still owns the display and must call
+native display close function when all <a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a> references
+are released. Doing so too early can yield undefined behaviour.</p>
+<p>The <em class="parameter"><code>gles_version</code></em>
+ will further ensure the OpenGL ES API to use, or
+zero to indicate "desktop" OpenGL.</p>
+<div class="refsect3">
+<a name="id-1.3.7.6.3.6"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>native_display</p></td>
+<td class="parameter_description"><p>an EGLDisplay object</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>display_type</p></td>
+<td class="parameter_description"><p>the display type of <em class="parameter"><code>native_display</code></em>
+</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>gles_version</p></td>
+<td class="parameter_description"><p>the OpenGL ES version API to use</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="id-1.3.7.6.3.7"></a><h4>Returns</h4>
+<p> a newly allocated <a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a> object</p>
+<p></p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="gst-vaapi-display-egl-get-gl-display"></a><h3>gst_vaapi_display_egl_get_gl_display ()</h3>
+<pre class="programlisting"><span class="returnvalue">EGLDisplay</span>
+gst_vaapi_display_egl_get_gl_display (<em class="parameter"><code><a class="link" href="libs-GstVaapiDisplayEGL.html#GstVaapiDisplayEGL" title="GstVaapiDisplayEGL"><span class="type">GstVaapiDisplayEGL</span></a> *display</code></em>);</pre>
+<p>
+</p>
+<div class="refsect3">
+<a name="id-1.3.7.6.4.5"></a><h4>Returns</h4>
+<p></p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="gst-vaapi-display-egl-set-gl-context"></a><h3>gst_vaapi_display_egl_set_gl_context ()</h3>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+gst_vaapi_display_egl_set_gl_context (<em class="parameter"><code><a class="link" href="libs-GstVaapiDisplayEGL.html#GstVaapiDisplayEGL" title="GstVaapiDisplayEGL"><span class="type">GstVaapiDisplayEGL</span></a> *display</code></em>,
+                                      <em class="parameter"><code><span class="type">EGLContext</span> gl_context</code></em>);</pre>
+<p>
+</p>
+<div class="refsect3">
+<a name="id-1.3.7.6.5.5"></a><h4>Returns</h4>
+<p></p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="gst-vaapi-display-egl-get-gl-context"></a><h3>gst_vaapi_display_egl_get_gl_context ()</h3>
+<pre class="programlisting"><span class="returnvalue">EGLContext</span>
+gst_vaapi_display_egl_get_gl_context (<em class="parameter"><code><a class="link" href="libs-GstVaapiDisplayEGL.html#GstVaapiDisplayEGL" title="GstVaapiDisplayEGL"><span class="type">GstVaapiDisplayEGL</span></a> *display</code></em>);</pre>
+<p>
+</p>
+<div class="refsect3">
+<a name="id-1.3.7.6.6.5"></a><h4>Returns</h4>
+<p></p>
+</div>
+</div>
+</div>
+<div class="refsect1">
+<a name="libs-GstVaapiDisplayEGL.other_details"></a><h2>Types and Values</h2>
+<div class="refsect2">
+<a name="GstVaapiDisplayEGL"></a><h3>GstVaapiDisplayEGL</h3>
+<pre class="programlisting">typedef struct {
+} GstVaapiDisplayEGL;
+</pre>
+<p>VA/EGL display wrapper.</p>
+</div>
+</div>
+</div>
+<div class="footer">
+<hr>
+          Generated by GTK-Doc V1.21</div>
+</body>
+</html>
\ No newline at end of file
diff -Nru gstreamer-vaapi-0.5.10/docs/reference/libs/html/libs-GstVaapiDisplayGLX.html gstreamer-vaapi-0.6.0/docs/reference/libs/html/libs-GstVaapiDisplayGLX.html
--- gstreamer-vaapi-0.5.10/docs/reference/libs/html/libs-GstVaapiDisplayGLX.html	2015-02-03 08:45:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/docs/reference/libs/html/libs-GstVaapiDisplayGLX.html	2015-07-15 12:52:27.000000000 +0000
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="GStreamer VA-API Plugins 1.4 Library Reference Manual">
 <link rel="up" href="ch01.html" title="gst-plugins-vaapi Library">
 <link rel="prev" href="libs-GstVaapiDisplayX11.html" title="GstVaapiDisplayX11">
-<link rel="next" href="libs-GstVaapiWindow.html" title="GstVaapiWindow">
+<link rel="next" href="libs-GstVaapiDisplayEGL.html" title="GstVaapiDisplayEGL">
 <meta name="generator" content="GTK-Doc V1.21 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
@@ -20,7 +20,7 @@
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
 <td><a accesskey="u" href="ch01.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
 <td><a accesskey="p" href="libs-GstVaapiDisplayX11.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
-<td><a accesskey="n" href="libs-GstVaapiWindow.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+<td><a accesskey="n" href="libs-GstVaapiDisplayEGL.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
 </tr></table>
 <div class="refentry">
 <a name="libs-GstVaapiDisplayGLX"></a><div class="titlepage"></div>
@@ -85,7 +85,7 @@
 allocated <a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a> object. The X11 display will be cloed
 when the reference count of the object reaches zero.</p>
 <div class="refsect3">
-<a name="id-1.2.6.6.2.5"></a><h4>Parameters</h4>
+<a name="id-1.3.6.6.2.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -100,7 +100,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.6.6.2.6"></a><h4>Returns</h4>
+<a name="id-1.3.6.6.2.6"></a><h4>Returns</h4>
 <p> a newly allocated <a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a> object</p>
 <p></p>
 </div>
@@ -117,7 +117,7 @@
 <code class="function">XCloseDisplay()</code> when all <a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a> references are
 released. Doing so too early can yield undefined behaviour.</p>
 <div class="refsect3">
-<a name="id-1.2.6.6.3.5"></a><h4>Parameters</h4>
+<a name="id-1.3.6.6.3.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -132,7 +132,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.6.6.3.6"></a><h4>Returns</h4>
+<a name="id-1.3.6.6.3.6"></a><h4>Returns</h4>
 <p> a newly allocated <a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a> object</p>
 <p></p>
 </div>
diff -Nru gstreamer-vaapi-0.5.10/docs/reference/libs/html/libs-GstVaapiDisplay.html gstreamer-vaapi-0.6.0/docs/reference/libs/html/libs-GstVaapiDisplay.html
--- gstreamer-vaapi-0.5.10/docs/reference/libs/html/libs-GstVaapiDisplay.html	2015-02-03 08:45:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/docs/reference/libs/html/libs-GstVaapiDisplay.html	2015-07-15 12:52:27.000000000 +0000
@@ -49,6 +49,30 @@
 </tr>
 <tr>
 <td class="function_type">
+<a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="returnvalue">GstVaapiDisplay</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libs-GstVaapiDisplay.html#gst-vaapi-display-ref" title="gst_vaapi_display_ref ()">gst_vaapi_display_ref</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="libs-GstVaapiDisplay.html#gst-vaapi-display-unref" title="gst_vaapi_display_unref ()">gst_vaapi_display_unref</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="libs-GstVaapiDisplay.html#gst-vaapi-display-replace" title="gst_vaapi_display_replace ()">gst_vaapi_display_replace</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
 <span class="returnvalue">void</span>
 </td>
 <td class="function_name">
@@ -81,6 +105,29 @@
 </tr>
 <tr>
 <td class="function_type">
+<a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplayType" title="enum GstVaapiDisplayType"><span class="returnvalue">GstVaapiDisplayType</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="libs-GstVaapiDisplay.html#gst-vaapi-display-get-class-type" title="gst_vaapi_display_get_class_type ()">gst_vaapi_display_get_class_type</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplayType" title="enum GstVaapiDisplayType"><span class="returnvalue">GstVaapiDisplayType</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="libs-GstVaapiDisplay.html#gst-vaapi-display-get-display-type" title="gst_vaapi_display_get_display_type ()">gst_vaapi_display_get_display_type</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libs-GstVaapiDisplay.html#gst-vaapi-display-get-display-name" title="gst_vaapi_display_get_display_name ()">gst_vaapi_display_get_display_name</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
 <span class="returnvalue">VADisplay</span>
 </td>
 <td class="function_name">
@@ -124,11 +171,35 @@
 <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 </td>
 <td class="function_name">
+<a class="link" href="libs-GstVaapiDisplay.html#gst-vaapi-display-has-video-processing" title="gst_vaapi_display_has_video_processing ()">gst_vaapi_display_has_video_processing</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a href="https://developer.gnome.org/glib/unstable/glib-Arrays.html#GArray"><span class="returnvalue">GArray</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libs-GstVaapiDisplay.html#gst-vaapi-display-get-decode-profiles" title="gst_vaapi_display_get_decode_profiles ()">gst_vaapi_display_get_decode_profiles</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+</td>
+<td class="function_name">
 <a class="link" href="libs-GstVaapiDisplay.html#gst-vaapi-display-has-decoder" title="gst_vaapi_display_has_decoder ()">gst_vaapi_display_has_decoder</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
 <td class="function_type">
+<a href="https://developer.gnome.org/glib/unstable/glib-Arrays.html#GArray"><span class="returnvalue">GArray</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libs-GstVaapiDisplay.html#gst-vaapi-display-get-encode-profiles" title="gst_vaapi_display_get_encode_profiles ()">gst_vaapi_display_get_encode_profiles</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
 <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 </td>
 <td class="function_name">
@@ -137,6 +208,14 @@
 </tr>
 <tr>
 <td class="function_type">
+<a href="https://developer.gnome.org/glib/unstable/glib-Arrays.html#GArray"><span class="returnvalue">GArray</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libs-GstVaapiDisplay.html#gst-vaapi-display-get-image-formats" title="gst_vaapi_display_get_image_formats ()">gst_vaapi_display_get_image_formats</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
 <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 </td>
 <td class="function_name">
@@ -145,6 +224,14 @@
 </tr>
 <tr>
 <td class="function_type">
+<a href="https://developer.gnome.org/glib/unstable/glib-Arrays.html#GArray"><span class="returnvalue">GArray</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libs-GstVaapiDisplay.html#gst-vaapi-display-get-subpicture-formats" title="gst_vaapi_display_get_subpicture_formats ()">gst_vaapi_display_get_subpicture_formats</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
 <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 </td>
 <td class="function_name">
@@ -161,10 +248,10 @@
 </tr>
 <tr>
 <td class="function_type">
-<span class="returnvalue">GstVaapiRotation</span>
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 </td>
 <td class="function_name">
-<a class="link" href="libs-GstVaapiDisplay.html#gst-vaapi-display-get-rotation" title="gst_vaapi_display_get_rotation ()">gst_vaapi_display_get_rotation</a> <span class="c_punctuation">()</span>
+<a class="link" href="libs-GstVaapiDisplay.html#gst-vaapi-display-get-property" title="gst_vaapi_display_get_property ()">gst_vaapi_display_get_property</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
@@ -172,7 +259,7 @@
 <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 </td>
 <td class="function_name">
-<a class="link" href="libs-GstVaapiDisplay.html#gst-vaapi-display-set-rotation" title="gst_vaapi_display_set_rotation ()">gst_vaapi_display_set_rotation</a> <span class="c_punctuation">()</span>
+<a class="link" href="libs-GstVaapiDisplay.html#gst-vaapi-display-set-property" title="gst_vaapi_display_set_property ()">gst_vaapi_display_set_property</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
@@ -191,6 +278,37 @@
 <a class="link" href="libs-GstVaapiDisplay.html#gst-vaapi-display-set-render-mode" title="gst_vaapi_display_set_render_mode ()">gst_vaapi_display_set_render_mode</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">GstVaapiRotation</span>
+</td>
+<td class="function_name">
+<a class="link" href="libs-GstVaapiDisplay.html#gst-vaapi-display-get-rotation" title="gst_vaapi_display_get_rotation ()">gst_vaapi_display_get_rotation</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="libs-GstVaapiDisplay.html#gst-vaapi-display-set-rotation" title="gst_vaapi_display_set_rotation ()">gst_vaapi_display_set_rotation</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libs-GstVaapiDisplay.html#gst-vaapi-display-get-vendor-string" title="gst_vaapi_display_get_vendor_string ()">gst_vaapi_display_get_vendor_string</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="libs-GstVaapiDisplay.html#gst-vaapi-display-has-opengl" title="gst_vaapi_display_has_opengl ()">gst_vaapi_display_has_opengl</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
 </tbody>
 </table></div>
 </div>
@@ -201,10 +319,20 @@
 <col width="150px" class="name">
 <col class="description">
 </colgroup>
-<tbody><tr>
+<tbody>
+<tr>
+<td class="datatype_keyword">enum</td>
+<td class="function_name"><a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplayType" title="enum GstVaapiDisplayType">GstVaapiDisplayType</a></td>
+</tr>
+<tr>
 <td class="datatype_keyword"> </td>
 <td class="function_name"><a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay">GstVaapiDisplay</a></td>
-</tr></tbody>
+</tr>
+<tr>
+<td class="datatype_keyword">struct</td>
+<td class="function_name"><a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplayInfo" title="struct GstVaapiDisplayInfo">GstVaapiDisplayInfo</a></td>
+</tr>
+</tbody>
 </table></div>
 </div>
 <div class="refsect1">
@@ -220,7 +348,7 @@
  as the VA
 display.</p>
 <div class="refsect3">
-<a name="id-1.2.4.6.2.5"></a><h4>Parameters</h4>
+<a name="id-1.3.4.6.2.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -235,13 +363,102 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.4.6.2.6"></a><h4>Returns</h4>
+<a name="id-1.3.4.6.2.6"></a><h4>Returns</h4>
 <p> the newly created <a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a> object</p>
 <p></p>
 </div>
 </div>
 <hr>
 <div class="refsect2">
+<a name="gst-vaapi-display-ref"></a><h3>gst_vaapi_display_ref ()</h3>
+<pre class="programlisting"><a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="returnvalue">GstVaapiDisplay</span></a> *
+gst_vaapi_display_ref (<em class="parameter"><code><a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a> *display</code></em>);</pre>
+<p>Atomically increases the reference count of the given <em class="parameter"><code>display</code></em>
+ by one.</p>
+<div class="refsect3">
+<a name="id-1.3.4.6.3.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>display</p></td>
+<td class="parameter_description"><p>a <a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="id-1.3.4.6.3.6"></a><h4>Returns</h4>
+<p> The same <em class="parameter"><code>display</code></em>
+argument</p>
+<p></p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="gst-vaapi-display-unref"></a><h3>gst_vaapi_display_unref ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+gst_vaapi_display_unref (<em class="parameter"><code><a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a> *display</code></em>);</pre>
+<p>Atomically decreases the reference count of the <em class="parameter"><code>display</code></em>
+ by one. If
+the reference count reaches zero, the display will be free'd.</p>
+<div class="refsect3">
+<a name="id-1.3.4.6.4.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>display</p></td>
+<td class="parameter_description"><p>a <a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="gst-vaapi-display-replace"></a><h3>gst_vaapi_display_replace ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+gst_vaapi_display_replace (<em class="parameter"><code><a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a> **old_display_ptr</code></em>,
+                           <em class="parameter"><code><a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a> *new_display</code></em>);</pre>
+<p>Atomically replaces the display display held in <em class="parameter"><code>old_display_ptr</code></em>
+
+with <em class="parameter"><code>new_display</code></em>
+. This means that <em class="parameter"><code>old_display_ptr</code></em>
+ shall reference
+a valid display. However, <em class="parameter"><code>new_display</code></em>
+ can be NULL.</p>
+<div class="refsect3">
+<a name="id-1.3.4.6.5.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>old_display_ptr</p></td>
+<td class="parameter_description"><p>a pointer to a <a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>new_display</p></td>
+<td class="parameter_description"><p>a <a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+<hr>
+<div class="refsect2">
 <a name="gst-vaapi-display-lock"></a><h3>gst_vaapi_display_lock ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
 gst_vaapi_display_lock (<em class="parameter"><code><a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a> *display</code></em>);</pre>
@@ -252,7 +469,7 @@
  is unlocked by the
 other thread.</p>
 <div class="refsect3">
-<a name="id-1.2.4.6.3.5"></a><h4>Parameters</h4>
+<a name="id-1.3.4.6.6.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -279,7 +496,7 @@
 can lock <em class="parameter"><code>display</code></em>
  itself.</p>
 <div class="refsect3">
-<a name="id-1.2.4.6.4.5"></a><h4>Parameters</h4>
+<a name="id-1.3.4.6.7.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -305,7 +522,7 @@
 <p>This is most useful for X11. On windowing systems where requests are
 handled synchronously, this function will do nothing.</p>
 <div class="refsect3">
-<a name="id-1.2.4.6.5.6"></a><h4>Parameters</h4>
+<a name="id-1.3.4.6.8.6"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -329,7 +546,32 @@
 <p>This is most useful for X11. On windowing systems where requests
 are handled synchronously, this function will do nothing.</p>
 <div class="refsect3">
-<a name="id-1.2.4.6.6.6"></a><h4>Parameters</h4>
+<a name="id-1.3.4.6.9.6"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>display</p></td>
+<td class="parameter_description"><p>a <a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="gst-vaapi-display-get-class-type"></a><h3>gst_vaapi_display_get_class_type ()</h3>
+<pre class="programlisting"><a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplayType" title="enum GstVaapiDisplayType"><span class="returnvalue">GstVaapiDisplayType</span></a>
+gst_vaapi_display_get_class_type (<em class="parameter"><code><a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a> *display</code></em>);</pre>
+<p>Returns the <a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplayType" title="enum GstVaapiDisplayType"><span class="type">GstVaapiDisplayType</span></a> of <em class="parameter"><code>display</code></em>
+. This is the type of
+the object, thus the associated class, not the type of the VA
+display.</p>
+<div class="refsect3">
+<a name="id-1.3.4.6.10.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -343,6 +585,51 @@
 </tr></tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="id-1.3.4.6.10.6"></a><h4>Returns</h4>
+<p> the <a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplayType" title="enum GstVaapiDisplayType"><span class="type">GstVaapiDisplayType</span></a></p>
+<p></p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="gst-vaapi-display-get-display-type"></a><h3>gst_vaapi_display_get_display_type ()</h3>
+<pre class="programlisting"><a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplayType" title="enum GstVaapiDisplayType"><span class="returnvalue">GstVaapiDisplayType</span></a>
+gst_vaapi_display_get_display_type (<em class="parameter"><code><a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a> *display</code></em>);</pre>
+<p>Returns the <em class="parameter"><code>display</code></em>
+ name.</p>
+<div class="refsect3">
+<a name="id-1.3.4.6.11.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>display</p></td>
+<td class="parameter_description"><p>a <a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="id-1.3.4.6.11.6"></a><h4>Returns</h4>
+<p> the display name</p>
+<p></p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="gst-vaapi-display-get-display-name"></a><h3>gst_vaapi_display_get_display_name ()</h3>
+<pre class="programlisting">const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *
+gst_vaapi_display_get_display_name (<em class="parameter"><code><a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a> *display</code></em>);</pre>
+<p>
+</p>
+<div class="refsect3">
+<a name="id-1.3.4.6.12.5"></a><h4>Returns</h4>
+<p></p>
+</div>
 </div>
 <hr>
 <div class="refsect2">
@@ -352,7 +639,7 @@
 <p>Returns the <span class="type">VADisplay</span> bound to <em class="parameter"><code>display</code></em>
 .</p>
 <div class="refsect3">
-<a name="id-1.2.4.6.7.5"></a><h4>Parameters</h4>
+<a name="id-1.3.4.6.13.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -367,7 +654,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.4.6.7.6"></a><h4>Returns</h4>
+<a name="id-1.3.4.6.13.6"></a><h4>Returns</h4>
 <p> the <span class="type">VADisplay</span></p>
 <p></p>
 </div>
@@ -379,7 +666,7 @@
 gst_vaapi_display_get_width (<em class="parameter"><code><a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a> *display</code></em>);</pre>
 <p>Retrieves the width of a <a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a>.</p>
 <div class="refsect3">
-<a name="id-1.2.4.6.8.5"></a><h4>Parameters</h4>
+<a name="id-1.3.4.6.14.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -394,7 +681,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.4.6.8.6"></a><h4>Returns</h4>
+<a name="id-1.3.4.6.14.6"></a><h4>Returns</h4>
 <p> the width of the <em class="parameter"><code>display</code></em>
 , in pixels</p>
 <p></p>
@@ -407,7 +694,7 @@
 gst_vaapi_display_get_height (<em class="parameter"><code><a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a> *display</code></em>);</pre>
 <p>Retrieves the height of a <a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a></p>
 <div class="refsect3">
-<a name="id-1.2.4.6.9.5"></a><h4>Parameters</h4>
+<a name="id-1.3.4.6.15.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -422,7 +709,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.4.6.9.6"></a><h4>Returns</h4>
+<a name="id-1.3.4.6.15.6"></a><h4>Returns</h4>
 <p> the height of the <em class="parameter"><code>display</code></em>
 , in pixels</p>
 <p></p>
@@ -437,7 +724,7 @@
                             <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> *pheight</code></em>);</pre>
 <p>Retrieves the dimensions of a <a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a>.</p>
 <div class="refsect3">
-<a name="id-1.2.4.6.10.5"></a><h4>Parameters</h4>
+<a name="id-1.3.4.6.16.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -474,7 +761,7 @@
                                 <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> *par_d</code></em>);</pre>
 <p>Retrieves the pixel aspect ratio of a <a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a>.</p>
 <div class="refsect3">
-<a name="id-1.2.4.6.11.5"></a><h4>Parameters</h4>
+<a name="id-1.3.4.6.17.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -503,6 +790,65 @@
 </div>
 <hr>
 <div class="refsect2">
+<a name="gst-vaapi-display-has-video-processing"></a><h3>gst_vaapi_display_has_video_processing ()</h3>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+gst_vaapi_display_has_video_processing
+                               (<em class="parameter"><code><a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a> *display</code></em>);</pre>
+<p>Checks whether the underlying VA driver implementation supports
+video processing (VPP) acceleration.</p>
+<div class="refsect3">
+<a name="id-1.3.4.6.18.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>display</p></td>
+<td class="parameter_description"><p>a <a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="id-1.3.4.6.18.6"></a><h4>Returns</h4>
+<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if some VPP features are available</p>
+<p></p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="gst-vaapi-display-get-decode-profiles"></a><h3>gst_vaapi_display_get_decode_profiles ()</h3>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Arrays.html#GArray"><span class="returnvalue">GArray</span></a> *
+gst_vaapi_display_get_decode_profiles (<em class="parameter"><code><a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a> *display</code></em>);</pre>
+<p>Gets the supported profiles for decoding. The caller owns an extra
+reference to the resulting array of <a class="link" href="libs-GstVaapiProfile.html#GstVaapiProfile" title="enum GstVaapiProfile"><span class="type">GstVaapiProfile</span></a> elements, so
+it shall be released with <a href="https://developer.gnome.org/glib/unstable/glib-Arrays.html#g-array-unref"><code class="function">g_array_unref()</code></a> after usage.</p>
+<div class="refsect3">
+<a name="id-1.3.4.6.19.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>display</p></td>
+<td class="parameter_description"><p>a <a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="id-1.3.4.6.19.6"></a><h4>Returns</h4>
+<p> a newly allocated <a href="https://developer.gnome.org/glib/unstable/glib-Arrays.html#GArray"><span class="type">GArray</span></a>, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> or error or if
+decoding is not supported at all</p>
+<p></p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
 <a name="gst-vaapi-display-has-decoder"></a><h3>gst_vaapi_display_has_decoder ()</h3>
 <pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 gst_vaapi_display_has_decoder (<em class="parameter"><code><a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a> *display</code></em>,
@@ -514,7 +860,7 @@
 specified <em class="parameter"><code>entrypoint</code></em>
 .</p>
 <div class="refsect3">
-<a name="id-1.2.4.6.12.5"></a><h4>Parameters</h4>
+<a name="id-1.3.4.6.20.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -541,7 +887,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.4.6.12.6"></a><h4>Returns</h4>
+<a name="id-1.3.4.6.20.6"></a><h4>Returns</h4>
 <p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if VA <em class="parameter"><code>display</code></em>
 supports <em class="parameter"><code>profile</code></em>
 for decoding.</p>
@@ -550,6 +896,36 @@
 </div>
 <hr>
 <div class="refsect2">
+<a name="gst-vaapi-display-get-encode-profiles"></a><h3>gst_vaapi_display_get_encode_profiles ()</h3>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Arrays.html#GArray"><span class="returnvalue">GArray</span></a> *
+gst_vaapi_display_get_encode_profiles (<em class="parameter"><code><a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a> *display</code></em>);</pre>
+<p>Gets the supported profiles for encoding. The caller owns an extra
+reference to the resulting array of <a class="link" href="libs-GstVaapiProfile.html#GstVaapiProfile" title="enum GstVaapiProfile"><span class="type">GstVaapiProfile</span></a> elements, so
+it shall be released with <a href="https://developer.gnome.org/glib/unstable/glib-Arrays.html#g-array-unref"><code class="function">g_array_unref()</code></a> after usage.</p>
+<div class="refsect3">
+<a name="id-1.3.4.6.21.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>display</p></td>
+<td class="parameter_description"><p>a <a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="id-1.3.4.6.21.6"></a><h4>Returns</h4>
+<p> a newly allocated <a href="https://developer.gnome.org/glib/unstable/glib-Arrays.html#GArray"><span class="type">GArray</span></a>, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> or error or if
+encoding is not supported at all</p>
+<p></p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
 <a name="gst-vaapi-display-has-encoder"></a><h3>gst_vaapi_display_has_encoder ()</h3>
 <pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 gst_vaapi_display_has_encoder (<em class="parameter"><code><a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a> *display</code></em>,
@@ -561,7 +937,7 @@
 specified <em class="parameter"><code>entrypoint</code></em>
 .</p>
 <div class="refsect3">
-<a name="id-1.2.4.6.13.5"></a><h4>Parameters</h4>
+<a name="id-1.3.4.6.22.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -588,7 +964,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.4.6.13.6"></a><h4>Returns</h4>
+<a name="id-1.3.4.6.22.6"></a><h4>Returns</h4>
 <p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if VA <em class="parameter"><code>display</code></em>
 supports <em class="parameter"><code>profile</code></em>
 for encoding.</p>
@@ -597,6 +973,44 @@
 </div>
 <hr>
 <div class="refsect2">
+<a name="gst-vaapi-display-get-image-formats"></a><h3>gst_vaapi_display_get_image_formats ()</h3>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Arrays.html#GArray"><span class="returnvalue">GArray</span></a> *
+gst_vaapi_display_get_image_formats (<em class="parameter"><code><a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a> *display</code></em>);</pre>
+<p>Gets the supported image formats for <a class="link" href="libs-gstvaapisurface.html#gst-vaapi-surface-get-image" title="gst_vaapi_surface_get_image ()"><code class="function">gst_vaapi_surface_get_image()</code></a>
+or <a class="link" href="libs-gstvaapisurface.html#gst-vaapi-surface-put-image" title="gst_vaapi_surface_put_image ()"><code class="function">gst_vaapi_surface_put_image()</code></a>.</p>
+<p>Note that this method does not necessarily map image formats
+returned by <code class="function">vaQueryImageFormats()</code>. The set of capabilities can be
+stripped down, if gstreamer-vaapi does not support the format, or
+expanded to cover compatible formats not exposed by the underlying
+driver. e.g. I420 can be supported even if the driver only exposes
+YV12.</p>
+<p>Note: the caller owns an extra reference to the resulting array of
+<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gst-plugins-base-libs/html/gst-plugins-base-libs-gstvideo.html#GstVideoFormat"><span class="type">GstVideoFormat</span></a> elements, so it shall be released with
+<a href="https://developer.gnome.org/glib/unstable/glib-Arrays.html#g-array-unref"><code class="function">g_array_unref()</code></a> after usage.</p>
+<div class="refsect3">
+<a name="id-1.3.4.6.23.7"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>display</p></td>
+<td class="parameter_description"><p>a <a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="id-1.3.4.6.23.8"></a><h4>Returns</h4>
+<p> a newly allocated <a href="https://developer.gnome.org/glib/unstable/glib-Arrays.html#GArray"><span class="type">GArray</span></a>, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> on error or if
+the set is empty</p>
+<p></p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
 <a name="gst-vaapi-display-has-image-format"></a><h3>gst_vaapi_display_has_image_format ()</h3>
 <pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 gst_vaapi_display_has_image_format (<em class="parameter"><code><a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a> *display</code></em>,
@@ -605,7 +1019,7 @@
  supports <em class="parameter"><code>format</code></em>
  image format.</p>
 <div class="refsect3">
-<a name="id-1.2.4.6.14.5"></a><h4>Parameters</h4>
+<a name="id-1.3.4.6.24.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -627,7 +1041,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.4.6.14.6"></a><h4>Returns</h4>
+<a name="id-1.3.4.6.24.6"></a><h4>Returns</h4>
 <p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if VA <em class="parameter"><code>display</code></em>
 supports <em class="parameter"><code>format</code></em>
 image format</p>
@@ -636,6 +1050,42 @@
 </div>
 <hr>
 <div class="refsect2">
+<a name="gst-vaapi-display-get-subpicture-formats"></a><h3>gst_vaapi_display_get_subpicture_formats ()</h3>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Arrays.html#GArray"><span class="returnvalue">GArray</span></a> *
+gst_vaapi_display_get_subpicture_formats
+                               (<em class="parameter"><code><a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a> *display</code></em>);</pre>
+<p>Gets the supported subpicture formats.</p>
+<p>Note that this method does not necessarily map subpicture formats
+returned by <code class="function">vaQuerySubpictureFormats()</code>. The set of capabilities can
+be stripped down if gstreamer-vaapi does not support the
+format. e.g. this is the case for paletted formats like IA44.</p>
+<p>Note: the caller owns an extra reference to the resulting array of
+<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gst-plugins-base-libs/html/gst-plugins-base-libs-gstvideo.html#GstVideoFormat"><span class="type">GstVideoFormat</span></a> elements, so it shall be released with
+<a href="https://developer.gnome.org/glib/unstable/glib-Arrays.html#g-array-unref"><code class="function">g_array_unref()</code></a> after usage.</p>
+<div class="refsect3">
+<a name="id-1.3.4.6.25.7"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>display</p></td>
+<td class="parameter_description"><p>a <a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="id-1.3.4.6.25.8"></a><h4>Returns</h4>
+<p> a newly allocated <a href="https://developer.gnome.org/glib/unstable/glib-Arrays.html#GArray"><span class="type">GArray</span></a>, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> on error of if
+the set is empty</p>
+<p></p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
 <a name="gst-vaapi-display-has-subpicture-format"></a><h3>gst_vaapi_display_has_subpicture_format ()</h3>
 <pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 gst_vaapi_display_has_subpicture_format
@@ -648,7 +1098,7 @@
 the supplied <em class="parameter"><code>flags</code></em>
 .</p>
 <div class="refsect3">
-<a name="id-1.2.4.6.15.5"></a><h4>Parameters</h4>
+<a name="id-1.3.4.6.26.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -675,7 +1125,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.4.6.15.6"></a><h4>Returns</h4>
+<a name="id-1.3.4.6.26.6"></a><h4>Returns</h4>
 <p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if VA <em class="parameter"><code>display</code></em>
 supports <em class="parameter"><code>format</code></em>
 subpicture format</p>
@@ -695,7 +1145,7 @@
 application may perform this check only once and cache this
 information.</p>
 <div class="refsect3">
-<a name="id-1.2.4.6.16.5"></a><h4>Parameters</h4>
+<a name="id-1.3.4.6.27.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -717,7 +1167,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.4.6.16.6"></a><h4>Returns</h4>
+<a name="id-1.3.4.6.27.6"></a><h4>Returns</h4>
 <p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if VA <em class="parameter"><code>display</code></em>
 supports property <em class="parameter"><code>name</code></em>
 </p>
@@ -726,6 +1176,114 @@
 </div>
 <hr>
 <div class="refsect2">
+<a name="gst-vaapi-display-get-property"></a><h3>gst_vaapi_display_get_property ()</h3>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+gst_vaapi_display_get_property (<em class="parameter"><code><a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a> *display</code></em>,
+                                <em class="parameter"><code>const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *name</code></em>,
+                                <em class="parameter"><code><a href="https://developer.gnome.org/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *out_value</code></em>);</pre>
+<p>
+</p>
+<div class="refsect3">
+<a name="id-1.3.4.6.28.5"></a><h4>Returns</h4>
+<p></p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="gst-vaapi-display-set-property"></a><h3>gst_vaapi_display_set_property ()</h3>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+gst_vaapi_display_set_property (<em class="parameter"><code><a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a> *display</code></em>,
+                                <em class="parameter"><code>const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *name</code></em>,
+                                <em class="parameter"><code>const <a href="https://developer.gnome.org/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *value</code></em>);</pre>
+<p>
+</p>
+<div class="refsect3">
+<a name="id-1.3.4.6.29.5"></a><h4>Returns</h4>
+<p></p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="gst-vaapi-display-get-render-mode"></a><h3>gst_vaapi_display_get_render_mode ()</h3>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+gst_vaapi_display_get_render_mode (<em class="parameter"><code><a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a> *display</code></em>,
+                                   <em class="parameter"><code><span class="type">GstVaapiRenderMode</span> *pmode</code></em>);</pre>
+<p>Returns the current VA <em class="parameter"><code>display</code></em>
+ rendering mode.</p>
+<div class="refsect3">
+<a name="id-1.3.4.6.30.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>display</p></td>
+<td class="parameter_description"><p>a <a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>pmode</p></td>
+<td class="parameter_description"><p>return location for the VA <em class="parameter"><code>display</code></em>
+rendering mode</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="id-1.3.4.6.30.6"></a><h4>Returns</h4>
+<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if VA <em class="parameter"><code>display</code></em>
+rendering mode could be determined</p>
+<p></p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="gst-vaapi-display-set-render-mode"></a><h3>gst_vaapi_display_set_render_mode ()</h3>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+gst_vaapi_display_set_render_mode (<em class="parameter"><code><a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a> *display</code></em>,
+                                   <em class="parameter"><code><span class="type">GstVaapiRenderMode</span> mode</code></em>);</pre>
+<p>Sets the VA <em class="parameter"><code>display</code></em>
+ rendering mode to the supplied <em class="parameter"><code>mode</code></em>
+. This
+function returns <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> if the rendering mode could not be set,
+e.g. run-time switching rendering mode is not supported.</p>
+<div class="refsect3">
+<a name="id-1.3.4.6.31.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>display</p></td>
+<td class="parameter_description"><p>a <a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>mode</p></td>
+<td class="parameter_description"><p>the <span class="type">GstVaapiRenderMode</span> to set</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="id-1.3.4.6.31.6"></a><h4>Returns</h4>
+<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if VA <em class="parameter"><code>display</code></em>
+rendering <em class="parameter"><code>mode</code></em>
+could be changed
+to the requested value</p>
+<p></p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
 <a name="gst-vaapi-display-get-rotation"></a><h3>gst_vaapi_display_get_rotation ()</h3>
 <pre class="programlisting"><span class="returnvalue">GstVaapiRotation</span>
 gst_vaapi_display_get_rotation (<em class="parameter"><code><a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a> *display</code></em>);</pre>
@@ -734,7 +1292,7 @@
 does not support "rotation" display attribute, then the display is
 assumed to be un-rotated.</p>
 <div class="refsect3">
-<a name="id-1.2.4.6.17.5"></a><h4>Parameters</h4>
+<a name="id-1.3.4.6.32.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -749,7 +1307,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.4.6.17.6"></a><h4>Returns</h4>
+<a name="id-1.3.4.6.32.6"></a><h4>Returns</h4>
 <p> the current <span class="type">GstVaapiRotation</span> value</p>
 <p></p>
 </div>
@@ -767,7 +1325,7 @@
 be set, e.g. the VA driver does not allow to change the display
 rotation angle.</p>
 <div class="refsect3">
-<a name="id-1.2.4.6.18.5"></a><h4>Parameters</h4>
+<a name="id-1.3.4.6.33.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -789,7 +1347,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.4.6.18.6"></a><h4>Returns</h4>
+<a name="id-1.3.4.6.33.6"></a><h4>Returns</h4>
 <p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if VA <em class="parameter"><code>display</code></em>
 rotation angle could be changed
 to the requested value</p>
@@ -798,81 +1356,64 @@
 </div>
 <hr>
 <div class="refsect2">
-<a name="gst-vaapi-display-get-render-mode"></a><h3>gst_vaapi_display_get_render_mode ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
-gst_vaapi_display_get_render_mode (<em class="parameter"><code><a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a> *display</code></em>,
-                                   <em class="parameter"><code><span class="type">GstVaapiRenderMode</span> *pmode</code></em>);</pre>
-<p>Returns the current VA <em class="parameter"><code>display</code></em>
- rendering mode.</p>
+<a name="gst-vaapi-display-get-vendor-string"></a><h3>gst_vaapi_display_get_vendor_string ()</h3>
+<pre class="programlisting">const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *
+gst_vaapi_display_get_vendor_string (<em class="parameter"><code><a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a> *display</code></em>);</pre>
+<p>Returns the VA driver vendor string attached to the supplied VA <em class="parameter"><code>display</code></em>
+.
+The <em class="parameter"><code>display</code></em>
+ owns the vendor string, do *not* de-allocate it.</p>
+<p>This function is thread safe.</p>
 <div class="refsect3">
-<a name="id-1.2.4.6.19.5"></a><h4>Parameters</h4>
+<a name="id-1.3.4.6.34.6"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
 <col class="parameters_description">
 <col width="200px" class="parameters_annotations">
 </colgroup>
-<tbody>
-<tr>
+<tbody><tr>
 <td class="parameter_name"><p>display</p></td>
 <td class="parameter_description"><p>a <a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a></p></td>
 <td class="parameter_annotations"> </td>
-</tr>
-<tr>
-<td class="parameter_name"><p>pmode</p></td>
-<td class="parameter_description"><p>return location for the VA <em class="parameter"><code>display</code></em>
-rendering mode</p></td>
-<td class="parameter_annotations"> </td>
-</tr>
-</tbody>
+</tr></tbody>
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.4.6.19.6"></a><h4>Returns</h4>
-<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if VA <em class="parameter"><code>display</code></em>
-rendering mode could be determined</p>
+<a name="id-1.3.4.6.34.7"></a><h4>Returns</h4>
+<p> the current <span class="type">GstVaapiRotation</span> value</p>
 <p></p>
 </div>
 </div>
 <hr>
 <div class="refsect2">
-<a name="gst-vaapi-display-set-render-mode"></a><h3>gst_vaapi_display_set_render_mode ()</h3>
+<a name="gst-vaapi-display-has-opengl"></a><h3>gst_vaapi_display_has_opengl ()</h3>
 <pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
-gst_vaapi_display_set_render_mode (<em class="parameter"><code><a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a> *display</code></em>,
-                                   <em class="parameter"><code><span class="type">GstVaapiRenderMode</span> mode</code></em>);</pre>
-<p>Sets the VA <em class="parameter"><code>display</code></em>
- rendering mode to the supplied <em class="parameter"><code>mode</code></em>
-. This
-function returns <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> if the rendering mode could not be set,
-e.g. run-time switching rendering mode is not supported.</p>
+gst_vaapi_display_has_opengl (<em class="parameter"><code><a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a> *display</code></em>);</pre>
+<p>Returns wether the <em class="parameter"><code>display</code></em>
+ that was created does support OpenGL
+context to be attached.</p>
+<p>This function is thread safe.</p>
 <div class="refsect3">
-<a name="id-1.2.4.6.20.5"></a><h4>Parameters</h4>
+<a name="id-1.3.4.6.35.6"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
 <col class="parameters_description">
 <col width="200px" class="parameters_annotations">
 </colgroup>
-<tbody>
-<tr>
+<tbody><tr>
 <td class="parameter_name"><p>display</p></td>
 <td class="parameter_description"><p>a <a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a></p></td>
 <td class="parameter_annotations"> </td>
-</tr>
-<tr>
-<td class="parameter_name"><p>mode</p></td>
-<td class="parameter_description"><p>the <span class="type">GstVaapiRenderMode</span> to set</p></td>
-<td class="parameter_annotations"> </td>
-</tr>
-</tbody>
+</tr></tbody>
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.4.6.20.6"></a><h4>Returns</h4>
-<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if VA <em class="parameter"><code>display</code></em>
-rendering <em class="parameter"><code>mode</code></em>
-could be changed
-to the requested value</p>
+<a name="id-1.3.4.6.35.7"></a><h4>Returns</h4>
+<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the <em class="parameter"><code>display</code></em>
+supports OpenGL context, <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a>
+otherwise</p>
 <p></p>
 </div>
 </div>
@@ -880,10 +1421,81 @@
 <div class="refsect1">
 <a name="libs-GstVaapiDisplay.other_details"></a><h2>Types and Values</h2>
 <div class="refsect2">
+<a name="GstVaapiDisplayType"></a><h3>enum GstVaapiDisplayType</h3>
+<div class="refsect3">
+<a name="id-1.3.4.7.2.3"></a><h4>Members</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="300px" class="enum_members_name">
+<col class="enum_members_description">
+<col width="200px" class="enum_members_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="enum_member_name"><p><a name="GST-VAAPI-DISPLAY-TYPE-ANY:CAPS"></a>GST_VAAPI_DISPLAY_TYPE_ANY</p></td>
+<td class="enum_member_description">
+<p>Automatic detection of the display type.</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="GST-VAAPI-DISPLAY-TYPE-X11:CAPS"></a>GST_VAAPI_DISPLAY_TYPE_X11</p></td>
+<td class="enum_member_description">
+<p>VA/X11 display.</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="GST-VAAPI-DISPLAY-TYPE-GLX:CAPS"></a>GST_VAAPI_DISPLAY_TYPE_GLX</p></td>
+<td class="enum_member_description">
+<p>VA/GLX display.</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="GST-VAAPI-DISPLAY-TYPE-WAYLAND:CAPS"></a>GST_VAAPI_DISPLAY_TYPE_WAYLAND</p></td>
+<td class="enum_member_description">
+<p>VA/Wayland display.</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="GST-VAAPI-DISPLAY-TYPE-DRM:CAPS"></a>GST_VAAPI_DISPLAY_TYPE_DRM</p></td>
+<td class="enum_member_description">
+<p>VA/DRM display.</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="GST-VAAPI-DISPLAY-TYPE-EGL:CAPS"></a>GST_VAAPI_DISPLAY_TYPE_EGL</p></td>
+<td class="enum_member_description">
+<p>VA/EGL display.</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+<hr>
+<div class="refsect2">
 <a name="GstVaapiDisplay"></a><h3>GstVaapiDisplay</h3>
 <pre class="programlisting">typedef struct _GstVaapiDisplay GstVaapiDisplay;</pre>
 <p>Base class for VA displays.</p>
 </div>
+<hr>
+<div class="refsect2">
+<a name="GstVaapiDisplayInfo"></a><h3>struct GstVaapiDisplayInfo</h3>
+<pre class="programlisting">struct GstVaapiDisplayInfo {
+  GstVaapiDisplay *display;
+  GstVaapiDisplayType display_type;
+  gchar *display_name;
+  VADisplay va_display;
+  gpointer native_display;
+};
+</pre>
+<p>Generic class to retrieve VA display info</p>
+</div>
 </div>
 </div>
 <div class="footer">
diff -Nru gstreamer-vaapi-0.5.10/docs/reference/libs/html/libs-GstVaapiDisplayWayland.html gstreamer-vaapi-0.6.0/docs/reference/libs/html/libs-GstVaapiDisplayWayland.html
--- gstreamer-vaapi-0.5.10/docs/reference/libs/html/libs-GstVaapiDisplayWayland.html	1970-01-01 00:00:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/docs/reference/libs/html/libs-GstVaapiDisplayWayland.html	2015-07-15 12:52:27.000000000 +0000
@@ -0,0 +1,173 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>GStreamer VA-API Plugins 1.4 Library Reference Manual: GstVaapiDisplayWayland</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="GStreamer VA-API Plugins 1.4 Library Reference Manual">
+<link rel="up" href="ch01.html" title="gst-plugins-vaapi Library">
+<link rel="prev" href="libs-GstVaapiDisplayDRM.html" title="GstVaapiDisplayDRM">
+<link rel="next" href="libs-GstVaapiWindow.html" title="GstVaapiWindow">
+<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts">
+<a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
+                  <a href="#libs-GstVaapiDisplayWayland.description" class="shortcut">Description</a></span>
+</td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><a accesskey="u" href="ch01.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="libs-GstVaapiDisplayDRM.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="libs-GstVaapiWindow.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+</tr></table>
+<div class="refentry">
+<a name="libs-GstVaapiDisplayWayland"></a><div class="titlepage"></div>
+<div class="refnamediv"><table width="100%"><tr>
+<td valign="top">
+<h2><span class="refentrytitle"><a name="libs-GstVaapiDisplayWayland.top_of_page"></a>GstVaapiDisplayWayland</span></h2>
+<p>GstVaapiDisplayWayland — VA/Wayland display abstraction</p>
+</td>
+<td class="gallery_image" valign="top" align="right"></td>
+</tr></table></div>
+<div class="refsect1">
+<a name="libs-GstVaapiDisplayWayland.functions"></a><h2>Functions</h2>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="functions_return">
+<col class="functions_name">
+</colgroup>
+<tbody>
+<tr>
+<td class="function_type">
+<a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="returnvalue">GstVaapiDisplay</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libs-GstVaapiDisplayWayland.html#gst-vaapi-display-wayland-new" title="gst_vaapi_display_wayland_new ()">gst_vaapi_display_wayland_new</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="returnvalue">GstVaapiDisplay</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libs-GstVaapiDisplayWayland.html#gst-vaapi-display-wayland-new-with-display" title="gst_vaapi_display_wayland_new_with_display ()">gst_vaapi_display_wayland_new_with_display</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">struct <span class="returnvalue">wl_display</span> *
+</td>
+<td class="function_name">
+<a class="link" href="libs-GstVaapiDisplayWayland.html#gst-vaapi-display-wayland-get-display" title="gst_vaapi_display_wayland_get_display ()">gst_vaapi_display_wayland_get_display</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="libs-GstVaapiDisplayWayland.description"></a><h2>Description</h2>
+</div>
+<div class="refsect1">
+<a name="libs-GstVaapiDisplayWayland.functions_details"></a><h2>Functions</h2>
+<div class="refsect2">
+<a name="gst-vaapi-display-wayland-new"></a><h3>gst_vaapi_display_wayland_new ()</h3>
+<pre class="programlisting"><a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="returnvalue">GstVaapiDisplay</span></a> *
+gst_vaapi_display_wayland_new (<em class="parameter"><code>const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *display_name</code></em>);</pre>
+<p>Opens an Wayland <span class="type">wl_display</span> using <em class="parameter"><code>display_name</code></em>
+ and returns a
+newly allocated <a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a> object. The Wayland display will
+be cloed when the reference count of the object reaches zero.</p>
+<div class="refsect3">
+<a name="id-1.3.9.5.2.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>display_name</p></td>
+<td class="parameter_description"><p>the Wayland display name</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="id-1.3.9.5.2.6"></a><h4>Returns</h4>
+<p> a newly allocated <a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a> object</p>
+<p></p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="gst-vaapi-display-wayland-new-with-display"></a><h3>gst_vaapi_display_wayland_new_with_display ()</h3>
+<pre class="programlisting"><a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="returnvalue">GstVaapiDisplay</span></a> *
+gst_vaapi_display_wayland_new_with_display
+                               (<em class="parameter"><code><span class="type">struct wl_display</span> *wl_display</code></em>);</pre>
+<p>Creates a <a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a> based on the Wayland <em class="parameter"><code>wl_display</code></em>
+
+display. The caller still owns the display and must call
+<code class="function">wl_display_disconnect()</code> when all <a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a> references are
+released. Doing so too early can yield undefined behaviour.</p>
+<div class="refsect3">
+<a name="id-1.3.9.5.3.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>wl_display</p></td>
+<td class="parameter_description"><p>an Wayland <span class="type">wl_display</span></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="id-1.3.9.5.3.6"></a><h4>Returns</h4>
+<p> a newly allocated <a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a> object</p>
+<p></p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="gst-vaapi-display-wayland-get-display"></a><h3>gst_vaapi_display_wayland_get_display ()</h3>
+<pre class="programlisting">struct <span class="returnvalue">wl_display</span> *
+gst_vaapi_display_wayland_get_display (<em class="parameter"><code><span class="type">GstVaapiDisplayWayland</span> *display</code></em>);</pre>
+<p>Returns the underlying Wayland <span class="type">wl_display</span> that was created by
+<a class="link" href="libs-GstVaapiDisplayWayland.html#gst-vaapi-display-wayland-new" title="gst_vaapi_display_wayland_new ()"><code class="function">gst_vaapi_display_wayland_new()</code></a> or that was bound from
+<a class="link" href="libs-GstVaapiDisplayWayland.html#gst-vaapi-display-wayland-new-with-display" title="gst_vaapi_display_wayland_new_with_display ()"><code class="function">gst_vaapi_display_wayland_new_with_display()</code></a>.</p>
+<div class="refsect3">
+<a name="id-1.3.9.5.4.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>display</p></td>
+<td class="parameter_description"><p>a <span class="type">GstVaapiDisplayWayland</span></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="id-1.3.9.5.4.6"></a><h4>Returns</h4>
+<p> the Wayland <span class="type">wl_display</span> attached to <em class="parameter"><code>display</code></em>
+</p>
+<p></p>
+</div>
+</div>
+</div>
+<div class="refsect1">
+<a name="libs-GstVaapiDisplayWayland.other_details"></a><h2>Types and Values</h2>
+</div>
+</div>
+<div class="footer">
+<hr>
+          Generated by GTK-Doc V1.21</div>
+</body>
+</html>
\ No newline at end of file
diff -Nru gstreamer-vaapi-0.5.10/docs/reference/libs/html/libs-GstVaapiDisplayX11.html gstreamer-vaapi-0.6.0/docs/reference/libs/html/libs-GstVaapiDisplayX11.html
--- gstreamer-vaapi-0.5.10/docs/reference/libs/html/libs-GstVaapiDisplayX11.html	2015-02-03 08:45:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/docs/reference/libs/html/libs-GstVaapiDisplayX11.html	2015-07-15 12:52:27.000000000 +0000
@@ -101,7 +101,7 @@
 allocated <a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a> object. The X11 display will be cloed
 when the reference count of the object reaches zero.</p>
 <div class="refsect3">
-<a name="id-1.2.5.6.2.5"></a><h4>Parameters</h4>
+<a name="id-1.3.5.6.2.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -116,7 +116,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.5.6.2.6"></a><h4>Returns</h4>
+<a name="id-1.3.5.6.2.6"></a><h4>Returns</h4>
 <p> a newly allocated <a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a> object</p>
 <p></p>
 </div>
@@ -133,7 +133,7 @@
 <code class="function">XCloseDisplay()</code> when all <a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a> references are
 released. Doing so too early can yield undefined behaviour.</p>
 <div class="refsect3">
-<a name="id-1.2.5.6.3.5"></a><h4>Parameters</h4>
+<a name="id-1.3.5.6.3.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -148,7 +148,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.5.6.3.6"></a><h4>Returns</h4>
+<a name="id-1.3.5.6.3.6"></a><h4>Returns</h4>
 <p> a newly allocated <a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a> object</p>
 <p></p>
 </div>
@@ -162,7 +162,7 @@
 <a class="link" href="libs-GstVaapiDisplayX11.html#gst-vaapi-display-x11-new" title="gst_vaapi_display_x11_new ()"><code class="function">gst_vaapi_display_x11_new()</code></a> or that was bound from
 <a class="link" href="libs-GstVaapiDisplayX11.html#gst-vaapi-display-x11-new-with-display" title="gst_vaapi_display_x11_new_with_display ()"><code class="function">gst_vaapi_display_x11_new_with_display()</code></a>.</p>
 <div class="refsect3">
-<a name="id-1.2.5.6.4.5"></a><h4>Parameters</h4>
+<a name="id-1.3.5.6.4.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -177,7 +177,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.5.6.4.6"></a><h4>Returns</h4>
+<a name="id-1.3.5.6.4.6"></a><h4>Returns</h4>
 <p> the X11 <span class="type">Display</span> attached to <em class="parameter"><code>display</code></em>
 </p>
 <p></p>
@@ -192,7 +192,7 @@
 <a class="link" href="libs-GstVaapiDisplayX11.html#gst-vaapi-display-x11-new" title="gst_vaapi_display_x11_new ()"><code class="function">gst_vaapi_display_x11_new()</code></a> or that was bound from
 <a class="link" href="libs-GstVaapiDisplayX11.html#gst-vaapi-display-x11-new-with-display" title="gst_vaapi_display_x11_new_with_display ()"><code class="function">gst_vaapi_display_x11_new_with_display()</code></a>.</p>
 <div class="refsect3">
-<a name="id-1.2.5.6.5.5"></a><h4>Parameters</h4>
+<a name="id-1.3.5.6.5.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -207,7 +207,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.5.6.5.6"></a><h4>Returns</h4>
+<a name="id-1.3.5.6.5.6"></a><h4>Returns</h4>
 <p> the X11 <span class="type">Display</span> attached to <em class="parameter"><code>display</code></em>
 </p>
 <p></p>
diff -Nru gstreamer-vaapi-0.5.10/docs/reference/libs/html/libs-GstVaapiFilter.html gstreamer-vaapi-0.6.0/docs/reference/libs/html/libs-GstVaapiFilter.html
--- gstreamer-vaapi-0.5.10/docs/reference/libs/html/libs-GstVaapiFilter.html	2015-02-03 08:45:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/docs/reference/libs/html/libs-GstVaapiFilter.html	2015-07-15 12:52:27.000000000 +0000
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="GStreamer VA-API Plugins 1.4 Library Reference Manual">
 <link rel="up" href="ch01.html" title="gst-plugins-vaapi Library">
 <link rel="prev" href="libs-GstVaapiSurfaceProxy.html" title="GstVaapiSurfaceProxy">
-<link rel="next" href="object-tree.html" title="Object Hierarchy">
+<link rel="next" href="libs-GstVaapiValue.html" title="GstVaapiValue">
 <meta name="generator" content="GTK-Doc V1.21 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
@@ -20,7 +20,7 @@
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
 <td><a accesskey="u" href="ch01.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
 <td><a accesskey="p" href="libs-GstVaapiSurfaceProxy.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
-<td><a accesskey="n" href="object-tree.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+<td><a accesskey="n" href="libs-GstVaapiValue.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
 </tr></table>
 <div class="refentry">
 <a name="libs-GstVaapiFilter"></a><div class="titlepage"></div>
@@ -164,7 +164,7 @@
 <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 </td>
 <td class="function_name">
-<a class="link" href="libs-GstVaapiFilter.html#gst-vaapi-filter-set-saturation" title="gst_vaapi_filter_set_saturation ()">gst_vaapi_filter_set_saturation</a> <span class="c_punctuation">()</span>
+<a class="link" href="libs-GstVaapiFilter.html#gst-vaapi-filter-set-brightness" title="gst_vaapi_filter_set_brightness ()">gst_vaapi_filter_set_brightness</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
@@ -172,7 +172,7 @@
 <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 </td>
 <td class="function_name">
-<a class="link" href="libs-GstVaapiFilter.html#gst-vaapi-filter-set-brightness" title="gst_vaapi_filter_set_brightness ()">gst_vaapi_filter_set_brightness</a> <span class="c_punctuation">()</span>
+<a class="link" href="libs-GstVaapiFilter.html#gst-vaapi-filter-set-saturation" title="gst_vaapi_filter_set_saturation ()">gst_vaapi_filter_set_saturation</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
@@ -201,10 +201,16 @@
 <col width="150px" class="name">
 <col class="description">
 </colgroup>
-<tbody><tr>
+<tbody>
+<tr>
 <td class="datatype_keyword"> </td>
 <td class="function_name"><a class="link" href="libs-GstVaapiFilter.html#GstVaapiFilter" title="GstVaapiFilter">GstVaapiFilter</a></td>
-</tr></tbody>
+</tr>
+<tr>
+<td class="datatype_keyword">enum</td>
+<td class="function_name"><a class="link" href="libs-GstVaapiFilter.html#GstVaapiFilterOp" title="enum GstVaapiFilterOp">GstVaapiFilterOp</a></td>
+</tr>
+</tbody>
 </table></div>
 </div>
 <div class="refsect1">
@@ -221,7 +227,7 @@
 <p>Creates a new <a class="link" href="libs-GstVaapiFilter.html#GstVaapiFilter" title="GstVaapiFilter"><span class="type">GstVaapiFilter</span></a> set up to operate in "identity"
 mode. This means that no other operation than scaling is performed.</p>
 <div class="refsect3">
-<a name="id-1.2.28.6.2.5"></a><h4>Parameters</h4>
+<a name="id-1.3.39.6.2.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -236,7 +242,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.28.6.2.6"></a><h4>Returns</h4>
+<a name="id-1.3.39.6.2.6"></a><h4>Returns</h4>
 <p> the newly created <a class="link" href="libs-GstVaapiFilter.html#GstVaapiFilter" title="GstVaapiFilter"><span class="type">GstVaapiFilter</span></a> object</p>
 <p></p>
 </div>
@@ -249,7 +255,7 @@
 <p>Atomically increases the reference count of the given <em class="parameter"><code>filter</code></em>
  by one.</p>
 <div class="refsect3">
-<a name="id-1.2.28.6.3.5"></a><h4>Parameters</h4>
+<a name="id-1.3.39.6.3.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -264,7 +270,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.28.6.3.6"></a><h4>Returns</h4>
+<a name="id-1.3.39.6.3.6"></a><h4>Returns</h4>
 <p> The same <em class="parameter"><code>filter</code></em>
 argument</p>
 <p></p>
@@ -279,7 +285,7 @@
  by one. If
 the reference count reaches zero, the filter will be free'd.</p>
 <div class="refsect3">
-<a name="id-1.2.28.6.4.5"></a><h4>Parameters</h4>
+<a name="id-1.3.39.6.4.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -308,7 +314,7 @@
 valid filter. However, <em class="parameter"><code>new_filter</code></em>
  can be NULL.</p>
 <div class="refsect3">
-<a name="id-1.2.28.6.5.5"></a><h4>Parameters</h4>
+<a name="id-1.3.39.6.5.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -343,7 +349,7 @@
  is <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>, then this function returns the video
 processing operations supported by this library.</p>
 <div class="refsect3">
-<a name="id-1.2.28.6.6.6"></a><h4>Parameters</h4>
+<a name="id-1.3.39.6.6.6"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -358,7 +364,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.28.6.6.7"></a><h4>Returns</h4>
+<a name="id-1.3.39.6.6.7"></a><h4>Returns</h4>
 <p> the set of supported operations, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if an error
 occurred.</p>
 <p></p>
@@ -374,7 +380,7 @@
 array of <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gst-plugins-base-libs/html/gst-plugins-base-libs-gstvideo.html#GstVideoFormat"><span class="type">GstVideoFormat</span></a> elements, so it shall be released with
 <a href="https://developer.gnome.org/glib/unstable/glib-Arrays.html#g-array-unref"><code class="function">g_array_unref()</code></a> after usage.</p>
 <div class="refsect3">
-<a name="id-1.2.28.6.7.5"></a><h4>Parameters</h4>
+<a name="id-1.3.39.6.7.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -389,7 +395,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.28.6.7.6"></a><h4>Returns</h4>
+<a name="id-1.3.39.6.7.6"></a><h4>Returns</h4>
 <p> the set of supported target formats for video processing.</p>
 <p></p>
 </div>
@@ -399,12 +405,12 @@
 <a name="gst-vaapi-filter-has-operation"></a><h3>gst_vaapi_filter_has_operation ()</h3>
 <pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 gst_vaapi_filter_has_operation (<em class="parameter"><code><a class="link" href="libs-GstVaapiFilter.html#GstVaapiFilter" title="GstVaapiFilter"><span class="type">GstVaapiFilter</span></a> *filter</code></em>,
-                                <em class="parameter"><code><span class="type">GstVaapiFilterOp</span> op</code></em>);</pre>
+                                <em class="parameter"><code><a class="link" href="libs-GstVaapiFilter.html#GstVaapiFilterOp" title="enum GstVaapiFilterOp"><span class="type">GstVaapiFilterOp</span></a> op</code></em>);</pre>
 <p>Determines whether the underlying VA driver advertises support for
 the supplied operation <em class="parameter"><code>op</code></em>
 .</p>
 <div class="refsect3">
-<a name="id-1.2.28.6.8.5"></a><h4>Parameters</h4>
+<a name="id-1.3.39.6.8.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -419,14 +425,14 @@
 </tr>
 <tr>
 <td class="parameter_name"><p>op</p></td>
-<td class="parameter_description"><p>a <span class="type">GstVaapiFilterOp</span></p></td>
+<td class="parameter_description"><p>a <a class="link" href="libs-GstVaapiFilter.html#GstVaapiFilterOp" title="enum GstVaapiFilterOp"><span class="type">GstVaapiFilterOp</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.28.6.8.6"></a><h4>Returns</h4>
+<a name="id-1.3.39.6.8.6"></a><h4>Returns</h4>
 <p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the specified operation may be supported by
 the underlying hardware, <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> otherwise</p>
 <p></p>
@@ -437,7 +443,7 @@
 <a name="gst-vaapi-filter-use-operation"></a><h3>gst_vaapi_filter_use_operation ()</h3>
 <pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 gst_vaapi_filter_use_operation (<em class="parameter"><code><a class="link" href="libs-GstVaapiFilter.html#GstVaapiFilter" title="GstVaapiFilter"><span class="type">GstVaapiFilter</span></a> *filter</code></em>,
-                                <em class="parameter"><code><span class="type">GstVaapiFilterOp</span> op</code></em>);</pre>
+                                <em class="parameter"><code><a class="link" href="libs-GstVaapiFilter.html#GstVaapiFilterOp" title="enum GstVaapiFilterOp"><span class="type">GstVaapiFilterOp</span></a> op</code></em>);</pre>
 <p>Determines whether the supplied operation <em class="parameter"><code>op</code></em>
  was already enabled
 through a prior call to <a class="link" href="libs-GstVaapiFilter.html#gst-vaapi-filter-set-operation" title="gst_vaapi_filter_set_operation ()"><code class="function">gst_vaapi_filter_set_operation()</code></a> or any
@@ -445,7 +451,7 @@
 <p>Note: should an operation be set to its default value, this means
 that it is actually not enabled.</p>
 <div class="refsect3">
-<a name="id-1.2.28.6.9.6"></a><h4>Parameters</h4>
+<a name="id-1.3.39.6.9.6"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -460,14 +466,14 @@
 </tr>
 <tr>
 <td class="parameter_name"><p>op</p></td>
-<td class="parameter_description"><p>a <span class="type">GstVaapiFilterOp</span></p></td>
+<td class="parameter_description"><p>a <a class="link" href="libs-GstVaapiFilter.html#GstVaapiFilterOp" title="enum GstVaapiFilterOp"><span class="type">GstVaapiFilterOp</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.28.6.9.7"></a><h4>Returns</h4>
+<a name="id-1.3.39.6.9.7"></a><h4>Returns</h4>
 <p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the specified operation was already enabled,
 <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> otherwise</p>
 <p></p>
@@ -478,7 +484,7 @@
 <a name="gst-vaapi-filter-set-operation"></a><h3>gst_vaapi_filter_set_operation ()</h3>
 <pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 gst_vaapi_filter_set_operation (<em class="parameter"><code><a class="link" href="libs-GstVaapiFilter.html#GstVaapiFilter" title="GstVaapiFilter"><span class="type">GstVaapiFilter</span></a> *filter</code></em>,
-                                <em class="parameter"><code><span class="type">GstVaapiFilterOp</span> op</code></em>,
+                                <em class="parameter"><code><a class="link" href="libs-GstVaapiFilter.html#GstVaapiFilterOp" title="enum GstVaapiFilterOp"><span class="type">GstVaapiFilterOp</span></a> op</code></em>,
                                 <em class="parameter"><code>const <a href="https://developer.gnome.org/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *value</code></em>);</pre>
 <p>Enable the specified operation <em class="parameter"><code>op</code></em>
  to be performed during video
@@ -490,7 +496,7 @@
  is <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>, then this function resets the operation
 settings to their default values.</p>
 <div class="refsect3">
-<a name="id-1.2.28.6.10.6"></a><h4>Parameters</h4>
+<a name="id-1.3.39.6.10.6"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -505,7 +511,7 @@
 </tr>
 <tr>
 <td class="parameter_name"><p>op</p></td>
-<td class="parameter_description"><p>a <span class="type">GstVaapiFilterOp</span></p></td>
+<td class="parameter_description"><p>a <a class="link" href="libs-GstVaapiFilter.html#GstVaapiFilterOp" title="enum GstVaapiFilterOp"><span class="type">GstVaapiFilterOp</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
@@ -518,7 +524,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.28.6.10.7"></a><h4>Returns</h4>
+<a name="id-1.3.39.6.10.7"></a><h4>Returns</h4>
 <p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the specified operation may be supported,
 <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> otherwise</p>
 <p></p>
@@ -540,7 +546,7 @@
  is <span class="type">GST_VIDEO_FORMAT_ENCODED</span>, the filter will use the pixel
 format of the target surface passed to <code class="function">gst_vaapi_filter_process()</code>.</p>
 <div class="refsect3">
-<a name="id-1.2.28.6.11.7"></a><h4>Parameters</h4>
+<a name="id-1.3.39.6.11.7"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -562,7 +568,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.28.6.11.8"></a><h4>Returns</h4>
+<a name="id-1.3.39.6.11.8"></a><h4>Returns</h4>
 <p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the color conversion to the specified <em class="parameter"><code>format</code></em>
 may be supported, <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> otherwise.</p>
 <p></p>
@@ -579,7 +585,7 @@
 processing. If <em class="parameter"><code>rect</code></em>
  is <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>, the whole source surface will be used.</p>
 <div class="refsect3">
-<a name="id-1.2.28.6.12.5"></a><h4>Parameters</h4>
+<a name="id-1.3.39.6.12.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -601,7 +607,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.28.6.12.6"></a><h4>Returns</h4>
+<a name="id-1.3.39.6.12.6"></a><h4>Returns</h4>
 <p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the operation is supported, <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> otherwise.</p>
 <p></p>
 </div>
@@ -618,7 +624,7 @@
  is <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>, the whole
 source surface will be used.</p>
 <div class="refsect3">
-<a name="id-1.2.28.6.13.5"></a><h4>Parameters</h4>
+<a name="id-1.3.39.6.13.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -640,7 +646,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.28.6.13.6"></a><h4>Returns</h4>
+<a name="id-1.3.39.6.13.6"></a><h4>Returns</h4>
 <p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the operation is supported, <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> otherwise.</p>
 <p></p>
 </div>
@@ -655,7 +661,7 @@
  is 0.0f, this
 corresponds to disabling the noise reduction algorithm.</p>
 <div class="refsect3">
-<a name="id-1.2.28.6.14.5"></a><h4>Parameters</h4>
+<a name="id-1.3.39.6.14.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -677,7 +683,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.28.6.14.6"></a><h4>Returns</h4>
+<a name="id-1.3.39.6.14.6"></a><h4>Returns</h4>
 <p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the operation is supported, <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> otherwise.</p>
 <p></p>
 </div>
@@ -690,7 +696,7 @@
                                        <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gfloat"><span class="type">gfloat</span></a> level</code></em>);</pre>
 <p>Enables noise reduction with the specified factor.</p>
 <div class="refsect3">
-<a name="id-1.2.28.6.15.5"></a><h4>Parameters</h4>
+<a name="id-1.3.39.6.15.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -712,7 +718,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.28.6.15.6"></a><h4>Returns</h4>
+<a name="id-1.3.39.6.15.6"></a><h4>Returns</h4>
 <p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the operation is supported, <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> otherwise.</p>
 <p></p>
 </div>
@@ -725,7 +731,7 @@
                           <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gfloat"><span class="type">gfloat</span></a> value</code></em>);</pre>
 <p>Enables color hue adjustment to the specified value.</p>
 <div class="refsect3">
-<a name="id-1.2.28.6.16.5"></a><h4>Parameters</h4>
+<a name="id-1.3.39.6.16.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -747,20 +753,20 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.28.6.16.6"></a><h4>Returns</h4>
+<a name="id-1.3.39.6.16.6"></a><h4>Returns</h4>
 <p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the operation is supported, <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> otherwise.</p>
 <p></p>
 </div>
 </div>
 <hr>
 <div class="refsect2">
-<a name="gst-vaapi-filter-set-saturation"></a><h3>gst_vaapi_filter_set_saturation ()</h3>
+<a name="gst-vaapi-filter-set-brightness"></a><h3>gst_vaapi_filter_set_brightness ()</h3>
 <pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
-gst_vaapi_filter_set_saturation (<em class="parameter"><code><a class="link" href="libs-GstVaapiFilter.html#GstVaapiFilter" title="GstVaapiFilter"><span class="type">GstVaapiFilter</span></a> *filter</code></em>,
+gst_vaapi_filter_set_brightness (<em class="parameter"><code><a class="link" href="libs-GstVaapiFilter.html#GstVaapiFilter" title="GstVaapiFilter"><span class="type">GstVaapiFilter</span></a> *filter</code></em>,
                                  <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gfloat"><span class="type">gfloat</span></a> value</code></em>);</pre>
-<p>Enables color saturation adjustment to the specified value.</p>
+<p>Enables color brightness adjustment to the specified value.</p>
 <div class="refsect3">
-<a name="id-1.2.28.6.17.5"></a><h4>Parameters</h4>
+<a name="id-1.3.39.6.17.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -775,27 +781,27 @@
 </tr>
 <tr>
 <td class="parameter_name"><p>value</p></td>
-<td class="parameter_description"><p>the color saturation value</p></td>
+<td class="parameter_description"><p>the color brightness value</p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.28.6.17.6"></a><h4>Returns</h4>
+<a name="id-1.3.39.6.17.6"></a><h4>Returns</h4>
 <p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the operation is supported, <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> otherwise.</p>
 <p></p>
 </div>
 </div>
 <hr>
 <div class="refsect2">
-<a name="gst-vaapi-filter-set-brightness"></a><h3>gst_vaapi_filter_set_brightness ()</h3>
+<a name="gst-vaapi-filter-set-saturation"></a><h3>gst_vaapi_filter_set_saturation ()</h3>
 <pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
-gst_vaapi_filter_set_brightness (<em class="parameter"><code><a class="link" href="libs-GstVaapiFilter.html#GstVaapiFilter" title="GstVaapiFilter"><span class="type">GstVaapiFilter</span></a> *filter</code></em>,
+gst_vaapi_filter_set_saturation (<em class="parameter"><code><a class="link" href="libs-GstVaapiFilter.html#GstVaapiFilter" title="GstVaapiFilter"><span class="type">GstVaapiFilter</span></a> *filter</code></em>,
                                  <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gfloat"><span class="type">gfloat</span></a> value</code></em>);</pre>
-<p>Enables color brightness adjustment to the specified value.</p>
+<p>Enables color saturation adjustment to the specified value.</p>
 <div class="refsect3">
-<a name="id-1.2.28.6.18.5"></a><h4>Parameters</h4>
+<a name="id-1.3.39.6.18.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -810,14 +816,14 @@
 </tr>
 <tr>
 <td class="parameter_name"><p>value</p></td>
-<td class="parameter_description"><p>the color brightness value</p></td>
+<td class="parameter_description"><p>the color saturation value</p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.28.6.18.6"></a><h4>Returns</h4>
+<a name="id-1.3.39.6.18.6"></a><h4>Returns</h4>
 <p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the operation is supported, <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> otherwise.</p>
 <p></p>
 </div>
@@ -836,7 +842,7 @@
  could
 represent the initial picture structure of the source frame.</p>
 <div class="refsect3">
-<a name="id-1.2.28.6.19.5"></a><h4>Parameters</h4>
+<a name="id-1.3.39.6.19.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -863,7 +869,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.28.6.19.6"></a><h4>Returns</h4>
+<a name="id-1.3.39.6.19.6"></a><h4>Returns</h4>
 <p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the operation is supported, <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> otherwise.</p>
 <p></p>
 </div>
@@ -895,7 +901,7 @@
 means that they are only valid for the next <code class="function">gst_vaapi_filter_process()</code>
 call, and thus needs to be submitted again for subsequent calls.</p>
 <div class="refsect3">
-<a name="id-1.2.28.6.20.8"></a><h4>Parameters</h4>
+<a name="id-1.3.39.6.20.8"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -938,7 +944,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.28.6.20.9"></a><h4>Returns</h4>
+<a name="id-1.3.39.6.20.9"></a><h4>Returns</h4>
 <p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the operation is supported, <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> otherwise.</p>
 <p></p>
 </div>
@@ -952,6 +958,79 @@
 <p>
 </p>
 </div>
+<hr>
+<div class="refsect2">
+<a name="GstVaapiFilterOp"></a><h3>enum GstVaapiFilterOp</h3>
+<p>
+</p>
+<div class="refsect3">
+<a name="id-1.3.39.7.3.4"></a><h4>Members</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="300px" class="enum_members_name">
+<col class="enum_members_description">
+<col width="200px" class="enum_members_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="enum_member_name"><p><a name="GST-VAAPI-FILTER-OP-FORMAT:CAPS"></a>GST_VAAPI_FILTER_OP_FORMAT</p></td>
+<td class="enum_member_description"> </td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="GST-VAAPI-FILTER-OP-CROP:CAPS"></a>GST_VAAPI_FILTER_OP_CROP</p></td>
+<td class="enum_member_description"> </td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="GST-VAAPI-FILTER-OP-DENOISE:CAPS"></a>GST_VAAPI_FILTER_OP_DENOISE</p></td>
+<td class="enum_member_description"> </td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="GST-VAAPI-FILTER-OP-SHARPEN:CAPS"></a>GST_VAAPI_FILTER_OP_SHARPEN</p></td>
+<td class="enum_member_description"> </td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="GST-VAAPI-FILTER-OP-HUE:CAPS"></a>GST_VAAPI_FILTER_OP_HUE</p></td>
+<td class="enum_member_description"> </td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="GST-VAAPI-FILTER-OP-SATURATION:CAPS"></a>GST_VAAPI_FILTER_OP_SATURATION</p></td>
+<td class="enum_member_description"> </td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="GST-VAAPI-FILTER-OP-BRIGHTNESS:CAPS"></a>GST_VAAPI_FILTER_OP_BRIGHTNESS</p></td>
+<td class="enum_member_description"> </td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="GST-VAAPI-FILTER-OP-CONTRAST:CAPS"></a>GST_VAAPI_FILTER_OP_CONTRAST</p></td>
+<td class="enum_member_description"> </td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="GST-VAAPI-FILTER-OP-DEINTERLACING:CAPS"></a>GST_VAAPI_FILTER_OP_DEINTERLACING</p></td>
+<td class="enum_member_description"> </td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="GST-VAAPI-FILTER-OP-SCALING:CAPS"></a>GST_VAAPI_FILTER_OP_SCALING</p></td>
+<td class="enum_member_description"> </td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="GST-VAAPI-FILTER-OP-SKINTONE:CAPS"></a>GST_VAAPI_FILTER_OP_SKINTONE</p></td>
+<td class="enum_member_description"> </td>
+<td class="enum_member_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
 </div>
 </div>
 <div class="footer">
diff -Nru gstreamer-vaapi-0.5.10/docs/reference/libs/html/libs-gstvaapiimage.html gstreamer-vaapi-0.6.0/docs/reference/libs/html/libs-gstvaapiimage.html
--- gstreamer-vaapi-0.5.10/docs/reference/libs/html/libs-gstvaapiimage.html	2015-02-03 08:45:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/docs/reference/libs/html/libs-gstvaapiimage.html	2015-07-15 12:52:27.000000000 +0000
@@ -236,7 +236,7 @@
 <p>Macro that evaluates to the <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gst-plugins-base-libs/html/gst-plugins-base-libs-gstvideo.html#GstVideoFormat"><span class="type">GstVideoFormat</span></a> of <em class="parameter"><code>image</code></em>
 .</p>
 <div class="refsect3">
-<a name="id-1.2.14.6.2.5"></a><h4>Parameters</h4>
+<a name="id-1.3.20.6.2.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -258,7 +258,7 @@
 <p>Macro that evaluates to the width of <em class="parameter"><code>image</code></em>
 .</p>
 <div class="refsect3">
-<a name="id-1.2.14.6.3.5"></a><h4>Parameters</h4>
+<a name="id-1.3.20.6.3.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -280,7 +280,7 @@
 <p>Macro that evaluates to the height of <em class="parameter"><code>image</code></em>
 .</p>
 <div class="refsect3">
-<a name="id-1.2.14.6.4.5"></a><h4>Parameters</h4>
+<a name="id-1.3.20.6.4.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -306,7 +306,7 @@
 <p>Creates a new <a class="link" href="libs-gstvaapiimage.html#GstVaapiImage" title="GstVaapiImage"><span class="type">GstVaapiImage</span></a> with the specified format and
 dimensions.</p>
 <div class="refsect3">
-<a name="id-1.2.14.6.5.5"></a><h4>Parameters</h4>
+<a name="id-1.3.20.6.5.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -338,7 +338,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.14.6.5.6"></a><h4>Returns</h4>
+<a name="id-1.3.20.6.5.6"></a><h4>Returns</h4>
 <p> the newly allocated <a class="link" href="libs-gstvaapiimage.html#GstVaapiImage" title="GstVaapiImage"><span class="type">GstVaapiImage</span></a> object</p>
 <p></p>
 </div>
@@ -355,7 +355,7 @@
 function is mainly used by <a class="link" href="libs-gstvaapisurface.html#gst-vaapi-surface-derive-image" title="gst_vaapi_surface_derive_image ()"><code class="function">gst_vaapi_surface_derive_image()</code></a> to bind
 a VA image to a <a class="link" href="libs-gstvaapiimage.html#GstVaapiImage" title="GstVaapiImage"><span class="type">GstVaapiImage</span></a> object.</p>
 <div class="refsect3">
-<a name="id-1.2.14.6.6.5"></a><h4>Parameters</h4>
+<a name="id-1.3.20.6.6.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -377,7 +377,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.14.6.6.6"></a><h4>Returns</h4>
+<a name="id-1.3.20.6.6.6"></a><h4>Returns</h4>
 <p> the newly allocated <a class="link" href="libs-gstvaapiimage.html#GstVaapiImage" title="GstVaapiImage"><span class="type">GstVaapiImage</span></a> object</p>
 <p></p>
 </div>
@@ -390,7 +390,7 @@
 <p>Returns the underlying VAImageID of the <em class="parameter"><code>image</code></em>
 .</p>
 <div class="refsect3">
-<a name="id-1.2.14.6.7.5"></a><h4>Parameters</h4>
+<a name="id-1.3.20.6.7.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -405,7 +405,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.14.6.7.6"></a><h4>Returns</h4>
+<a name="id-1.3.20.6.7.6"></a><h4>Returns</h4>
 <p> the underlying VA image id</p>
 <p></p>
 </div>
@@ -419,7 +419,7 @@
 <p>Fills <em class="parameter"><code>va_image</code></em>
  with the VA image used internally.</p>
 <div class="refsect3">
-<a name="id-1.2.14.6.8.5"></a><h4>Parameters</h4>
+<a name="id-1.3.20.6.8.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -441,7 +441,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.14.6.8.6"></a><h4>Returns</h4>
+<a name="id-1.3.20.6.8.6"></a><h4>Returns</h4>
 <p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> on success</p>
 <p></p>
 </div>
@@ -454,7 +454,7 @@
 <p>Returns the <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gst-plugins-base-libs/html/gst-plugins-base-libs-gstvideo.html#GstVideoFormat"><span class="type">GstVideoFormat</span></a> the <em class="parameter"><code>image</code></em>
  was created with.</p>
 <div class="refsect3">
-<a name="id-1.2.14.6.9.5"></a><h4>Parameters</h4>
+<a name="id-1.3.20.6.9.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -469,7 +469,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.14.6.9.6"></a><h4>Returns</h4>
+<a name="id-1.3.20.6.9.6"></a><h4>Returns</h4>
 <p> the <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gst-plugins-base-libs/html/gst-plugins-base-libs-gstvideo.html#GstVideoFormat"><span class="type">GstVideoFormat</span></a></p>
 <p></p>
 </div>
@@ -482,7 +482,7 @@
 <p>Returns the <em class="parameter"><code>image</code></em>
  width.</p>
 <div class="refsect3">
-<a name="id-1.2.14.6.10.5"></a><h4>Parameters</h4>
+<a name="id-1.3.20.6.10.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -497,7 +497,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.14.6.10.6"></a><h4>Returns</h4>
+<a name="id-1.3.20.6.10.6"></a><h4>Returns</h4>
 <p> the image width, in pixels</p>
 <p></p>
 </div>
@@ -510,7 +510,7 @@
 <p>Returns the <em class="parameter"><code>image</code></em>
  height.</p>
 <div class="refsect3">
-<a name="id-1.2.14.6.11.5"></a><h4>Parameters</h4>
+<a name="id-1.3.20.6.11.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -525,7 +525,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.14.6.11.6"></a><h4>Returns</h4>
+<a name="id-1.3.20.6.11.6"></a><h4>Returns</h4>
 <p> the image height, in pixels.</p>
 <p></p>
 </div>
@@ -539,7 +539,7 @@
                           <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> *pheight</code></em>);</pre>
 <p>Retrieves the dimensions of a <a class="link" href="libs-gstvaapiimage.html#GstVaapiImage" title="GstVaapiImage"><span class="type">GstVaapiImage</span></a>.</p>
 <div class="refsect3">
-<a name="id-1.2.14.6.12.5"></a><h4>Parameters</h4>
+<a name="id-1.3.20.6.12.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -576,7 +576,7 @@
 buffer and offsets into that buffer are in increasing order with
 the number of planes.</p>
 <div class="refsect3">
-<a name="id-1.2.14.6.13.5"></a><h4>Parameters</h4>
+<a name="id-1.3.20.6.13.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -591,7 +591,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.14.6.13.6"></a><h4>Returns</h4>
+<a name="id-1.3.20.6.13.6"></a><h4>Returns</h4>
 <p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if image data planes are allocated from a single buffer</p>
 <p></p>
 </div>
@@ -604,7 +604,7 @@
 <p>Checks whether the <em class="parameter"><code>image</code></em>
  is currently mapped or not.</p>
 <div class="refsect3">
-<a name="id-1.2.14.6.14.5"></a><h4>Parameters</h4>
+<a name="id-1.3.20.6.14.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -619,7 +619,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.14.6.14.6"></a><h4>Returns</h4>
+<a name="id-1.3.20.6.14.6"></a><h4>Returns</h4>
 <p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the <em class="parameter"><code>image</code></em>
 is mapped</p>
 <p></p>
@@ -633,7 +633,7 @@
 <p>Maps the image data buffer. The actual pixels are returned by the
 <a class="link" href="libs-gstvaapiimage.html#gst-vaapi-image-get-plane" title="gst_vaapi_image_get_plane ()"><code class="function">gst_vaapi_image_get_plane()</code></a> function.</p>
 <div class="refsect3">
-<a name="id-1.2.14.6.15.5"></a><h4>Parameters</h4>
+<a name="id-1.3.20.6.15.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -648,7 +648,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.14.6.15.6"></a><h4>Returns</h4>
+<a name="id-1.3.20.6.15.6"></a><h4>Returns</h4>
 <p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> on success</p>
 <p></p>
 </div>
@@ -661,7 +661,7 @@
 <p>Unmaps the image data buffer. Pointers to pixels returned by
 <a class="link" href="libs-gstvaapiimage.html#gst-vaapi-image-get-plane" title="gst_vaapi_image_get_plane ()"><code class="function">gst_vaapi_image_get_plane()</code></a> are then no longer valid.</p>
 <div class="refsect3">
-<a name="id-1.2.14.6.16.5"></a><h4>Parameters</h4>
+<a name="id-1.3.20.6.16.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -676,7 +676,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.14.6.16.6"></a><h4>Returns</h4>
+<a name="id-1.3.20.6.16.6"></a><h4>Returns</h4>
 <p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> on success</p>
 <p></p>
 </div>
@@ -691,7 +691,7 @@
 
 must be mapped for this function to work properly.</p>
 <div class="refsect3">
-<a name="id-1.2.14.6.17.5"></a><h4>Parameters</h4>
+<a name="id-1.3.20.6.17.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -706,7 +706,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.14.6.17.6"></a><h4>Returns</h4>
+<a name="id-1.3.20.6.17.6"></a><h4>Returns</h4>
 <p> the number of planes available in the <em class="parameter"><code>image</code></em>
 </p>
 <p></p>
@@ -723,7 +723,7 @@
  must
 be mapped for this function to work properly.</p>
 <div class="refsect3">
-<a name="id-1.2.14.6.18.5"></a><h4>Parameters</h4>
+<a name="id-1.3.20.6.18.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -745,7 +745,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.14.6.18.6"></a><h4>Returns</h4>
+<a name="id-1.3.20.6.18.6"></a><h4>Returns</h4>
 <p> the pixels data of the specified <em class="parameter"><code>plane</code></em>
 </p>
 <p></p>
@@ -762,7 +762,7 @@
 <em class="parameter"><code>image</code></em>
  must be mapped for this function to work properly.</p>
 <div class="refsect3">
-<a name="id-1.2.14.6.19.5"></a><h4>Parameters</h4>
+<a name="id-1.3.20.6.19.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -784,7 +784,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.14.6.19.6"></a><h4>Returns</h4>
+<a name="id-1.3.20.6.19.6"></a><h4>Returns</h4>
 <p> the line size (stride) of the specified plane</p>
 <p></p>
 </div>
@@ -798,7 +798,7 @@
 used to determine whether the image has a compatible layout with
 another image structure.</p>
 <div class="refsect3">
-<a name="id-1.2.14.6.20.5"></a><h4>Parameters</h4>
+<a name="id-1.3.20.6.20.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -813,7 +813,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.14.6.20.6"></a><h4>Returns</h4>
+<a name="id-1.3.20.6.20.6"></a><h4>Returns</h4>
 <p> the whole image data size of the <em class="parameter"><code>image</code></em>
 </p>
 <p></p>
@@ -830,7 +830,7 @@
  into the <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstBuffer.html"><span class="type">GstBuffer</span></a>.
 Both image structures shall have the same format.</p>
 <div class="refsect3">
-<a name="id-1.2.14.6.21.5"></a><h4>Parameters</h4>
+<a name="id-1.3.20.6.21.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -858,7 +858,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.14.6.21.6"></a><h4>Returns</h4>
+<a name="id-1.3.20.6.21.6"></a><h4>Returns</h4>
 <p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> on success</p>
 <p></p>
 </div>
@@ -874,7 +874,7 @@
 <em class="parameter"><code>image</code></em>
 . Both image structures shall have the same format.</p>
 <div class="refsect3">
-<a name="id-1.2.14.6.22.5"></a><h4>Parameters</h4>
+<a name="id-1.3.20.6.22.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -902,7 +902,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.14.6.22.6"></a><h4>Returns</h4>
+<a name="id-1.3.20.6.22.6"></a><h4>Returns</h4>
 <p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> on success</p>
 <p></p>
 </div>
@@ -918,7 +918,7 @@
 . Both images shall
 have the same format and size.</p>
 <div class="refsect3">
-<a name="id-1.2.14.6.23.5"></a><h4>Parameters</h4>
+<a name="id-1.3.20.6.23.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -940,7 +940,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.14.6.23.6"></a><h4>Returns</h4>
+<a name="id-1.3.20.6.23.6"></a><h4>Returns</h4>
 <p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> on success</p>
 <p></p>
 </div>
diff -Nru gstreamer-vaapi-0.5.10/docs/reference/libs/html/libs-GstVaapiImagePool.html gstreamer-vaapi-0.6.0/docs/reference/libs/html/libs-GstVaapiImagePool.html
--- gstreamer-vaapi-0.5.10/docs/reference/libs/html/libs-GstVaapiImagePool.html	2015-02-03 08:45:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/docs/reference/libs/html/libs-GstVaapiImagePool.html	2015-07-15 12:52:27.000000000 +0000
@@ -75,7 +75,7 @@
 specified format and dimensions in <em class="parameter"><code>vip</code></em>
 .</p>
 <div class="refsect3">
-<a name="id-1.2.20.6.2.5"></a><h4>Parameters</h4>
+<a name="id-1.3.28.6.2.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -97,7 +97,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.20.6.2.6"></a><h4>Returns</h4>
+<a name="id-1.3.28.6.2.6"></a><h4>Returns</h4>
 <p> the newly allocated <a class="link" href="libs-GstVaapiVideoPool.html#GstVaapiVideoPool" title="GstVaapiVideoPool"><span class="type">GstVaapiVideoPool</span></a></p>
 <p></p>
 </div>
diff -Nru gstreamer-vaapi-0.5.10/docs/reference/libs/html/libs-GstVaapiObject.html gstreamer-vaapi-0.6.0/docs/reference/libs/html/libs-GstVaapiObject.html
--- gstreamer-vaapi-0.5.10/docs/reference/libs/html/libs-GstVaapiObject.html	2015-02-03 08:45:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/docs/reference/libs/html/libs-GstVaapiObject.html	2015-07-15 12:52:27.000000000 +0000
@@ -99,7 +99,7 @@
 <p>Returns the <a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a> this <em class="parameter"><code>object</code></em>
  is bound to.</p>
 <div class="refsect3">
-<a name="id-1.2.12.6.2.5"></a><h4>Parameters</h4>
+<a name="id-1.3.18.6.2.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -114,7 +114,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.12.6.2.6"></a><h4>Returns</h4>
+<a name="id-1.3.18.6.2.6"></a><h4>Returns</h4>
 <p> the parent <a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a> object</p>
 <p></p>
 </div>
@@ -129,7 +129,7 @@
 another thread, the current thread will block until display is
 unlocked by the other thread.</p>
 <div class="refsect3">
-<a name="id-1.2.12.6.3.5"></a><h4>Parameters</h4>
+<a name="id-1.3.18.6.3.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -154,7 +154,7 @@
 <a class="link" href="libs-GstVaapiObject.html#gst-vaapi-object-lock-display" title="gst_vaapi_object_lock_display ()"><code class="function">gst_vaapi_object_lock_display()</code></a> call, it will be woken and can lock
 display itself.</p>
 <div class="refsect3">
-<a name="id-1.2.12.6.4.5"></a><h4>Parameters</h4>
+<a name="id-1.3.18.6.4.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -177,7 +177,7 @@
 <p>Returns the <a class="link" href="libs-Basic-data-structures.html#GstVaapiID" title="GstVaapiID"><span class="type">GstVaapiID</span></a> contained in the <em class="parameter"><code>object</code></em>
 .</p>
 <div class="refsect3">
-<a name="id-1.2.12.6.5.5"></a><h4>Parameters</h4>
+<a name="id-1.3.18.6.5.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -192,7 +192,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.12.6.5.6"></a><h4>Returns</h4>
+<a name="id-1.3.18.6.5.6"></a><h4>Returns</h4>
 <p> the <a class="link" href="libs-Basic-data-structures.html#GstVaapiID" title="GstVaapiID"><span class="type">GstVaapiID</span></a> of the <em class="parameter"><code>object</code></em>
 </p>
 <p></p>
diff -Nru gstreamer-vaapi-0.5.10/docs/reference/libs/html/libs-GstVaapiParserFrame.html gstreamer-vaapi-0.6.0/docs/reference/libs/html/libs-GstVaapiParserFrame.html
--- gstreamer-vaapi-0.5.10/docs/reference/libs/html/libs-GstVaapiParserFrame.html	1970-01-01 00:00:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/docs/reference/libs/html/libs-GstVaapiParserFrame.html	2015-07-15 12:52:27.000000000 +0000
@@ -0,0 +1,214 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>GStreamer VA-API Plugins 1.4 Library Reference Manual: GstVaapiParserFrame</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="GStreamer VA-API Plugins 1.4 Library Reference Manual">
+<link rel="up" href="ch01.html" title="gst-plugins-vaapi Library">
+<link rel="prev" href="libs-GstVaapiValue.html" title="GstVaapiValue">
+<link rel="next" href="libs-GstVaapiContext.html" title="GstVaapiContext">
+<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts">
+<a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
+                  <a href="#libs-GstVaapiParserFrame.description" class="shortcut">Description</a></span>
+</td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><a accesskey="u" href="ch01.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="libs-GstVaapiValue.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="libs-GstVaapiContext.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+</tr></table>
+<div class="refentry">
+<a name="libs-GstVaapiParserFrame"></a><div class="titlepage"></div>
+<div class="refnamediv"><table width="100%"><tr>
+<td valign="top">
+<h2><span class="refentrytitle"><a name="libs-GstVaapiParserFrame.top_of_page"></a>GstVaapiParserFrame</span></h2>
+<p>GstVaapiParserFrame — VA decoder frame</p>
+</td>
+<td class="gallery_image" valign="top" align="right"></td>
+</tr></table></div>
+<div class="refsect1">
+<a name="libs-GstVaapiParserFrame.functions"></a><h2>Functions</h2>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="functions_return">
+<col class="functions_name">
+</colgroup>
+<tbody>
+<tr>
+<td class="function_type">
+<span class="returnvalue">GstVaapiParserFrame</span> *
+</td>
+<td class="function_name">
+<a class="link" href="libs-GstVaapiParserFrame.html#gst-vaapi-parser-frame-new" title="gst_vaapi_parser_frame_new ()">gst_vaapi_parser_frame_new</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="libs-GstVaapiParserFrame.html#gst-vaapi-parser-frame-free" title="gst_vaapi_parser_frame_free ()">gst_vaapi_parser_frame_free</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="libs-GstVaapiParserFrame.html#gst-vaapi-parser-frame-append-unit" title="gst_vaapi_parser_frame_append_unit ()">gst_vaapi_parser_frame_append_unit</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name">
+<a class="link" href="libs-GstVaapiParserFrame.html#gst-vaapi-parser-frame-ref" title="gst_vaapi_parser_frame_ref()">gst_vaapi_parser_frame_ref</a><span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name">
+<a class="link" href="libs-GstVaapiParserFrame.html#gst-vaapi-parser-frame-unref" title="gst_vaapi_parser_frame_unref()">gst_vaapi_parser_frame_unref</a><span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name">
+<a class="link" href="libs-GstVaapiParserFrame.html#gst-vaapi-parser-frame-replace" title="gst_vaapi_parser_frame_replace()">gst_vaapi_parser_frame_replace</a><span class="c_punctuation">()</span>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="libs-GstVaapiParserFrame.description"></a><h2>Description</h2>
+</div>
+<div class="refsect1">
+<a name="libs-GstVaapiParserFrame.functions_details"></a><h2>Functions</h2>
+<div class="refsect2">
+<a name="gst-vaapi-parser-frame-new"></a><h3>gst_vaapi_parser_frame_new ()</h3>
+<pre class="programlisting"><span class="returnvalue">GstVaapiParserFrame</span> *
+gst_vaapi_parser_frame_new (<em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> width</code></em>,
+                            <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> height</code></em>);</pre>
+<p>Creates a new <span class="type">GstVaapiParserFrame</span> object.</p>
+<div class="refsect3">
+<a name="id-1.3.41.5.2.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>width</p></td>
+<td class="parameter_description"><p>frame width in pixels</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>height</p></td>
+<td class="parameter_description"><p>frame height in pixels</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="id-1.3.41.5.2.6"></a><h4>Returns</h4>
+<p> The newly allocated <span class="type">GstVaapiParserFrame</span></p>
+<p></p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="gst-vaapi-parser-frame-free"></a><h3>gst_vaapi_parser_frame_free ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+gst_vaapi_parser_frame_free (<em class="parameter"><code><span class="type">GstVaapiParserFrame</span> *frame</code></em>);</pre>
+<p>Deallocates any internal resources bound to the supplied decoder
+<em class="parameter"><code>frame</code></em>
+.</p>
+<p><em class="parameter"><code>note</code></em>
+ This is an internal function used to implement lightweight
+sub-classes.</p>
+<div class="refsect3">
+<a name="id-1.3.41.5.3.6"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>frame</p></td>
+<td class="parameter_description"><p>a <span class="type">GstVaapiParserFrame</span></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="gst-vaapi-parser-frame-append-unit"></a><h3>gst_vaapi_parser_frame_append_unit ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+gst_vaapi_parser_frame_append_unit (<em class="parameter"><code><span class="type">GstVaapiParserFrame</span> *frame</code></em>,
+                                    <em class="parameter"><code><a class="link" href="libs-GstVaapiDecoderUnit.html#GstVaapiDecoderUnit" title="struct GstVaapiDecoderUnit"><span class="type">GstVaapiDecoderUnit</span></a> *unit</code></em>);</pre>
+<p>Appends unit to the <em class="parameter"><code>frame</code></em>
+.</p>
+<div class="refsect3">
+<a name="id-1.3.41.5.4.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>frame</p></td>
+<td class="parameter_description"><p>a <span class="type">GstVaapiParserFrame</span></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>unit</p></td>
+<td class="parameter_description"><p>a <a class="link" href="libs-GstVaapiDecoderUnit.html#GstVaapiDecoderUnit" title="struct GstVaapiDecoderUnit"><span class="type">GstVaapiDecoderUnit</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="gst-vaapi-parser-frame-ref"></a><h3>gst_vaapi_parser_frame_ref()</h3>
+<pre class="programlisting">#define             gst_vaapi_parser_frame_ref(frame)</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="gst-vaapi-parser-frame-unref"></a><h3>gst_vaapi_parser_frame_unref()</h3>
+<pre class="programlisting">#define             gst_vaapi_parser_frame_unref(frame)</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="gst-vaapi-parser-frame-replace"></a><h3>gst_vaapi_parser_frame_replace()</h3>
+<pre class="programlisting">#define             gst_vaapi_parser_frame_replace(old_frame_p, new_frame)</pre>
+<p>
+</p>
+</div>
+</div>
+<div class="refsect1">
+<a name="libs-GstVaapiParserFrame.other_details"></a><h2>Types and Values</h2>
+</div>
+</div>
+<div class="footer">
+<hr>
+          Generated by GTK-Doc V1.21</div>
+</body>
+</html>
\ No newline at end of file
diff -Nru gstreamer-vaapi-0.5.10/docs/reference/libs/html/libs-GstVaapiPixmap.html gstreamer-vaapi-0.6.0/docs/reference/libs/html/libs-GstVaapiPixmap.html
--- gstreamer-vaapi-0.5.10/docs/reference/libs/html/libs-GstVaapiPixmap.html	2015-02-03 08:45:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/docs/reference/libs/html/libs-GstVaapiPixmap.html	2015-07-15 12:52:27.000000000 +0000
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="GStreamer VA-API Plugins 1.4 Library Reference Manual">
 <link rel="up" href="ch01.html" title="gst-plugins-vaapi Library">
-<link rel="prev" href="libs-GstVaapiWindowGLX.html" title="GstVaapiWindowGLX">
+<link rel="prev" href="libs-GstVaapiWindowWayland.html" title="GstVaapiWindowWayland">
 <link rel="next" href="libs-GstVaapiPixmapX11.html" title="GstVaapiPixmapX11">
 <meta name="generator" content="GTK-Doc V1.21 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
@@ -19,7 +19,7 @@
 </td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
 <td><a accesskey="u" href="ch01.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
-<td><a accesskey="p" href="libs-GstVaapiWindowGLX.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="p" href="libs-GstVaapiWindowWayland.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
 <td><a accesskey="n" href="libs-GstVaapiPixmapX11.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
 </tr></table>
 <div class="refentry">
@@ -131,7 +131,7 @@
 <p>Atomically increases the reference count of the given <em class="parameter"><code>pixmap</code></em>
  by one.</p>
 <div class="refsect3">
-<a name="id-1.2.10.6.2.5"></a><h4>Parameters</h4>
+<a name="id-1.3.16.6.2.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -146,7 +146,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.10.6.2.6"></a><h4>Returns</h4>
+<a name="id-1.3.16.6.2.6"></a><h4>Returns</h4>
 <p> The same <em class="parameter"><code>pixmap</code></em>
 argument</p>
 <p></p>
@@ -161,7 +161,7 @@
  by one. If
 the reference count reaches zero, the pixmap will be free'd.</p>
 <div class="refsect3">
-<a name="id-1.2.10.6.3.5"></a><h4>Parameters</h4>
+<a name="id-1.3.16.6.3.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -190,7 +190,7 @@
 valid pixmap. However, <em class="parameter"><code>new_pixmap</code></em>
  can be NULL.</p>
 <div class="refsect3">
-<a name="id-1.2.10.6.4.5"></a><h4>Parameters</h4>
+<a name="id-1.3.16.6.4.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -219,7 +219,7 @@
 gst_vaapi_pixmap_get_format (<em class="parameter"><code><a class="link" href="libs-GstVaapiPixmap.html#GstVaapiPixmap" title="GstVaapiPixmap"><span class="type">GstVaapiPixmap</span></a> *pixmap</code></em>);</pre>
 <p>Retrieves the format of a <a class="link" href="libs-GstVaapiPixmap.html#GstVaapiPixmap" title="GstVaapiPixmap"><span class="type">GstVaapiPixmap</span></a>.</p>
 <div class="refsect3">
-<a name="id-1.2.10.6.5.5"></a><h4>Parameters</h4>
+<a name="id-1.3.16.6.5.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -234,7 +234,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.10.6.5.6"></a><h4>Returns</h4>
+<a name="id-1.3.16.6.5.6"></a><h4>Returns</h4>
 <p> the format of the <em class="parameter"><code>pixmap</code></em>
 </p>
 <p></p>
@@ -247,7 +247,7 @@
 gst_vaapi_pixmap_get_width (<em class="parameter"><code><a class="link" href="libs-GstVaapiPixmap.html#GstVaapiPixmap" title="GstVaapiPixmap"><span class="type">GstVaapiPixmap</span></a> *pixmap</code></em>);</pre>
 <p>Retrieves the width of a <a class="link" href="libs-GstVaapiPixmap.html#GstVaapiPixmap" title="GstVaapiPixmap"><span class="type">GstVaapiPixmap</span></a>.</p>
 <div class="refsect3">
-<a name="id-1.2.10.6.6.5"></a><h4>Parameters</h4>
+<a name="id-1.3.16.6.6.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -262,7 +262,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.10.6.6.6"></a><h4>Returns</h4>
+<a name="id-1.3.16.6.6.6"></a><h4>Returns</h4>
 <p> the width of the <em class="parameter"><code>pixmap</code></em>
 , in pixels</p>
 <p></p>
@@ -275,7 +275,7 @@
 gst_vaapi_pixmap_get_height (<em class="parameter"><code><a class="link" href="libs-GstVaapiPixmap.html#GstVaapiPixmap" title="GstVaapiPixmap"><span class="type">GstVaapiPixmap</span></a> *pixmap</code></em>);</pre>
 <p>Retrieves the height of a <a class="link" href="libs-GstVaapiPixmap.html#GstVaapiPixmap" title="GstVaapiPixmap"><span class="type">GstVaapiPixmap</span></a></p>
 <div class="refsect3">
-<a name="id-1.2.10.6.7.5"></a><h4>Parameters</h4>
+<a name="id-1.3.16.6.7.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -290,7 +290,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.10.6.7.6"></a><h4>Returns</h4>
+<a name="id-1.3.16.6.7.6"></a><h4>Returns</h4>
 <p> the height of the <em class="parameter"><code>pixmap</code></em>
 , in pixels</p>
 <p></p>
@@ -305,7 +305,7 @@
                            <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> *height</code></em>);</pre>
 <p>Retrieves the dimensions of a <a class="link" href="libs-GstVaapiPixmap.html#GstVaapiPixmap" title="GstVaapiPixmap"><span class="type">GstVaapiPixmap</span></a>.</p>
 <div class="refsect3">
-<a name="id-1.2.10.6.8.5"></a><h4>Parameters</h4>
+<a name="id-1.3.16.6.8.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -350,7 +350,7 @@
 space conversion, scaling and other postprocessing transformations
 are performed.</p>
 <div class="refsect3">
-<a name="id-1.2.10.6.9.5"></a><h4>Parameters</h4>
+<a name="id-1.3.16.6.9.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -383,7 +383,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.10.6.9.6"></a><h4>Returns</h4>
+<a name="id-1.3.16.6.9.6"></a><h4>Returns</h4>
 <p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> on success</p>
 <p></p>
 </div>
diff -Nru gstreamer-vaapi-0.5.10/docs/reference/libs/html/libs-GstVaapiPixmapX11.html gstreamer-vaapi-0.6.0/docs/reference/libs/html/libs-GstVaapiPixmapX11.html
--- gstreamer-vaapi-0.5.10/docs/reference/libs/html/libs-GstVaapiPixmapX11.html	2015-02-03 08:45:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/docs/reference/libs/html/libs-GstVaapiPixmapX11.html	2015-07-15 12:52:27.000000000 +0000
@@ -104,7 +104,7 @@
 <p>Macro that evaluates to the underlying X11 <span class="type">Pixmap</span> of <em class="parameter"><code>pixmap</code></em>
 </p>
 <div class="refsect3">
-<a name="id-1.2.11.6.2.5"></a><h4>Parameters</h4>
+<a name="id-1.3.17.6.2.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -134,7 +134,7 @@
 . The pixmap will be attached to the <em class="parameter"><code>display</code></em>
 .</p>
 <div class="refsect3">
-<a name="id-1.2.11.6.3.5"></a><h4>Parameters</h4>
+<a name="id-1.3.17.6.3.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -166,7 +166,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.11.6.3.6"></a><h4>Returns</h4>
+<a name="id-1.3.17.6.3.6"></a><h4>Returns</h4>
 <p> the newly allocated <a class="link" href="libs-GstVaapiPixmap.html#GstVaapiPixmap" title="GstVaapiPixmap"><span class="type">GstVaapiPixmap</span></a> object</p>
 <p></p>
 </div>
@@ -183,7 +183,7 @@
 <a class="link" href="libs-GstVaapiPixmap.html#GstVaapiPixmap" title="GstVaapiPixmap"><span class="type">GstVaapiPixmap</span></a> references are released. Doing so too early can
 yield undefined behaviour.</p>
 <div class="refsect3">
-<a name="id-1.2.11.6.4.5"></a><h4>Parameters</h4>
+<a name="id-1.3.17.6.4.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -205,7 +205,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.11.6.4.6"></a><h4>Returns</h4>
+<a name="id-1.3.17.6.4.6"></a><h4>Returns</h4>
 <p> the newly allocated <a class="link" href="libs-GstVaapiPixmap.html#GstVaapiPixmap" title="GstVaapiPixmap"><span class="type">GstVaapiPixmap</span></a> object</p>
 <p></p>
 </div>
@@ -219,7 +219,7 @@
 <a class="link" href="libs-GstVaapiPixmapX11.html#gst-vaapi-pixmap-x11-new" title="gst_vaapi_pixmap_x11_new ()"><code class="function">gst_vaapi_pixmap_x11_new()</code></a> or that was bound with
 <a class="link" href="libs-GstVaapiPixmapX11.html#gst-vaapi-pixmap-x11-new-with-xid" title="gst_vaapi_pixmap_x11_new_with_xid ()"><code class="function">gst_vaapi_pixmap_x11_new_with_xid()</code></a>.</p>
 <div class="refsect3">
-<a name="id-1.2.11.6.5.5"></a><h4>Parameters</h4>
+<a name="id-1.3.17.6.5.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -234,7 +234,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.11.6.5.6"></a><h4>Returns</h4>
+<a name="id-1.3.17.6.5.6"></a><h4>Returns</h4>
 <p> the underlying X11 Pixmap bound to <em class="parameter"><code>pixmap</code></em>
 .</p>
 <p></p>
@@ -249,7 +249,7 @@
  XID was created by <a class="link" href="libs-GstVaapiPixmapX11.html#gst-vaapi-pixmap-x11-new" title="gst_vaapi_pixmap_x11_new ()"><code class="function">gst_vaapi_pixmap_x11_new()</code></a>
 or was bound with <a class="link" href="libs-GstVaapiPixmapX11.html#gst-vaapi-pixmap-x11-new-with-xid" title="gst_vaapi_pixmap_x11_new_with_xid ()"><code class="function">gst_vaapi_pixmap_x11_new_with_xid()</code></a>.</p>
 <div class="refsect3">
-<a name="id-1.2.11.6.6.5"></a><h4>Parameters</h4>
+<a name="id-1.3.17.6.6.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -264,7 +264,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.11.6.6.6"></a><h4>Returns</h4>
+<a name="id-1.3.17.6.6.6"></a><h4>Returns</h4>
 <p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the underlying X pixmap is owned by the
 caller (foreign pixmap)</p>
 <p></p>
diff -Nru gstreamer-vaapi-0.5.10/docs/reference/libs/html/libs-GstVaapiProfile.html gstreamer-vaapi-0.6.0/docs/reference/libs/html/libs-GstVaapiProfile.html
--- gstreamer-vaapi-0.5.10/docs/reference/libs/html/libs-GstVaapiProfile.html	2015-02-03 08:45:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/docs/reference/libs/html/libs-GstVaapiProfile.html	2015-07-15 12:52:27.000000000 +0000
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="GStreamer VA-API Plugins 1.4 Library Reference Manual">
 <link rel="up" href="ch01.html" title="gst-plugins-vaapi Library">
-<link rel="prev" href="libs-GstVaapiTexture.html" title="GstVaapiTexture">
+<link rel="prev" href="libs-GstVaapiTextureGLX.html" title="GstVaapiTextureGLX">
 <link rel="next" href="libs-GstVaapiVideoPool.html" title="GstVaapiVideoPool">
 <meta name="generator" content="GTK-Doc V1.21 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
@@ -19,7 +19,7 @@
 </td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
 <td><a accesskey="u" href="ch01.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
-<td><a accesskey="p" href="libs-GstVaapiTexture.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="p" href="libs-GstVaapiTextureGLX.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
 <td><a accesskey="n" href="libs-GstVaapiVideoPool.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
 </tr></table>
 <div class="refentry">
@@ -134,7 +134,7 @@
 the profile cannot be represented by <a class="link" href="libs-GstVaapiProfile.html#GstVaapiProfile" title="enum GstVaapiProfile"><span class="type">GstVaapiProfile</span></a>, then zero is
 returned.</p>
 <div class="refsect3">
-<a name="id-1.2.17.6.2.5"></a><h4>Parameters</h4>
+<a name="id-1.3.25.6.2.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -149,7 +149,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.17.6.2.6"></a><h4>Returns</h4>
+<a name="id-1.3.25.6.2.6"></a><h4>Returns</h4>
 <p> the <a class="link" href="libs-GstVaapiProfile.html#GstVaapiProfile" title="enum GstVaapiProfile"><span class="type">GstVaapiProfile</span></a> describing the <em class="parameter"><code>profile</code></em>
 </p>
 <p></p>
@@ -165,7 +165,7 @@
 profile cannot be represented by <a class="link" href="libs-GstVaapiProfile.html#GstVaapiProfile" title="enum GstVaapiProfile"><span class="type">GstVaapiProfile</span></a>, then zero is
 returned.</p>
 <div class="refsect3">
-<a name="id-1.2.17.6.3.5"></a><h4>Parameters</h4>
+<a name="id-1.3.25.6.3.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -180,7 +180,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.17.6.3.6"></a><h4>Returns</h4>
+<a name="id-1.3.25.6.3.6"></a><h4>Returns</h4>
 <p> the <a class="link" href="libs-GstVaapiProfile.html#GstVaapiProfile" title="enum GstVaapiProfile"><span class="type">GstVaapiProfile</span></a> describing the <em class="parameter"><code>caps</code></em>
 </p>
 <p></p>
@@ -195,7 +195,7 @@
 no matching VA profile was found, -1 is returned and this error
 must be reported to be fixed.</p>
 <div class="refsect3">
-<a name="id-1.2.17.6.4.5"></a><h4>Parameters</h4>
+<a name="id-1.3.25.6.4.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -210,7 +210,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.17.6.4.6"></a><h4>Returns</h4>
+<a name="id-1.3.25.6.4.6"></a><h4>Returns</h4>
 <p> the VA profile, or -1 if none was found</p>
 <p></p>
 </div>
@@ -223,7 +223,7 @@
 <p>Converts a <a class="link" href="libs-GstVaapiProfile.html#GstVaapiProfile" title="enum GstVaapiProfile"><span class="type">GstVaapiProfile</span></a> into the corresponding <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstCaps.html"><span class="type">GstCaps</span></a>. If no
 matching caps were found, <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> is returned.</p>
 <div class="refsect3">
-<a name="id-1.2.17.6.5.5"></a><h4>Parameters</h4>
+<a name="id-1.3.25.6.5.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -238,7 +238,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.17.6.5.6"></a><h4>Returns</h4>
+<a name="id-1.3.25.6.5.6"></a><h4>Returns</h4>
 <p> the newly allocated <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstCaps.html"><span class="type">GstCaps</span></a>, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if none was found</p>
 <p></p>
 </div>
@@ -251,7 +251,7 @@
 <p>Extracts the <a class="link" href="libs-GstVaapiProfile.html#GstVaapiCodec" title="enum GstVaapiCodec"><span class="type">GstVaapiCodec</span></a> from <em class="parameter"><code>profile</code></em>
 .</p>
 <div class="refsect3">
-<a name="id-1.2.17.6.6.5"></a><h4>Parameters</h4>
+<a name="id-1.3.25.6.6.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -266,7 +266,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.17.6.6.6"></a><h4>Returns</h4>
+<a name="id-1.3.25.6.6.6"></a><h4>Returns</h4>
 <p> the <a class="link" href="libs-GstVaapiProfile.html#GstVaapiCodec" title="enum GstVaapiCodec"><span class="type">GstVaapiCodec</span></a> from <em class="parameter"><code>profile</code></em>
 </p>
 <p></p>
@@ -281,7 +281,7 @@
 If the entry-point cannot be represented by <a class="link" href="libs-GstVaapiProfile.html#GstVaapiEntrypoint" title="enum GstVaapiEntrypoint"><span class="type">GstVaapiEntrypoint</span></a>,
 then zero is returned.</p>
 <div class="refsect3">
-<a name="id-1.2.17.6.7.5"></a><h4>Parameters</h4>
+<a name="id-1.3.25.6.7.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -296,7 +296,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.17.6.7.6"></a><h4>Returns</h4>
+<a name="id-1.3.25.6.7.6"></a><h4>Returns</h4>
 <p> the <a class="link" href="libs-GstVaapiProfile.html#GstVaapiEntrypoint" title="enum GstVaapiEntrypoint"><span class="type">GstVaapiEntrypoint</span></a> describing the <em class="parameter"><code>entrypoint</code></em>
 </p>
 <p></p>
@@ -312,7 +312,7 @@
 entry-point. If no matching VA entry-point was found, -1 is
 returned and this error must be reported to be fixed.</p>
 <div class="refsect3">
-<a name="id-1.2.17.6.8.5"></a><h4>Parameters</h4>
+<a name="id-1.3.25.6.8.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -327,7 +327,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.17.6.8.6"></a><h4>Returns</h4>
+<a name="id-1.3.25.6.8.6"></a><h4>Returns</h4>
 <p> the VA entry-point, or -1 if none was found</p>
 <p></p>
 </div>
@@ -339,7 +339,7 @@
 <a name="GstVaapiCodec"></a><h3>enum GstVaapiCodec</h3>
 <p>The set of all codecs for <a class="link" href="libs-GstVaapiProfile.html#GstVaapiCodec" title="enum GstVaapiCodec"><span class="type">GstVaapiCodec</span></a>.</p>
 <div class="refsect3">
-<a name="id-1.2.17.7.2.4"></a><h4>Members</h4>
+<a name="id-1.3.25.7.2.4"></a><h4>Members</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="300px" class="enum_members_name">
@@ -408,6 +408,13 @@
 <td class="enum_member_description"> </td>
 <td class="enum_member_annotations"> </td>
 </tr>
+<tr>
+<td class="enum_member_name"><p><a name="GST-VAAPI-CODEC-H265:CAPS"></a>GST_VAAPI_CODEC_H265</p></td>
+<td class="enum_member_description">
+<p>H.265 aka MPEG-H Part 2 (ITU-T H.265)</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
 </tbody>
 </table></div>
 </div>
@@ -417,7 +424,7 @@
 <a name="GstVaapiProfile"></a><h3>enum GstVaapiProfile</h3>
 <p>The set of all profiles for <a class="link" href="libs-GstVaapiProfile.html#GstVaapiProfile" title="enum GstVaapiProfile"><span class="type">GstVaapiProfile</span></a>.</p>
 <div class="refsect3">
-<a name="id-1.2.17.7.3.4"></a><h4>Members</h4>
+<a name="id-1.3.25.7.3.4"></a><h4>Members</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="300px" class="enum_members_name">
@@ -609,6 +616,27 @@
 <td class="enum_member_description"> </td>
 <td class="enum_member_annotations"> </td>
 </tr>
+<tr>
+<td class="enum_member_name"><p><a name="GST-VAAPI-PROFILE-H265-MAIN:CAPS"></a>GST_VAAPI_PROFILE_H265_MAIN</p></td>
+<td class="enum_member_description">
+<p>  H.265 main profile [A.3.2]</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="GST-VAAPI-PROFILE-H265-MAIN10:CAPS"></a>GST_VAAPI_PROFILE_H265_MAIN10</p></td>
+<td class="enum_member_description">
+<p>  H.265 main 10 profile [A.3.3]</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="GST-VAAPI-PROFILE-H265-MAIN-STILL-PICTURE:CAPS"></a>GST_VAAPI_PROFILE_H265_MAIN_STILL_PICTURE</p></td>
+<td class="enum_member_description">
+<p>  H.265 main still picture profile [A.3.4]</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
 </tbody>
 </table></div>
 </div>
@@ -618,7 +646,7 @@
 <a name="GstVaapiEntrypoint"></a><h3>enum GstVaapiEntrypoint</h3>
 <p>The set of all entrypoints for <a class="link" href="libs-GstVaapiProfile.html#GstVaapiEntrypoint" title="enum GstVaapiEntrypoint"><span class="type">GstVaapiEntrypoint</span></a></p>
 <div class="refsect3">
-<a name="id-1.2.17.7.4.4"></a><h4>Members</h4>
+<a name="id-1.3.25.7.4.4"></a><h4>Members</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="300px" class="enum_members_name">
@@ -654,6 +682,13 @@
 </td>
 <td class="enum_member_annotations"> </td>
 </tr>
+<tr>
+<td class="enum_member_name"><p><a name="GST-VAAPI-ENTRYPOINT-PICTURE-ENCODE:CAPS"></a>GST_VAAPI_ENTRYPOINT_PICTURE_ENCODE</p></td>
+<td class="enum_member_description">
+<p>Encode Picture</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
 </tbody>
 </table></div>
 </div>
diff -Nru gstreamer-vaapi-0.5.10/docs/reference/libs/html/libs-GstVaapiSubpicture.html gstreamer-vaapi-0.6.0/docs/reference/libs/html/libs-GstVaapiSubpicture.html
--- gstreamer-vaapi-0.5.10/docs/reference/libs/html/libs-GstVaapiSubpicture.html	2015-02-03 08:45:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/docs/reference/libs/html/libs-GstVaapiSubpicture.html	2015-07-15 12:52:27.000000000 +0000
@@ -134,7 +134,7 @@
 newly created object holds a reference on <em class="parameter"><code>image</code></em>
 .</p>
 <div class="refsect3">
-<a name="id-1.2.15.6.2.5"></a><h4>Parameters</h4>
+<a name="id-1.3.21.6.2.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -156,7 +156,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.15.6.2.6"></a><h4>Returns</h4>
+<a name="id-1.3.21.6.2.6"></a><h4>Returns</h4>
 <p> the newly allocated <a class="link" href="libs-GstVaapiSubpicture.html#GstVaapiSubpicture" title="GstVaapiSubpicture"><span class="type">GstVaapiSubpicture</span></a> object</p>
 <p></p>
 </div>
@@ -173,7 +173,7 @@
 along the way and attached to the resulting subpicture. The
 subpicture holds a unique reference to the underlying image.</p>
 <div class="refsect3">
-<a name="id-1.2.15.6.3.5"></a><h4>Parameters</h4>
+<a name="id-1.3.21.6.3.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -195,7 +195,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.15.6.3.6"></a><h4>Returns</h4>
+<a name="id-1.3.21.6.3.6"></a><h4>Returns</h4>
 <p> the newly allocated <a class="link" href="libs-GstVaapiSubpicture.html#GstVaapiSubpicture" title="GstVaapiSubpicture"><span class="type">GstVaapiSubpicture</span></a> object</p>
 <p></p>
 </div>
@@ -208,7 +208,7 @@
 <p>Returns the underlying VASubpictureID of the <em class="parameter"><code>subpicture</code></em>
 .</p>
 <div class="refsect3">
-<a name="id-1.2.15.6.4.5"></a><h4>Parameters</h4>
+<a name="id-1.3.21.6.4.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -223,7 +223,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.15.6.4.6"></a><h4>Returns</h4>
+<a name="id-1.3.21.6.4.6"></a><h4>Returns</h4>
 <p> the underlying VA subpicture id</p>
 <p></p>
 </div>
@@ -236,7 +236,7 @@
 <p>Returns the <em class="parameter"><code>subpicture</code></em>
  flags.</p>
 <div class="refsect3">
-<a name="id-1.2.15.6.5.5"></a><h4>Parameters</h4>
+<a name="id-1.3.21.6.5.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -251,7 +251,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.15.6.5.6"></a><h4>Returns</h4>
+<a name="id-1.3.21.6.5.6"></a><h4>Returns</h4>
 <p> the <em class="parameter"><code>subpicture</code></em>
 flags</p>
 <p></p>
@@ -265,7 +265,7 @@
 <p>Returns the value of global_alpha, set for this <em class="parameter"><code>subpicture</code></em>
 .</p>
 <div class="refsect3">
-<a name="id-1.2.15.6.6.5"></a><h4>Parameters</h4>
+<a name="id-1.3.21.6.6.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -280,7 +280,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.15.6.6.6"></a><h4>Returns</h4>
+<a name="id-1.3.21.6.6.6"></a><h4>Returns</h4>
 <p> the global_alpha value of this <em class="parameter"><code>subpicture</code></em>
 </p>
 <p></p>
@@ -298,7 +298,7 @@
 , i.e.
 the current VA driver supports it.</p>
 <div class="refsect3">
-<a name="id-1.2.15.6.7.5"></a><h4>Parameters</h4>
+<a name="id-1.3.21.6.7.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -320,7 +320,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.15.6.7.6"></a><h4>Returns</h4>
+<a name="id-1.3.21.6.7.6"></a><h4>Returns</h4>
 <p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if global_alpha could be set, <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> otherwise</p>
 <p></p>
 </div>
@@ -333,7 +333,7 @@
 <p>Returns the <a class="link" href="libs-gstvaapiimage.html#GstVaapiImage" title="GstVaapiImage"><span class="type">GstVaapiImage</span></a> this <em class="parameter"><code>subpicture</code></em>
  is bound to.</p>
 <div class="refsect3">
-<a name="id-1.2.15.6.8.5"></a><h4>Parameters</h4>
+<a name="id-1.3.21.6.8.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -348,7 +348,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.15.6.8.6"></a><h4>Returns</h4>
+<a name="id-1.3.21.6.8.6"></a><h4>Returns</h4>
 <p> the <a class="link" href="libs-gstvaapiimage.html#GstVaapiImage" title="GstVaapiImage"><span class="type">GstVaapiImage</span></a> this <em class="parameter"><code>subpicture</code></em>
 is bound to</p>
 <p></p>
@@ -365,7 +365,7 @@
 previous image is released and a new one is acquired on <em class="parameter"><code>image</code></em>
 .</p>
 <div class="refsect3">
-<a name="id-1.2.15.6.9.5"></a><h4>Parameters</h4>
+<a name="id-1.3.21.6.9.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -387,7 +387,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.15.6.9.6"></a><h4>Returns</h4>
+<a name="id-1.3.21.6.9.6"></a><h4>Returns</h4>
 <p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> on success</p>
 <p></p>
 </div>
diff -Nru gstreamer-vaapi-0.5.10/docs/reference/libs/html/libs-gstvaapisurface.html gstreamer-vaapi-0.6.0/docs/reference/libs/html/libs-gstvaapisurface.html
--- gstreamer-vaapi-0.5.10/docs/reference/libs/html/libs-gstvaapisurface.html	2015-02-03 08:45:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/docs/reference/libs/html/libs-gstvaapisurface.html	2015-07-15 12:52:27.000000000 +0000
@@ -204,7 +204,7 @@
 <p>Creates a new <a class="link" href="libs-gstvaapisurface.html#GstVaapiSurface" title="GstVaapiSurface"><span class="type">GstVaapiSurface</span></a> with the specified chroma format and
 dimensions.</p>
 <div class="refsect3">
-<a name="id-1.2.13.6.2.5"></a><h4>Parameters</h4>
+<a name="id-1.3.19.6.2.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -236,7 +236,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.13.6.2.6"></a><h4>Returns</h4>
+<a name="id-1.3.19.6.2.6"></a><h4>Returns</h4>
 <p> the newly allocated <a class="link" href="libs-gstvaapisurface.html#GstVaapiSurface" title="GstVaapiSurface"><span class="type">GstVaapiSurface</span></a> object</p>
 <p></p>
 </div>
@@ -252,7 +252,7 @@
 <p>Creates a new <a class="link" href="libs-gstvaapisurface.html#GstVaapiSurface" title="GstVaapiSurface"><span class="type">GstVaapiSurface</span></a> with the specified pixel format and
 dimensions.</p>
 <div class="refsect3">
-<a name="id-1.2.13.6.3.5"></a><h4>Parameters</h4>
+<a name="id-1.3.19.6.3.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -284,7 +284,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.13.6.3.6"></a><h4>Returns</h4>
+<a name="id-1.3.19.6.3.6"></a><h4>Returns</h4>
 <p> the newly allocated <a class="link" href="libs-gstvaapisurface.html#GstVaapiSurface" title="GstVaapiSurface"><span class="type">GstVaapiSurface</span></a> object, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>
 if creation of VA surface with explicit pixel format is not
 supported or failed.</p>
@@ -299,7 +299,7 @@
 <p>Returns the underlying VASurfaceID of the <em class="parameter"><code>surface</code></em>
 .</p>
 <div class="refsect3">
-<a name="id-1.2.13.6.4.5"></a><h4>Parameters</h4>
+<a name="id-1.3.19.6.4.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -314,7 +314,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.13.6.4.6"></a><h4>Returns</h4>
+<a name="id-1.3.19.6.4.6"></a><h4>Returns</h4>
 <p> the underlying VA surface id</p>
 <p></p>
 </div>
@@ -327,7 +327,7 @@
 <p>Returns the <a class="link" href="libs-gstvaapisurface.html#GstVaapiChromaType" title="enum GstVaapiChromaType"><span class="type">GstVaapiChromaType</span></a> the <em class="parameter"><code>surface</code></em>
  was created with.</p>
 <div class="refsect3">
-<a name="id-1.2.13.6.5.5"></a><h4>Parameters</h4>
+<a name="id-1.3.19.6.5.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -342,7 +342,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.13.6.5.6"></a><h4>Returns</h4>
+<a name="id-1.3.19.6.5.6"></a><h4>Returns</h4>
 <p> the <a class="link" href="libs-gstvaapisurface.html#GstVaapiChromaType" title="enum GstVaapiChromaType"><span class="type">GstVaapiChromaType</span></a></p>
 <p></p>
 </div>
@@ -355,7 +355,7 @@
 <p>Returns the <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gst-plugins-base-libs/html/gst-plugins-base-libs-gstvideo.html#GstVideoFormat"><span class="type">GstVideoFormat</span></a> the <em class="parameter"><code>surface</code></em>
  was created with.</p>
 <div class="refsect3">
-<a name="id-1.2.13.6.6.5"></a><h4>Parameters</h4>
+<a name="id-1.3.19.6.6.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -370,7 +370,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.13.6.6.6"></a><h4>Returns</h4>
+<a name="id-1.3.19.6.6.6"></a><h4>Returns</h4>
 <p> the <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gst-plugins-base-libs/html/gst-plugins-base-libs-gstvideo.html#GstVideoFormat"><span class="type">GstVideoFormat</span></a>, or <code class="literal">GST_VIDEO_FORMAT_ENCODED</code> if
 the surface was not created with an explicit video format, or if
 the underlying video format could not be determined</p>
@@ -385,7 +385,7 @@
 <p>Returns the <em class="parameter"><code>surface</code></em>
  width.</p>
 <div class="refsect3">
-<a name="id-1.2.13.6.7.5"></a><h4>Parameters</h4>
+<a name="id-1.3.19.6.7.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -400,7 +400,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.13.6.7.6"></a><h4>Returns</h4>
+<a name="id-1.3.19.6.7.6"></a><h4>Returns</h4>
 <p> the surface width, in pixels</p>
 <p></p>
 </div>
@@ -413,7 +413,7 @@
 <p>Returns the <em class="parameter"><code>surface</code></em>
  height.</p>
 <div class="refsect3">
-<a name="id-1.2.13.6.8.5"></a><h4>Parameters</h4>
+<a name="id-1.3.19.6.8.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -428,7 +428,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.13.6.8.6"></a><h4>Returns</h4>
+<a name="id-1.3.19.6.8.6"></a><h4>Returns</h4>
 <p> the surface height, in pixels.</p>
 <p></p>
 </div>
@@ -442,7 +442,7 @@
                             <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> *height_ptr</code></em>);</pre>
 <p>Retrieves the dimensions of a <a class="link" href="libs-gstvaapisurface.html#GstVaapiSurface" title="GstVaapiSurface"><span class="type">GstVaapiSurface</span></a>.</p>
 <div class="refsect3">
-<a name="id-1.2.13.6.9.5"></a><h4>Parameters</h4>
+<a name="id-1.3.19.6.9.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -490,7 +490,7 @@
 will remain unchanged until destroyed through the last call to
 <code class="function">gst_vaapi_object_unref()</code>.</p>
 <div class="refsect3">
-<a name="id-1.2.13.6.10.7"></a><h4>Parameters</h4>
+<a name="id-1.3.19.6.10.7"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -505,7 +505,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.13.6.10.8"></a><h4>Returns</h4>
+<a name="id-1.3.19.6.10.8"></a><h4>Returns</h4>
 <p> the newly allocated <a class="link" href="libs-gstvaapiimage.html#GstVaapiImage" title="GstVaapiImage"><span class="type">GstVaapiImage</span></a> object, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>
 on failure</p>
 <p></p>
@@ -522,7 +522,7 @@
 a format supported by the <em class="parameter"><code>surface</code></em>
 .</p>
 <div class="refsect3">
-<a name="id-1.2.13.6.11.5"></a><h4>Parameters</h4>
+<a name="id-1.3.19.6.11.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -544,7 +544,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.13.6.11.6"></a><h4>Returns</h4>
+<a name="id-1.3.19.6.11.6"></a><h4>Returns</h4>
 <p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> on success</p>
 <p></p>
 </div>
@@ -561,7 +561,7 @@
 have a format supported by the <em class="parameter"><code>surface</code></em>
 .</p>
 <div class="refsect3">
-<a name="id-1.2.13.6.12.5"></a><h4>Parameters</h4>
+<a name="id-1.3.19.6.12.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -583,7 +583,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.13.6.12.6"></a><h4>Returns</h4>
+<a name="id-1.3.19.6.12.6"></a><h4>Returns</h4>
 <p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> on success</p>
 <p></p>
 </div>
@@ -611,7 +611,7 @@
 reference to the <em class="parameter"><code>subpicture</code></em>
 .</p>
 <div class="refsect3">
-<a name="id-1.2.13.6.13.5"></a><h4>Parameters</h4>
+<a name="id-1.3.19.6.13.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -646,7 +646,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.13.6.13.6"></a><h4>Returns</h4>
+<a name="id-1.3.19.6.13.6"></a><h4>Returns</h4>
 <p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> on success</p>
 <p></p>
 </div>
@@ -662,7 +662,7 @@
  from <em class="parameter"><code>surface</code></em>
 . Other associations are kept.</p>
 <div class="refsect3">
-<a name="id-1.2.13.6.14.5"></a><h4>Parameters</h4>
+<a name="id-1.3.19.6.14.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -684,7 +684,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.13.6.14.6"></a><h4>Returns</h4>
+<a name="id-1.3.19.6.14.6"></a><h4>Returns</h4>
 <p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> on success</p>
 <p></p>
 </div>
@@ -698,7 +698,7 @@
  have been
 completed.</p>
 <div class="refsect3">
-<a name="id-1.2.13.6.15.5"></a><h4>Parameters</h4>
+<a name="id-1.3.19.6.15.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -713,7 +713,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.13.6.15.6"></a><h4>Returns</h4>
+<a name="id-1.3.19.6.15.6"></a><h4>Returns</h4>
 <p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> on success</p>
 <p></p>
 </div>
@@ -729,7 +729,7 @@
 <a class="link" href="libs-gstvaapisurface.html#GstVaapiSurfaceStatus" title="enum GstVaapiSurfaceStatus"><span class="type">GstVaapiSurfaceStatus</span></a> flags are returned into <em class="parameter"><code>pstatus</code></em>
 .</p>
 <div class="refsect3">
-<a name="id-1.2.13.6.16.5"></a><h4>Parameters</h4>
+<a name="id-1.3.19.6.16.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -751,7 +751,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.13.6.16.6"></a><h4>Returns</h4>
+<a name="id-1.3.19.6.16.6"></a><h4>Returns</h4>
 <p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> on success</p>
 <p></p>
 </div>
@@ -763,7 +763,7 @@
 <a name="GstVaapiChromaType"></a><h3>enum GstVaapiChromaType</h3>
 <p>The set of all chroma types for <a class="link" href="libs-gstvaapisurface.html#GstVaapiSurface" title="GstVaapiSurface"><span class="type">GstVaapiSurface</span></a>.</p>
 <div class="refsect3">
-<a name="id-1.2.13.7.2.4"></a><h4>Members</h4>
+<a name="id-1.3.19.7.2.4"></a><h4>Members</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="300px" class="enum_members_name">
@@ -836,7 +836,7 @@
 <a name="GstVaapiSurfaceStatus"></a><h3>enum GstVaapiSurfaceStatus</h3>
 <p>The set of all surface status for <a class="link" href="libs-gstvaapisurface.html#GstVaapiSurface" title="GstVaapiSurface"><span class="type">GstVaapiSurface</span></a>.</p>
 <div class="refsect3">
-<a name="id-1.2.13.7.3.4"></a><h4>Members</h4>
+<a name="id-1.3.19.7.3.4"></a><h4>Members</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="300px" class="enum_members_name">
@@ -881,7 +881,7 @@
 <a name="GstVaapiSurfaceRenderFlags"></a><h3>enum GstVaapiSurfaceRenderFlags</h3>
 <p>The set of all render flags for <a class="link" href="libs-GstVaapiWindow.html#gst-vaapi-window-put-surface" title="gst_vaapi_window_put_surface ()"><code class="function">gst_vaapi_window_put_surface()</code></a>.</p>
 <div class="refsect3">
-<a name="id-1.2.13.7.4.4"></a><h4>Members</h4>
+<a name="id-1.3.19.7.4.4"></a><h4>Members</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="300px" class="enum_members_name">
diff -Nru gstreamer-vaapi-0.5.10/docs/reference/libs/html/libs-GstVaapiSurfacePool.html gstreamer-vaapi-0.6.0/docs/reference/libs/html/libs-GstVaapiSurfacePool.html
--- gstreamer-vaapi-0.5.10/docs/reference/libs/html/libs-GstVaapiSurfacePool.html	2015-02-03 08:45:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/docs/reference/libs/html/libs-GstVaapiSurfacePool.html	2015-07-15 12:52:27.000000000 +0000
@@ -79,7 +79,7 @@
 surfaces with best "native" format would be created. Typically, this is
 NV12 format, but this is implementation (driver) defined.</p>
 <div class="refsect3">
-<a name="id-1.2.19.6.2.5"></a><h4>Parameters</h4>
+<a name="id-1.3.27.6.2.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -111,7 +111,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.19.6.2.6"></a><h4>Returns</h4>
+<a name="id-1.3.27.6.2.6"></a><h4>Returns</h4>
 <p> the newly allocated <a class="link" href="libs-GstVaapiVideoPool.html#GstVaapiVideoPool" title="GstVaapiVideoPool"><span class="type">GstVaapiVideoPool</span></a></p>
 <p></p>
 </div>
diff -Nru gstreamer-vaapi-0.5.10/docs/reference/libs/html/libs-GstVaapiSurfaceProxy.html gstreamer-vaapi-0.6.0/docs/reference/libs/html/libs-GstVaapiSurfaceProxy.html
--- gstreamer-vaapi-0.5.10/docs/reference/libs/html/libs-GstVaapiSurfaceProxy.html	2015-02-03 08:45:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/docs/reference/libs/html/libs-GstVaapiSurfaceProxy.html	2015-07-15 12:52:27.000000000 +0000
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="GStreamer VA-API Plugins 1.4 Library Reference Manual">
 <link rel="up" href="ch01.html" title="gst-plugins-vaapi Library">
-<link rel="prev" href="libs-GstVaapiDecoderVC1.html" title="GstVaapiDecoderVC1">
+<link rel="prev" href="libs-GstVaapiDecoderUnit.html" title="GstVaapiDecoderUnit">
 <link rel="next" href="libs-GstVaapiFilter.html" title="GstVaapiFilter">
 <meta name="generator" content="GTK-Doc V1.21 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
@@ -19,7 +19,7 @@
 </td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
 <td><a accesskey="u" href="ch01.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
-<td><a accesskey="p" href="libs-GstVaapiDecoderVC1.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="p" href="libs-GstVaapiDecoderUnit.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
 <td><a accesskey="n" href="libs-GstVaapiFilter.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
 </tr></table>
 <div class="refentry">
@@ -142,7 +142,7 @@
 <p>Returns the presentation duration for this surface <em class="parameter"><code>proxy</code></em>
 .</p>
 <div class="refsect3">
-<a name="id-1.2.27.5.2.5"></a><h4>Parameters</h4>
+<a name="id-1.3.38.5.2.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -157,7 +157,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.27.5.2.6"></a><h4>Returns</h4>
+<a name="id-1.3.38.5.2.6"></a><h4>Returns</h4>
 <p> the presentation duration</p>
 <p></p>
 </div>
@@ -171,7 +171,7 @@
 <em class="parameter"><code>proxy</code></em>
 .</p>
 <div class="refsect3">
-<a name="id-1.2.27.5.3.5"></a><h4>Parameters</h4>
+<a name="id-1.3.38.5.3.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -186,7 +186,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.27.5.3.6"></a><h4>Returns</h4>
+<a name="id-1.3.38.5.3.6"></a><h4>Returns</h4>
 <p> the set of <span class="type">GstVaapiSurfaceProxyFlags</span></p>
 <p></p>
 </div>
@@ -199,7 +199,7 @@
 <p>Returns the <a class="link" href="libs-gstvaapisurface.html#GstVaapiSurface" title="GstVaapiSurface"><span class="type">GstVaapiSurface</span></a> stored in the <em class="parameter"><code>proxy</code></em>
 .</p>
 <div class="refsect3">
-<a name="id-1.2.27.5.4.5"></a><h4>Parameters</h4>
+<a name="id-1.3.38.5.4.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -214,7 +214,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.27.5.4.6"></a><h4>Returns</h4>
+<a name="id-1.3.38.5.4.6"></a><h4>Returns</h4>
 <p> the <a class="link" href="libs-gstvaapisurface.html#GstVaapiSurface" title="GstVaapiSurface"><span class="type">GstVaapiSurface</span></a></p>
 <p></p>
 </div>
@@ -228,7 +228,7 @@
 <p>Returns the VA surface ID stored in the <em class="parameter"><code>proxy</code></em>
 .</p>
 <div class="refsect3">
-<a name="id-1.2.27.5.5.5"></a><h4>Parameters</h4>
+<a name="id-1.3.38.5.5.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -243,7 +243,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.27.5.5.6"></a><h4>Returns</h4>
+<a name="id-1.3.38.5.5.6"></a><h4>Returns</h4>
 <p> the <a class="link" href="libs-Basic-data-structures.html#GstVaapiID" title="GstVaapiID"><span class="type">GstVaapiID</span></a></p>
 <p></p>
 </div>
@@ -256,7 +256,7 @@
 <p>Returns the presentation timestamp for this surface <em class="parameter"><code>proxy</code></em>
 .</p>
 <div class="refsect3">
-<a name="id-1.2.27.5.6.5"></a><h4>Parameters</h4>
+<a name="id-1.3.38.5.6.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -271,7 +271,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.27.5.6.6"></a><h4>Returns</h4>
+<a name="id-1.3.38.5.6.6"></a><h4>Returns</h4>
 <p> the presentation timestamp</p>
 <p></p>
 </div>
@@ -287,7 +287,7 @@
 to the proxy object is released, then the underlying VA surface is
 pushed back to its parent pool.</p>
 <div class="refsect3">
-<a name="id-1.2.27.5.7.5"></a><h4>Parameters</h4>
+<a name="id-1.3.38.5.7.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -302,7 +302,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.27.5.7.6"></a><h4>Returns</h4>
+<a name="id-1.3.38.5.7.6"></a><h4>Returns</h4>
 <p> The same newly allocated <em class="parameter"><code>proxy</code></em>
 object, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> on error</p>
 <p></p>
@@ -320,7 +320,7 @@
 <p>Note: the destroy notify function is not copied into the new
 surface proxy object.</p>
 <div class="refsect3">
-<a name="id-1.2.27.5.8.6"></a><h4>Parameters</h4>
+<a name="id-1.3.38.5.8.6"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -335,7 +335,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.27.5.8.7"></a><h4>Returns</h4>
+<a name="id-1.3.38.5.8.7"></a><h4>Returns</h4>
 <p> The same newly allocated <em class="parameter"><code>proxy</code></em>
 object, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> on error</p>
 <p></p>
@@ -349,7 +349,7 @@
 <p>Atomically increases the reference count of the given <em class="parameter"><code>proxy</code></em>
  by one.</p>
 <div class="refsect3">
-<a name="id-1.2.27.5.9.5"></a><h4>Parameters</h4>
+<a name="id-1.3.38.5.9.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -364,7 +364,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.27.5.9.6"></a><h4>Returns</h4>
+<a name="id-1.3.38.5.9.6"></a><h4>Returns</h4>
 <p> The same <em class="parameter"><code>proxy</code></em>
 argument</p>
 <p></p>
@@ -384,7 +384,7 @@
 object. However, <em class="parameter"><code>new_proxy</code></em>
  can be NULL.</p>
 <div class="refsect3">
-<a name="id-1.2.27.5.10.5"></a><h4>Parameters</h4>
+<a name="id-1.3.38.5.10.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -421,7 +421,7 @@
 released, i.e. the underlying data storage is no longer valid and
 the callback function shall not expect anything from that.</p>
 <div class="refsect3">
-<a name="id-1.2.27.5.11.5"></a><h4>Parameters</h4>
+<a name="id-1.3.38.5.11.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -459,7 +459,7 @@
  by one. If
 the reference count reaches zero, the object will be free'd.</p>
 <div class="refsect3">
-<a name="id-1.2.27.5.12.5"></a><h4>Parameters</h4>
+<a name="id-1.3.38.5.12.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
diff -Nru gstreamer-vaapi-0.5.10/docs/reference/libs/html/libs-GstVaapiTextureEGL.html gstreamer-vaapi-0.6.0/docs/reference/libs/html/libs-GstVaapiTextureEGL.html
--- gstreamer-vaapi-0.5.10/docs/reference/libs/html/libs-GstVaapiTextureEGL.html	1970-01-01 00:00:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/docs/reference/libs/html/libs-GstVaapiTextureEGL.html	2015-07-15 12:52:27.000000000 +0000
@@ -0,0 +1,199 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>GStreamer VA-API Plugins 1.4 Library Reference Manual: GstVaapiTextureEGL</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="GStreamer VA-API Plugins 1.4 Library Reference Manual">
+<link rel="up" href="ch01.html" title="gst-plugins-vaapi Library">
+<link rel="prev" href="libs-GstVaapiTexture.html" title="GstVaapiTexture">
+<link rel="next" href="libs-GstVaapiTextureGLX.html" title="GstVaapiTextureGLX">
+<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts">
+<a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
+                  <a href="#libs-GstVaapiTextureEGL.description" class="shortcut">Description</a></span>
+</td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><a accesskey="u" href="ch01.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="libs-GstVaapiTexture.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="libs-GstVaapiTextureGLX.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+</tr></table>
+<div class="refentry">
+<a name="libs-GstVaapiTextureEGL"></a><div class="titlepage"></div>
+<div class="refnamediv"><table width="100%"><tr>
+<td valign="top">
+<h2><span class="refentrytitle"><a name="libs-GstVaapiTextureEGL.top_of_page"></a>GstVaapiTextureEGL</span></h2>
+<p>GstVaapiTextureEGL — VA/EGL texture abstraction</p>
+</td>
+<td class="gallery_image" valign="top" align="right"></td>
+</tr></table></div>
+<div class="refsect1">
+<a name="libs-GstVaapiTextureEGL.functions"></a><h2>Functions</h2>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="functions_return">
+<col class="functions_name">
+</colgroup>
+<tbody>
+<tr>
+<td class="function_type">
+<a class="link" href="libs-GstVaapiTexture.html#GstVaapiTexture" title="GstVaapiTexture"><span class="returnvalue">GstVaapiTexture</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libs-GstVaapiTextureEGL.html#gst-vaapi-texture-egl-new" title="gst_vaapi_texture_egl_new ()">gst_vaapi_texture_egl_new</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a class="link" href="libs-GstVaapiTexture.html#GstVaapiTexture" title="GstVaapiTexture"><span class="returnvalue">GstVaapiTexture</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libs-GstVaapiTextureEGL.html#gst-vaapi-texture-egl-new-wrapped" title="gst_vaapi_texture_egl_new_wrapped ()">gst_vaapi_texture_egl_new_wrapped</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="libs-GstVaapiTextureEGL.description"></a><h2>Description</h2>
+</div>
+<div class="refsect1">
+<a name="libs-GstVaapiTextureEGL.functions_details"></a><h2>Functions</h2>
+<div class="refsect2">
+<a name="gst-vaapi-texture-egl-new"></a><h3>gst_vaapi_texture_egl_new ()</h3>
+<pre class="programlisting"><a class="link" href="libs-GstVaapiTexture.html#GstVaapiTexture" title="GstVaapiTexture"><span class="returnvalue">GstVaapiTexture</span></a> *
+gst_vaapi_texture_egl_new (<em class="parameter"><code><a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a> *display</code></em>,
+                           <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> target</code></em>,
+                           <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> format</code></em>,
+                           <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> width</code></em>,
+                           <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> height</code></em>);</pre>
+<p>Creates a texture with the specified dimensions, <em class="parameter"><code>target</code></em>
+ and
+<em class="parameter"><code>format</code></em>
+. Note that only GL_TEXTURE_2D <em class="parameter"><code>target</code></em>
+ and GL_RGBA or
+GL_BGRA formats are supported at this time.</p>
+<p>The application shall maintain the live EGL context itself. That
+is, <code class="function">gst_vaapi_window_egl_make_current()</code> must be called beforehand,
+or any other function like <code class="function">eglMakeCurrent()</code> if the context is
+managed outside of this library.</p>
+<div class="refsect3">
+<a name="id-1.3.23.5.2.6"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>display</p></td>
+<td class="parameter_description"><p>a <a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>target</p></td>
+<td class="parameter_description"><p>the target to which the texture is bound</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>format</p></td>
+<td class="parameter_description"><p>the format of the pixel data</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>width</p></td>
+<td class="parameter_description"><p>the requested width, in pixels</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>height</p></td>
+<td class="parameter_description"><p>the requested height, in pixels</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="id-1.3.23.5.2.7"></a><h4>Returns</h4>
+<p> the newly created <a class="link" href="libs-GstVaapiTexture.html#GstVaapiTexture" title="GstVaapiTexture"><span class="type">GstVaapiTexture</span></a> object</p>
+<p></p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="gst-vaapi-texture-egl-new-wrapped"></a><h3>gst_vaapi_texture_egl_new_wrapped ()</h3>
+<pre class="programlisting"><a class="link" href="libs-GstVaapiTexture.html#GstVaapiTexture" title="GstVaapiTexture"><span class="returnvalue">GstVaapiTexture</span></a> *
+gst_vaapi_texture_egl_new_wrapped (<em class="parameter"><code><a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a> *display</code></em>,
+                                   <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> id</code></em>,
+                                   <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> target</code></em>,
+                                   <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> format</code></em>,
+                                   <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> width</code></em>,
+                                   <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> height</code></em>);</pre>
+<p>Creates a texture from an existing GL texture, with the specified
+<em class="parameter"><code>target</code></em>
+ and <em class="parameter"><code>format</code></em>
+. Note that only GL_TEXTURE_2D <em class="parameter"><code>target</code></em>
+ and
+GL_RGBA or GL_BGRA formats are supported at this time.</p>
+<p>The application shall maintain the live EGL context itself. That
+is, <code class="function">gst_vaapi_window_egl_make_current()</code> must be called beforehand,
+or any other function like <code class="function">eglMakeCurrent()</code> if the context is
+managed outside of this library.</p>
+<div class="refsect3">
+<a name="id-1.3.23.5.3.6"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>display</p></td>
+<td class="parameter_description"><p>a <a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>target</p></td>
+<td class="parameter_description"><p>the target to which the texture is bound</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>format</p></td>
+<td class="parameter_description"><p>the format of the pixel data</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>width</p></td>
+<td class="parameter_description"><p>the texture width, in pixels</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>height</p></td>
+<td class="parameter_description"><p>the texture height, in pixels</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="id-1.3.23.5.3.7"></a><h4>Returns</h4>
+<p> the newly created <a class="link" href="libs-GstVaapiTexture.html#GstVaapiTexture" title="GstVaapiTexture"><span class="type">GstVaapiTexture</span></a> object</p>
+<p></p>
+</div>
+</div>
+</div>
+<div class="refsect1">
+<a name="libs-GstVaapiTextureEGL.other_details"></a><h2>Types and Values</h2>
+</div>
+</div>
+<div class="footer">
+<hr>
+          Generated by GTK-Doc V1.21</div>
+</body>
+</html>
\ No newline at end of file
diff -Nru gstreamer-vaapi-0.5.10/docs/reference/libs/html/libs-GstVaapiTextureGLX.html gstreamer-vaapi-0.6.0/docs/reference/libs/html/libs-GstVaapiTextureGLX.html
--- gstreamer-vaapi-0.5.10/docs/reference/libs/html/libs-GstVaapiTextureGLX.html	1970-01-01 00:00:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/docs/reference/libs/html/libs-GstVaapiTextureGLX.html	2015-07-15 12:52:27.000000000 +0000
@@ -0,0 +1,189 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>GStreamer VA-API Plugins 1.4 Library Reference Manual: GstVaapiTextureGLX</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="GStreamer VA-API Plugins 1.4 Library Reference Manual">
+<link rel="up" href="ch01.html" title="gst-plugins-vaapi Library">
+<link rel="prev" href="libs-GstVaapiTextureEGL.html" title="GstVaapiTextureEGL">
+<link rel="next" href="libs-GstVaapiProfile.html" title="GstVaapiProfile">
+<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts">
+<a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
+                  <a href="#libs-GstVaapiTextureGLX.description" class="shortcut">Description</a></span>
+</td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><a accesskey="u" href="ch01.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="libs-GstVaapiTextureEGL.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="libs-GstVaapiProfile.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+</tr></table>
+<div class="refentry">
+<a name="libs-GstVaapiTextureGLX"></a><div class="titlepage"></div>
+<div class="refnamediv"><table width="100%"><tr>
+<td valign="top">
+<h2><span class="refentrytitle"><a name="libs-GstVaapiTextureGLX.top_of_page"></a>GstVaapiTextureGLX</span></h2>
+<p>GstVaapiTextureGLX — VA/GLX texture abstraction</p>
+</td>
+<td class="gallery_image" valign="top" align="right"></td>
+</tr></table></div>
+<div class="refsect1">
+<a name="libs-GstVaapiTextureGLX.functions"></a><h2>Functions</h2>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="functions_return">
+<col class="functions_name">
+</colgroup>
+<tbody>
+<tr>
+<td class="function_type">
+<a class="link" href="libs-GstVaapiTexture.html#GstVaapiTexture" title="GstVaapiTexture"><span class="returnvalue">GstVaapiTexture</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libs-GstVaapiTextureGLX.html#gst-vaapi-texture-glx-new" title="gst_vaapi_texture_glx_new ()">gst_vaapi_texture_glx_new</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a class="link" href="libs-GstVaapiTexture.html#GstVaapiTexture" title="GstVaapiTexture"><span class="returnvalue">GstVaapiTexture</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libs-GstVaapiTextureGLX.html#gst-vaapi-texture-glx-new-wrapped" title="gst_vaapi_texture_glx_new_wrapped ()">gst_vaapi_texture_glx_new_wrapped</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="libs-GstVaapiTextureGLX.description"></a><h2>Description</h2>
+</div>
+<div class="refsect1">
+<a name="libs-GstVaapiTextureGLX.functions_details"></a><h2>Functions</h2>
+<div class="refsect2">
+<a name="gst-vaapi-texture-glx-new"></a><h3>gst_vaapi_texture_glx_new ()</h3>
+<pre class="programlisting"><a class="link" href="libs-GstVaapiTexture.html#GstVaapiTexture" title="GstVaapiTexture"><span class="returnvalue">GstVaapiTexture</span></a> *
+gst_vaapi_texture_glx_new (<em class="parameter"><code><a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a> *display</code></em>,
+                           <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> target</code></em>,
+                           <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> format</code></em>,
+                           <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> width</code></em>,
+                           <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> height</code></em>);</pre>
+<p>Creates a texture with the specified dimensions, <em class="parameter"><code>target</code></em>
+ and
+<em class="parameter"><code>format</code></em>
+. Note that only GL_TEXTURE_2D <em class="parameter"><code>target</code></em>
+ and GL_RGBA or
+GL_BGRA formats are supported at this time.</p>
+<p>The application shall maintain the live GL context itself. That is,
+<a class="link" href="libs-GstVaapiWindowGLX.html#gst-vaapi-window-glx-make-current" title="gst_vaapi_window_glx_make_current ()"><code class="function">gst_vaapi_window_glx_make_current()</code></a> must be called beforehand, or
+any other function like <code class="function">glXMakeCurrent()</code> if the context is managed
+outside of this library.</p>
+<div class="refsect3">
+<a name="id-1.3.24.5.2.6"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>display</p></td>
+<td class="parameter_description"><p>a <a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>target</p></td>
+<td class="parameter_description"><p>the target to which the texture is bound</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>format</p></td>
+<td class="parameter_description"><p>the format of the pixel data</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>width</p></td>
+<td class="parameter_description"><p>the requested width, in pixels</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>height</p></td>
+<td class="parameter_description"><p>the requested height, in pixels</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="id-1.3.24.5.2.7"></a><h4>Returns</h4>
+<p> the newly created <a class="link" href="libs-GstVaapiTexture.html#GstVaapiTexture" title="GstVaapiTexture"><span class="type">GstVaapiTexture</span></a> object</p>
+<p></p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="gst-vaapi-texture-glx-new-wrapped"></a><h3>gst_vaapi_texture_glx_new_wrapped ()</h3>
+<pre class="programlisting"><a class="link" href="libs-GstVaapiTexture.html#GstVaapiTexture" title="GstVaapiTexture"><span class="returnvalue">GstVaapiTexture</span></a> *
+gst_vaapi_texture_glx_new_wrapped (<em class="parameter"><code><a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a> *display</code></em>,
+                                   <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> id</code></em>,
+                                   <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> target</code></em>,
+                                   <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> format</code></em>);</pre>
+<p>Creates a texture from an existing GL texture, with the specified
+<em class="parameter"><code>target</code></em>
+ and <em class="parameter"><code>format</code></em>
+. Note that only GL_TEXTURE_2D <em class="parameter"><code>target</code></em>
+ and
+GL_RGBA or GL_BGRA formats are supported at this time. The
+dimensions will be retrieved from the <em class="parameter"><code>texture_id</code></em>
+.</p>
+<p>The application shall maintain the live GL context itself. That is,
+<a class="link" href="libs-GstVaapiWindowGLX.html#gst-vaapi-window-glx-make-current" title="gst_vaapi_window_glx_make_current ()"><code class="function">gst_vaapi_window_glx_make_current()</code></a> must be called beforehand, or
+any other function like <code class="function">glXMakeCurrent()</code> if the context is managed
+outside of this library.</p>
+<div class="refsect3">
+<a name="id-1.3.24.5.3.6"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>display</p></td>
+<td class="parameter_description"><p>a <a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>target</p></td>
+<td class="parameter_description"><p>the target to which the texture is bound</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>format</p></td>
+<td class="parameter_description"><p>the format of the pixel data</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="id-1.3.24.5.3.7"></a><h4>Returns</h4>
+<p> the newly created <a class="link" href="libs-GstVaapiTexture.html#GstVaapiTexture" title="GstVaapiTexture"><span class="type">GstVaapiTexture</span></a> object</p>
+<p></p>
+</div>
+</div>
+</div>
+<div class="refsect1">
+<a name="libs-GstVaapiTextureGLX.other_details"></a><h2>Types and Values</h2>
+</div>
+</div>
+<div class="footer">
+<hr>
+          Generated by GTK-Doc V1.21</div>
+</body>
+</html>
\ No newline at end of file
diff -Nru gstreamer-vaapi-0.5.10/docs/reference/libs/html/libs-GstVaapiTexture.html gstreamer-vaapi-0.6.0/docs/reference/libs/html/libs-GstVaapiTexture.html
--- gstreamer-vaapi-0.5.10/docs/reference/libs/html/libs-GstVaapiTexture.html	2015-02-03 08:45:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/docs/reference/libs/html/libs-GstVaapiTexture.html	2015-07-15 12:52:27.000000000 +0000
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="GStreamer VA-API Plugins 1.4 Library Reference Manual">
 <link rel="up" href="ch01.html" title="gst-plugins-vaapi Library">
 <link rel="prev" href="libs-GstVaapiSubpicture.html" title="GstVaapiSubpicture">
-<link rel="next" href="libs-GstVaapiProfile.html" title="GstVaapiProfile">
+<link rel="next" href="libs-GstVaapiTextureEGL.html" title="GstVaapiTextureEGL">
 <meta name="generator" content="GTK-Doc V1.21 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
@@ -20,7 +20,7 @@
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
 <td><a accesskey="u" href="ch01.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
 <td><a accesskey="p" href="libs-GstVaapiSubpicture.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
-<td><a accesskey="n" href="libs-GstVaapiProfile.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+<td><a accesskey="n" href="libs-GstVaapiTextureEGL.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
 </tr></table>
 <div class="refentry">
 <a name="libs-GstVaapiTexture"></a><div class="titlepage"></div>
@@ -49,6 +49,38 @@
 </tr>
 <tr>
 <td class="function_type">
+<a class="link" href="libs-GstVaapiTexture.html#GstVaapiTexture" title="GstVaapiTexture"><span class="returnvalue">GstVaapiTexture</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libs-GstVaapiTexture.html#gst-vaapi-texture-new-wrapped" title="gst_vaapi_texture_new_wrapped ()">gst_vaapi_texture_new_wrapped</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a class="link" href="libs-GstVaapiTexture.html#GstVaapiTexture" title="GstVaapiTexture"><span class="returnvalue">GstVaapiTexture</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libs-GstVaapiTexture.html#gst-vaapi-texture-ref" title="gst_vaapi_texture_ref ()">gst_vaapi_texture_ref</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="libs-GstVaapiTexture.html#gst-vaapi-texture-unref" title="gst_vaapi_texture_unref ()">gst_vaapi_texture_unref</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="libs-GstVaapiTexture.html#gst-vaapi-texture-replace" title="gst_vaapi_texture_replace ()">gst_vaapi_texture_replace</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
 <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a>
 </td>
 <td class="function_name">
@@ -97,6 +129,22 @@
 </tr>
 <tr>
 <td class="function_type">
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="libs-GstVaapiTexture.html#gst-vaapi-texture-get-orientation-flags" title="gst_vaapi_texture_get_orientation_flags ()">gst_vaapi_texture_get_orientation_flags</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="libs-GstVaapiTexture.html#gst-vaapi-texture-set-orientation-flags" title="gst_vaapi_texture_set_orientation_flags ()">gst_vaapi_texture_set_orientation_flags</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
 <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 </td>
 <td class="function_name">
@@ -140,7 +188,7 @@
 GL_BGRA formats are supported at this time.</p>
 <p>The application shall maintain the live GL context itself.</p>
 <div class="refsect3">
-<a name="id-1.2.16.6.2.6"></a><h4>Parameters</h4>
+<a name="id-1.3.22.6.2.6"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -177,20 +225,176 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.16.6.2.7"></a><h4>Returns</h4>
+<a name="id-1.3.22.6.2.7"></a><h4>Returns</h4>
 <p> the newly created <a class="link" href="libs-GstVaapiTexture.html#GstVaapiTexture" title="GstVaapiTexture"><span class="type">GstVaapiTexture</span></a> object</p>
 <p></p>
 </div>
 </div>
 <hr>
 <div class="refsect2">
+<a name="gst-vaapi-texture-new-wrapped"></a><h3>gst_vaapi_texture_new_wrapped ()</h3>
+<pre class="programlisting"><a class="link" href="libs-GstVaapiTexture.html#GstVaapiTexture" title="GstVaapiTexture"><span class="returnvalue">GstVaapiTexture</span></a> *
+gst_vaapi_texture_new_wrapped (<em class="parameter"><code><a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a> *display</code></em>,
+                               <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> id</code></em>,
+                               <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> target</code></em>,
+                               <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> format</code></em>,
+                               <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> width</code></em>,
+                               <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> height</code></em>);</pre>
+<p>Creates a texture with the specified dimensions, <em class="parameter"><code>target</code></em>
+ and
+<em class="parameter"><code>format</code></em>
+. Note that only GL_TEXTURE_2D <em class="parameter"><code>target</code></em>
+ and GL_RGBA or
+GL_BGRA formats are supported at this time.</p>
+<p>The size arguments <em class="parameter"><code>width</code></em>
+ and <em class="parameter"><code>height</code></em>
+ are only a suggestion. Should
+this be 0x0, then the actual size of the allocated texture storage
+would be either inherited from the original texture storage, if any
+and/or if possible, or derived from the VA surface in subsequent
+<a class="link" href="libs-GstVaapiTexture.html#gst-vaapi-texture-put-surface" title="gst_vaapi_texture_put_surface ()"><code class="function">gst_vaapi_texture_put_surface()</code></a> calls.</p>
+<p>The application shall maintain the live GL context itself.</p>
+<div class="refsect3">
+<a name="id-1.3.22.6.3.7"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>display</p></td>
+<td class="parameter_description"><p>a <a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>target</p></td>
+<td class="parameter_description"><p>the target to which the texture is bound</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>format</p></td>
+<td class="parameter_description"><p>the format of the pixel data</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>width</p></td>
+<td class="parameter_description"><p>the suggested width, in pixels</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>height</p></td>
+<td class="parameter_description"><p>the suggested height, in pixels</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="id-1.3.22.6.3.8"></a><h4>Returns</h4>
+<p> the newly created <a class="link" href="libs-GstVaapiTexture.html#GstVaapiTexture" title="GstVaapiTexture"><span class="type">GstVaapiTexture</span></a> object</p>
+<p></p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="gst-vaapi-texture-ref"></a><h3>gst_vaapi_texture_ref ()</h3>
+<pre class="programlisting"><a class="link" href="libs-GstVaapiTexture.html#GstVaapiTexture" title="GstVaapiTexture"><span class="returnvalue">GstVaapiTexture</span></a> *
+gst_vaapi_texture_ref (<em class="parameter"><code><a class="link" href="libs-GstVaapiTexture.html#GstVaapiTexture" title="GstVaapiTexture"><span class="type">GstVaapiTexture</span></a> *texture</code></em>);</pre>
+<p>Atomically increases the reference count of the given <em class="parameter"><code>texture</code></em>
+ by one.</p>
+<div class="refsect3">
+<a name="id-1.3.22.6.4.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>texture</p></td>
+<td class="parameter_description"><p>a <a class="link" href="libs-GstVaapiTexture.html#GstVaapiTexture" title="GstVaapiTexture"><span class="type">GstVaapiTexture</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="id-1.3.22.6.4.6"></a><h4>Returns</h4>
+<p> The same <em class="parameter"><code>texture</code></em>
+argument</p>
+<p></p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="gst-vaapi-texture-unref"></a><h3>gst_vaapi_texture_unref ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+gst_vaapi_texture_unref (<em class="parameter"><code><a class="link" href="libs-GstVaapiTexture.html#GstVaapiTexture" title="GstVaapiTexture"><span class="type">GstVaapiTexture</span></a> *texture</code></em>);</pre>
+<p>Atomically decreases the reference count of the <em class="parameter"><code>texture</code></em>
+ by one. If
+the reference count reaches zero, the texture will be free'd.</p>
+<div class="refsect3">
+<a name="id-1.3.22.6.5.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>texture</p></td>
+<td class="parameter_description"><p>a <a class="link" href="libs-GstVaapiTexture.html#GstVaapiTexture" title="GstVaapiTexture"><span class="type">GstVaapiTexture</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="gst-vaapi-texture-replace"></a><h3>gst_vaapi_texture_replace ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+gst_vaapi_texture_replace (<em class="parameter"><code><a class="link" href="libs-GstVaapiTexture.html#GstVaapiTexture" title="GstVaapiTexture"><span class="type">GstVaapiTexture</span></a> **old_texture_ptr</code></em>,
+                           <em class="parameter"><code><a class="link" href="libs-GstVaapiTexture.html#GstVaapiTexture" title="GstVaapiTexture"><span class="type">GstVaapiTexture</span></a> *new_texture</code></em>);</pre>
+<p>Atomically replaces the texture texture held in <em class="parameter"><code>old_texture_ptr</code></em>
+
+with <em class="parameter"><code>new_texture</code></em>
+. This means that <em class="parameter"><code>old_texture_ptr</code></em>
+ shall reference
+a valid texture. However, <em class="parameter"><code>new_texture</code></em>
+ can be NULL.</p>
+<div class="refsect3">
+<a name="id-1.3.22.6.6.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>old_texture_ptr</p></td>
+<td class="parameter_description"><p>a pointer to a <a class="link" href="libs-GstVaapiTexture.html#GstVaapiTexture" title="GstVaapiTexture"><span class="type">GstVaapiTexture</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>new_texture</p></td>
+<td class="parameter_description"><p>a <a class="link" href="libs-GstVaapiTexture.html#GstVaapiTexture" title="GstVaapiTexture"><span class="type">GstVaapiTexture</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+<hr>
+<div class="refsect2">
 <a name="gst-vaapi-texture-get-id"></a><h3>gst_vaapi_texture_get_id ()</h3>
 <pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a>
 gst_vaapi_texture_get_id (<em class="parameter"><code><a class="link" href="libs-GstVaapiTexture.html#GstVaapiTexture" title="GstVaapiTexture"><span class="type">GstVaapiTexture</span></a> *texture</code></em>);</pre>
 <p>Returns the underlying texture id of the <em class="parameter"><code>texture</code></em>
 .</p>
 <div class="refsect3">
-<a name="id-1.2.16.6.3.5"></a><h4>Parameters</h4>
+<a name="id-1.3.22.6.7.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -205,7 +409,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.16.6.3.6"></a><h4>Returns</h4>
+<a name="id-1.3.22.6.7.6"></a><h4>Returns</h4>
 <p> the underlying texture id of the <em class="parameter"><code>texture</code></em>
 </p>
 <p></p>
@@ -219,7 +423,7 @@
 <p>Returns the <em class="parameter"><code>texture</code></em>
  target type</p>
 <div class="refsect3">
-<a name="id-1.2.16.6.4.5"></a><h4>Parameters</h4>
+<a name="id-1.3.22.6.8.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -234,7 +438,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.16.6.4.6"></a><h4>Returns</h4>
+<a name="id-1.3.22.6.8.6"></a><h4>Returns</h4>
 <p> the texture target</p>
 <p></p>
 </div>
@@ -247,7 +451,7 @@
 <p>Returns the <em class="parameter"><code>texture</code></em>
  format</p>
 <div class="refsect3">
-<a name="id-1.2.16.6.5.5"></a><h4>Parameters</h4>
+<a name="id-1.3.22.6.9.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -262,7 +466,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.16.6.5.6"></a><h4>Returns</h4>
+<a name="id-1.3.22.6.9.6"></a><h4>Returns</h4>
 <p> the texture format</p>
 <p></p>
 </div>
@@ -275,7 +479,7 @@
 <p>Returns the <em class="parameter"><code>texture</code></em>
  width.</p>
 <div class="refsect3">
-<a name="id-1.2.16.6.6.5"></a><h4>Parameters</h4>
+<a name="id-1.3.22.6.10.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -290,7 +494,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.16.6.6.6"></a><h4>Returns</h4>
+<a name="id-1.3.22.6.10.6"></a><h4>Returns</h4>
 <p> the texture width, in pixels</p>
 <p></p>
 </div>
@@ -303,7 +507,7 @@
 <p>Returns the <em class="parameter"><code>texture</code></em>
  height.</p>
 <div class="refsect3">
-<a name="id-1.2.16.6.7.5"></a><h4>Parameters</h4>
+<a name="id-1.3.22.6.11.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -318,7 +522,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.16.6.7.6"></a><h4>Returns</h4>
+<a name="id-1.3.22.6.11.6"></a><h4>Returns</h4>
 <p> the texture height, in pixels.</p>
 <p></p>
 </div>
@@ -332,7 +536,7 @@
                             <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> *height_ptr</code></em>);</pre>
 <p>Retrieves the dimensions of a <a class="link" href="libs-GstVaapiTexture.html#GstVaapiTexture" title="GstVaapiTexture"><span class="type">GstVaapiTexture</span></a>.</p>
 <div class="refsect3">
-<a name="id-1.2.16.6.8.5"></a><h4>Parameters</h4>
+<a name="id-1.3.22.6.12.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -361,6 +565,69 @@
 </div>
 <hr>
 <div class="refsect2">
+<a name="gst-vaapi-texture-get-orientation-flags"></a><h3>gst_vaapi_texture_get_orientation_flags ()</h3>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a>
+gst_vaapi_texture_get_orientation_flags
+                               (<em class="parameter"><code><a class="link" href="libs-GstVaapiTexture.html#GstVaapiTexture" title="GstVaapiTexture"><span class="type">GstVaapiTexture</span></a> *texture</code></em>);</pre>
+<p>Retrieves the texture memory layout flags, i.e. orientation.</p>
+<div class="refsect3">
+<a name="id-1.3.22.6.13.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>texture</p></td>
+<td class="parameter_description"><p>a <a class="link" href="libs-GstVaapiTexture.html#GstVaapiTexture" title="GstVaapiTexture"><span class="type">GstVaapiTexture</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="id-1.3.22.6.13.6"></a><h4>Returns</h4>
+<p> the <span class="type">GstVaapiTextureOrientationFlags</span>.</p>
+<p></p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="gst-vaapi-texture-set-orientation-flags"></a><h3>gst_vaapi_texture_set_orientation_flags ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+gst_vaapi_texture_set_orientation_flags
+                               (<em class="parameter"><code><a class="link" href="libs-GstVaapiTexture.html#GstVaapiTexture" title="GstVaapiTexture"><span class="type">GstVaapiTexture</span></a> *texture</code></em>,
+                                <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> flags</code></em>);</pre>
+<p>Reset the texture orientation flags to the supplied set of
+<em class="parameter"><code>flags</code></em>
+. This completely replaces the previously installed
+flags. So, should they still be needed, then they shall be
+retrieved first with <a class="link" href="libs-GstVaapiTexture.html#gst-vaapi-texture-get-orientation-flags" title="gst_vaapi_texture_get_orientation_flags ()"><code class="function">gst_vaapi_texture_get_orientation_flags()</code></a>.</p>
+<div class="refsect3">
+<a name="id-1.3.22.6.14.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>texture</p></td>
+<td class="parameter_description"><p>a <a class="link" href="libs-GstVaapiTexture.html#GstVaapiTexture" title="GstVaapiTexture"><span class="type">GstVaapiTexture</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>flags</p></td>
+<td class="parameter_description"><p>a bitmask of <span class="type">GstVaapiTextureOrientationFlags</span></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+<hr>
+<div class="refsect2">
 <a name="gst-vaapi-texture-put-surface"></a><h3>gst_vaapi_texture_put_surface ()</h3>
 <pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 gst_vaapi_texture_put_surface (<em class="parameter"><code><a class="link" href="libs-GstVaapiTexture.html#GstVaapiTexture" title="GstVaapiTexture"><span class="type">GstVaapiTexture</span></a> *texture</code></em>,
@@ -373,7 +640,7 @@
 de-interlacing (if needed), color space conversion, scaling and
 other postprocessing transformations are performed.</p>
 <div class="refsect3">
-<a name="id-1.2.16.6.9.5"></a><h4>Parameters</h4>
+<a name="id-1.3.22.6.15.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -400,7 +667,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.16.6.9.6"></a><h4>Returns</h4>
+<a name="id-1.3.22.6.15.6"></a><h4>Returns</h4>
 <p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> on success</p>
 <p></p>
 </div>
diff -Nru gstreamer-vaapi-0.5.10/docs/reference/libs/html/libs-GstVaapiValue.html gstreamer-vaapi-0.6.0/docs/reference/libs/html/libs-GstVaapiValue.html
--- gstreamer-vaapi-0.5.10/docs/reference/libs/html/libs-GstVaapiValue.html	1970-01-01 00:00:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/docs/reference/libs/html/libs-GstVaapiValue.html	2015-07-15 12:52:27.000000000 +0000
@@ -0,0 +1,247 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>GStreamer VA-API Plugins 1.4 Library Reference Manual: GstVaapiValue</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="GStreamer VA-API Plugins 1.4 Library Reference Manual">
+<link rel="up" href="ch01.html" title="gst-plugins-vaapi Library">
+<link rel="prev" href="libs-GstVaapiFilter.html" title="GstVaapiFilter">
+<link rel="next" href="libs-GstVaapiParserFrame.html" title="GstVaapiParserFrame">
+<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts">
+<a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
+                  <a href="#libs-GstVaapiValue.description" class="shortcut">Description</a></span>
+</td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><a accesskey="u" href="ch01.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="libs-GstVaapiFilter.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="libs-GstVaapiParserFrame.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+</tr></table>
+<div class="refentry">
+<a name="libs-GstVaapiValue"></a><div class="titlepage"></div>
+<div class="refnamediv"><table width="100%"><tr>
+<td valign="top">
+<h2><span class="refentrytitle"><a name="libs-GstVaapiValue.top_of_page"></a>GstVaapiValue</span></h2>
+<p>GstVaapiValue — GValue implementations specific to VA-API</p>
+</td>
+<td class="gallery_image" valign="top" align="right"></td>
+</tr></table></div>
+<div class="refsect1">
+<a name="libs-GstVaapiValue.functions"></a><h2>Functions</h2>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="functions_return">
+<col class="functions_name">
+</colgroup>
+<tbody><tr>
+<td class="define_keyword">#define</td>
+<td class="function_name">
+<a class="link" href="libs-GstVaapiValue.html#GST-VAAPI-POPCOUNT32:CAPS" title="GST_VAAPI_POPCOUNT32()">GST_VAAPI_POPCOUNT32</a><span class="c_punctuation">()</span>
+</td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="libs-GstVaapiValue.other"></a><h2>Types and Values</h2>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="name">
+<col class="description">
+</colgroup>
+<tbody>
+<tr>
+<td class="datatype_keyword"> </td>
+<td class="function_name"><a class="link" href="libs-GstVaapiValue.html#GstVaapiEnumSubset" title="GstVaapiEnumSubset">GstVaapiEnumSubset</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="libs-GstVaapiValue.html#GST-VAAPI-TYPE-POINT:CAPS" title="GST_VAAPI_TYPE_POINT">GST_VAAPI_TYPE_POINT</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="libs-GstVaapiValue.html#GST-VAAPI-TYPE-RECTANGLE:CAPS" title="GST_VAAPI_TYPE_RECTANGLE">GST_VAAPI_TYPE_RECTANGLE</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="libs-GstVaapiValue.html#GST-VAAPI-TYPE-RENDER-MODE:CAPS" title="GST_VAAPI_TYPE_RENDER_MODE">GST_VAAPI_TYPE_RENDER_MODE</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="libs-GstVaapiValue.html#GST-VAAPI-TYPE-ROTATION:CAPS" title="GST_VAAPI_TYPE_ROTATION">GST_VAAPI_TYPE_ROTATION</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="libs-GstVaapiValue.html#GST-VAAPI-TYPE-RATE-CONTROL:CAPS" title="GST_VAAPI_TYPE_RATE_CONTROL">GST_VAAPI_TYPE_RATE_CONTROL</a></td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="libs-GstVaapiValue.description"></a><h2>Description</h2>
+</div>
+<div class="refsect1">
+<a name="libs-GstVaapiValue.functions_details"></a><h2>Functions</h2>
+<div class="refsect2">
+<a name="GST-VAAPI-POPCOUNT32:CAPS"></a><h3>GST_VAAPI_POPCOUNT32()</h3>
+<pre class="programlisting">#define             GST_VAAPI_POPCOUNT32(x)</pre>
+<p>Computes the number of bits set in the supplied 32-bit value <em class="parameter"><code>x</code></em>
+.</p>
+<div class="refsect3">
+<a name="id-1.3.40.6.2.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>x</p></td>
+<td class="parameter_description"><p>the value from which to compute population count</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="id-1.3.40.6.2.6"></a><h4>Returns</h4>
+<p> the number of bits set in <em class="parameter"><code>x</code></em>
+</p>
+<p></p>
+</div>
+</div>
+</div>
+<div class="refsect1">
+<a name="libs-GstVaapiValue.other_details"></a><h2>Types and Values</h2>
+<div class="refsect2">
+<a name="GstVaapiEnumSubset"></a><h3>GstVaapiEnumSubset</h3>
+<pre class="programlisting">typedef struct {
+    GType parent_type;
+    GType type;
+    GTypeInfo type_info;
+    const gchar *type_name;
+    GEnumValue *values;
+    guint num_values;
+} GstVaapiEnumSubset;
+</pre>
+<p>Structure that holds the required information to build a GEnum
+subset from the supplied <em class="parameter"><code>parent_type</code></em>
+, i.e. a subset of its values.</p>
+<div class="refsect3">
+<a name="id-1.3.40.7.2.5"></a><h4>Members</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="300px" class="struct_members_name">
+<col class="struct_members_description">
+<col width="200px" class="struct_members_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="struct_member_name"><p><a href="https://developer.gnome.org/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> <em class="structfield"><code><a name="GstVaapiEnumSubset.parent-type"></a>parent_type</code></em>;</p></td>
+<td class="struct_member_description"><p>parent enum type</p></td>
+<td class="struct_member_annotations"> </td>
+</tr>
+<tr>
+<td class="struct_member_name"><p><a href="https://developer.gnome.org/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> <em class="structfield"><code><a name="GstVaapiEnumSubset.type"></a>type</code></em>;</p></td>
+<td class="struct_member_description"><p>registered <a href="https://developer.gnome.org/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a></p></td>
+<td class="struct_member_annotations"> </td>
+</tr>
+<tr>
+<td class="struct_member_name"><p><a href="https://developer.gnome.org/gobject/unstable/gobject-Type-Information.html#GTypeInfo"><span class="type">GTypeInfo</span></a> <em class="structfield"><code><a name="GstVaapiEnumSubset.type-info"></a>type_info</code></em>;</p></td>
+<td class="struct_member_description"><p><a href="https://developer.gnome.org/gobject/unstable/gobject-Type-Information.html#GTypeInfo"><span class="type">GTypeInfo</span></a> used to build the <em class="parameter"><code>type</code></em>
+</p></td>
+<td class="struct_member_annotations"> </td>
+</tr>
+<tr>
+<td class="struct_member_name"><p>const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *<em class="structfield"><code><a name="GstVaapiEnumSubset.type-name"></a>type_name</code></em>;</p></td>
+<td class="struct_member_description"> </td>
+<td class="struct_member_annotations"> </td>
+</tr>
+<tr>
+<td class="struct_member_name"><p><a href="https://developer.gnome.org/gobject/unstable/gobject-Enumeration-and-Flag-Types.html#GEnumValue"><span class="type">GEnumValue</span></a> *<em class="structfield"><code><a name="GstVaapiEnumSubset.values"></a>values</code></em>;</p></td>
+<td class="struct_member_description"><p>pointer to a static array of <a href="https://developer.gnome.org/gobject/unstable/gobject-Enumeration-and-Flag-Types.html#GEnumValue"><span class="type">GEnumValue</span></a> elements</p></td>
+<td class="struct_member_annotations"> </td>
+</tr>
+<tr>
+<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> <em class="structfield"><code><a name="GstVaapiEnumSubset.num-values"></a>num_values</code></em>;</p></td>
+<td class="struct_member_description"><p>number of elements in the <em class="parameter"><code>values</code></em>
+array, including the
+terminator</p></td>
+<td class="struct_member_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="GST-VAAPI-TYPE-POINT:CAPS"></a><h3>GST_VAAPI_TYPE_POINT</h3>
+<pre class="programlisting">#define GST_VAAPI_TYPE_POINT gst_vaapi_point_get_type()
+</pre>
+<p>A <a class="link" href="libs-Basic-data-structures.html#GstVaapiPoint" title="struct GstVaapiPoint"><span class="type">GstVaapiPoint</span></a> type that represents a 2D point coordinates.</p>
+<div class="refsect3">
+<a name="id-1.3.40.7.3.5"></a><h4>Returns</h4>
+<p> the GType of <a class="link" href="libs-Basic-data-structures.html#GstVaapiPoint" title="struct GstVaapiPoint"><span class="type">GstVaapiPoint</span></a></p>
+<p></p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="GST-VAAPI-TYPE-RECTANGLE:CAPS"></a><h3>GST_VAAPI_TYPE_RECTANGLE</h3>
+<pre class="programlisting">#define GST_VAAPI_TYPE_RECTANGLE gst_vaapi_rectangle_get_type()
+</pre>
+<p>A <a class="link" href="libs-Basic-data-structures.html#GstVaapiRectangle" title="struct GstVaapiRectangle"><span class="type">GstVaapiRectangle</span></a> type that represents a 2D rectangle position
+and size.</p>
+<div class="refsect3">
+<a name="id-1.3.40.7.4.5"></a><h4>Returns</h4>
+<p> the GType of <a class="link" href="libs-Basic-data-structures.html#GstVaapiRectangle" title="struct GstVaapiRectangle"><span class="type">GstVaapiRectangle</span></a></p>
+<p></p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="GST-VAAPI-TYPE-RENDER-MODE:CAPS"></a><h3>GST_VAAPI_TYPE_RENDER_MODE</h3>
+<pre class="programlisting">#define GST_VAAPI_TYPE_RENDER_MODE gst_vaapi_render_mode_get_type()
+</pre>
+<p>A <span class="type">GstVaapiRenderMode</span> type that represents the VA display backend
+rendering mode: overlay (2D engine) or textured-blit (3D engine).</p>
+<div class="refsect3">
+<a name="id-1.3.40.7.5.5"></a><h4>Returns</h4>
+<p> the <a href="https://developer.gnome.org/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> of GstVaapiRenderMode</p>
+<p></p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="GST-VAAPI-TYPE-ROTATION:CAPS"></a><h3>GST_VAAPI_TYPE_ROTATION</h3>
+<pre class="programlisting">#define GST_VAAPI_TYPE_ROTATION gst_vaapi_rotation_get_type()
+</pre>
+<p>A type that represents the VA display rotation.</p>
+<div class="refsect3">
+<a name="id-1.3.40.7.6.5"></a><h4>Returns</h4>
+<p> the <a href="https://developer.gnome.org/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> of GstVaapiRotation</p>
+<p></p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="GST-VAAPI-TYPE-RATE-CONTROL:CAPS"></a><h3>GST_VAAPI_TYPE_RATE_CONTROL</h3>
+<pre class="programlisting">#define GST_VAAPI_TYPE_RATE_CONTROL gst_vaapi_rate_control_get_type()
+</pre>
+<p>A type that represents the VA rate control.</p>
+<div class="refsect3">
+<a name="id-1.3.40.7.7.5"></a><h4>Returns</h4>
+<p> the <a href="https://developer.gnome.org/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> of GstVaapiRateControl</p>
+<p></p>
+</div>
+</div>
+</div>
+</div>
+<div class="footer">
+<hr>
+          Generated by GTK-Doc V1.21</div>
+</body>
+</html>
\ No newline at end of file
diff -Nru gstreamer-vaapi-0.5.10/docs/reference/libs/html/libs-GstVaapiVideoPool.html gstreamer-vaapi-0.6.0/docs/reference/libs/html/libs-GstVaapiVideoPool.html
--- gstreamer-vaapi-0.5.10/docs/reference/libs/html/libs-GstVaapiVideoPool.html	2015-02-03 08:45:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/docs/reference/libs/html/libs-GstVaapiVideoPool.html	2015-07-15 12:52:27.000000000 +0000
@@ -149,7 +149,7 @@
 
 owns the returned object and it shall not be unref'ed.</p>
 <div class="refsect3">
-<a name="id-1.2.18.6.2.5"></a><h4>Parameters</h4>
+<a name="id-1.3.26.6.2.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -164,7 +164,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.18.6.2.6"></a><h4>Returns</h4>
+<a name="id-1.3.26.6.2.6"></a><h4>Returns</h4>
 <p> the <a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a> the <em class="parameter"><code>pool</code></em>
 is bound to</p>
 <p></p>
@@ -178,7 +178,7 @@
 <p>Retrieves the type of objects the video <em class="parameter"><code>pool</code></em>
  supports.</p>
 <div class="refsect3">
-<a name="id-1.2.18.6.3.5"></a><h4>Parameters</h4>
+<a name="id-1.3.26.6.3.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -193,7 +193,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.18.6.3.6"></a><h4>Returns</h4>
+<a name="id-1.3.26.6.3.6"></a><h4>Returns</h4>
 <p> the <span class="type">GstVaapiVideoPoolObjectType</span> of the underlying pool
 objects</p>
 <p></p>
@@ -211,7 +211,7 @@
 and thus shall be released through <a class="link" href="libs-GstVaapiVideoPool.html#gst-vaapi-video-pool-put-object" title="gst_vaapi_video_pool_put_object ()"><code class="function">gst_vaapi_video_pool_put_object()</code></a>
 when it's no longer needed.</p>
 <div class="refsect3">
-<a name="id-1.2.18.6.4.5"></a><h4>Parameters</h4>
+<a name="id-1.3.26.6.4.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -226,7 +226,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.18.6.4.6"></a><h4>Returns</h4>
+<a name="id-1.3.26.6.4.6"></a><h4>Returns</h4>
 <p> a possibly newly allocated object, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> on error</p>
 <p></p>
 </div>
@@ -245,7 +245,7 @@
 Calling this function with an arbitrary object yields undefined
 behaviour.</p>
 <div class="refsect3">
-<a name="id-1.2.18.6.5.5"></a><h4>Parameters</h4>
+<a name="id-1.3.26.6.5.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -279,7 +279,7 @@
 . This operation does not change the capacity of the
 pool.</p>
 <div class="refsect3">
-<a name="id-1.2.18.6.6.5"></a><h4>Parameters</h4>
+<a name="id-1.3.26.6.6.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -301,7 +301,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.18.6.6.6"></a><h4>Returns</h4>
+<a name="id-1.3.26.6.6.6"></a><h4>Returns</h4>
 <p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> on success.</p>
 <p></p>
 </div>
@@ -318,7 +318,7 @@
 . This operation does not change the capacity of the
 pool and is just a wrapper around <a class="link" href="libs-GstVaapiVideoPool.html#gst-vaapi-video-pool-add-object" title="gst_vaapi_video_pool_add_object ()"><code class="function">gst_vaapi_video_pool_add_object()</code></a>.</p>
 <div class="refsect3">
-<a name="id-1.2.18.6.7.5"></a><h4>Parameters</h4>
+<a name="id-1.3.26.6.7.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -340,7 +340,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.18.6.7.6"></a><h4>Returns</h4>
+<a name="id-1.3.26.6.7.6"></a><h4>Returns</h4>
 <p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> on success.</p>
 <p></p>
 </div>
@@ -353,7 +353,7 @@
 <p>Returns the maximum number of objects in the pool. i.e. the maximum
 number of objects that can be returned by <a class="link" href="libs-GstVaapiVideoPool.html#gst-vaapi-video-pool-get-object" title="gst_vaapi_video_pool_get_object ()"><code class="function">gst_vaapi_video_pool_get_object()</code></a>.</p>
 <div class="refsect3">
-<a name="id-1.2.18.6.8.5"></a><h4>Parameters</h4>
+<a name="id-1.3.26.6.8.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -368,7 +368,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.18.6.8.6"></a><h4>Returns</h4>
+<a name="id-1.3.26.6.8.6"></a><h4>Returns</h4>
 <p> the capacity of the pool</p>
 <p></p>
 </div>
@@ -381,7 +381,7 @@
                                    <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> capacity</code></em>);</pre>
 <p>Sets the maximum number of objects that can be allocated in the pool.</p>
 <div class="refsect3">
-<a name="id-1.2.18.6.9.5"></a><h4>Parameters</h4>
+<a name="id-1.3.26.6.9.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -410,7 +410,7 @@
 gst_vaapi_video_pool_get_size (<em class="parameter"><code><a class="link" href="libs-GstVaapiVideoPool.html#GstVaapiVideoPool" title="GstVaapiVideoPool"><span class="type">GstVaapiVideoPool</span></a> *pool</code></em>);</pre>
 <p>Returns the number of free objects available in the pool.</p>
 <div class="refsect3">
-<a name="id-1.2.18.6.10.5"></a><h4>Parameters</h4>
+<a name="id-1.3.26.6.10.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -425,7 +425,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.18.6.10.6"></a><h4>Returns</h4>
+<a name="id-1.3.26.6.10.6"></a><h4>Returns</h4>
 <p> number of free objects in the pool</p>
 <p></p>
 </div>
@@ -443,7 +443,7 @@
 has no effect. Otherwise, it is a request for allocation of
 additional objects.</p>
 <div class="refsect3">
-<a name="id-1.2.18.6.11.5"></a><h4>Parameters</h4>
+<a name="id-1.3.26.6.11.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -465,7 +465,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.18.6.11.6"></a><h4>Returns</h4>
+<a name="id-1.3.26.6.11.6"></a><h4>Returns</h4>
 <p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> on success</p>
 <p></p>
 </div>
diff -Nru gstreamer-vaapi-0.5.10/docs/reference/libs/html/libs-GstVaapiWindowDRM.html gstreamer-vaapi-0.6.0/docs/reference/libs/html/libs-GstVaapiWindowDRM.html
--- gstreamer-vaapi-0.5.10/docs/reference/libs/html/libs-GstVaapiWindowDRM.html	1970-01-01 00:00:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/docs/reference/libs/html/libs-GstVaapiWindowDRM.html	2015-07-15 12:52:27.000000000 +0000
@@ -0,0 +1,113 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>GStreamer VA-API Plugins 1.4 Library Reference Manual: GstVaapiWindowDRM</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="GStreamer VA-API Plugins 1.4 Library Reference Manual">
+<link rel="up" href="ch01.html" title="gst-plugins-vaapi Library">
+<link rel="prev" href="libs-GstVaapiWindowEGL.html" title="GstVaapiWindowEGL">
+<link rel="next" href="libs-GstVaapiWindowWayland.html" title="GstVaapiWindowWayland">
+<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts">
+<a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
+                  <a href="#libs-GstVaapiWindowDRM.description" class="shortcut">Description</a></span>
+</td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><a accesskey="u" href="ch01.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="libs-GstVaapiWindowEGL.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="libs-GstVaapiWindowWayland.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+</tr></table>
+<div class="refentry">
+<a name="libs-GstVaapiWindowDRM"></a><div class="titlepage"></div>
+<div class="refnamediv"><table width="100%"><tr>
+<td valign="top">
+<h2><span class="refentrytitle"><a name="libs-GstVaapiWindowDRM.top_of_page"></a>GstVaapiWindowDRM</span></h2>
+<p>GstVaapiWindowDRM — VA/DRM dummy window abstraction</p>
+</td>
+<td class="gallery_image" valign="top" align="right"></td>
+</tr></table></div>
+<div class="refsect1">
+<a name="libs-GstVaapiWindowDRM.functions"></a><h2>Functions</h2>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="functions_return">
+<col class="functions_name">
+</colgroup>
+<tbody><tr>
+<td class="function_type">
+<a class="link" href="libs-GstVaapiWindow.html#GstVaapiWindow" title="GstVaapiWindow"><span class="returnvalue">GstVaapiWindow</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libs-GstVaapiWindowDRM.html#gst-vaapi-window-drm-new" title="gst_vaapi_window_drm_new ()">gst_vaapi_window_drm_new</a> <span class="c_punctuation">()</span>
+</td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="libs-GstVaapiWindowDRM.description"></a><h2>Description</h2>
+</div>
+<div class="refsect1">
+<a name="libs-GstVaapiWindowDRM.functions_details"></a><h2>Functions</h2>
+<div class="refsect2">
+<a name="gst-vaapi-window-drm-new"></a><h3>gst_vaapi_window_drm_new ()</h3>
+<pre class="programlisting"><a class="link" href="libs-GstVaapiWindow.html#GstVaapiWindow" title="GstVaapiWindow"><span class="returnvalue">GstVaapiWindow</span></a> *
+gst_vaapi_window_drm_new (<em class="parameter"><code><a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a> *display</code></em>,
+                          <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> width</code></em>,
+                          <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> height</code></em>);</pre>
+<p>Creates a dummy window. The window will be attached to the <em class="parameter"><code>display</code></em>
+.
+All rendering functions will return success since VA/DRM is a
+renderless API.</p>
+<p>Note: this dummy window object is only necessary to fulfill cases
+where the client application wants to automatically determine the
+best display to use for the current system. As such, it provides
+utility functions with the same API (function arguments) to help
+implement uniform function tables.</p>
+<div class="refsect3">
+<a name="id-1.3.14.5.2.6"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>display</p></td>
+<td class="parameter_description"><p>a <a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>width</p></td>
+<td class="parameter_description"><p>the requested window width, in pixels (unused)</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>height</p></td>
+<td class="parameter_description"><p>the requested windo height, in pixels (unused)</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="id-1.3.14.5.2.7"></a><h4>Returns</h4>
+<p> the newly allocated <a class="link" href="libs-GstVaapiWindow.html#GstVaapiWindow" title="GstVaapiWindow"><span class="type">GstVaapiWindow</span></a> object</p>
+<p></p>
+</div>
+</div>
+</div>
+<div class="refsect1">
+<a name="libs-GstVaapiWindowDRM.other_details"></a><h2>Types and Values</h2>
+</div>
+</div>
+<div class="footer">
+<hr>
+          Generated by GTK-Doc V1.21</div>
+</body>
+</html>
\ No newline at end of file
diff -Nru gstreamer-vaapi-0.5.10/docs/reference/libs/html/libs-GstVaapiWindowEGL.html gstreamer-vaapi-0.6.0/docs/reference/libs/html/libs-GstVaapiWindowEGL.html
--- gstreamer-vaapi-0.5.10/docs/reference/libs/html/libs-GstVaapiWindowEGL.html	1970-01-01 00:00:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/docs/reference/libs/html/libs-GstVaapiWindowEGL.html	2015-07-15 12:52:27.000000000 +0000
@@ -0,0 +1,110 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>GStreamer VA-API Plugins 1.4 Library Reference Manual: GstVaapiWindowEGL</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="GStreamer VA-API Plugins 1.4 Library Reference Manual">
+<link rel="up" href="ch01.html" title="gst-plugins-vaapi Library">
+<link rel="prev" href="libs-GstVaapiWindowGLX.html" title="GstVaapiWindowGLX">
+<link rel="next" href="libs-GstVaapiWindowDRM.html" title="GstVaapiWindowDRM">
+<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts">
+<a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
+                  <a href="#libs-GstVaapiWindowEGL.description" class="shortcut">Description</a></span>
+</td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><a accesskey="u" href="ch01.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="libs-GstVaapiWindowGLX.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="libs-GstVaapiWindowDRM.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+</tr></table>
+<div class="refentry">
+<a name="libs-GstVaapiWindowEGL"></a><div class="titlepage"></div>
+<div class="refnamediv"><table width="100%"><tr>
+<td valign="top">
+<h2><span class="refentrytitle"><a name="libs-GstVaapiWindowEGL.top_of_page"></a>GstVaapiWindowEGL</span></h2>
+<p>GstVaapiWindowEGL — VA/EGL window abstraction</p>
+</td>
+<td class="gallery_image" valign="top" align="right"></td>
+</tr></table></div>
+<div class="refsect1">
+<a name="libs-GstVaapiWindowEGL.functions"></a><h2>Functions</h2>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="functions_return">
+<col class="functions_name">
+</colgroup>
+<tbody><tr>
+<td class="function_type">
+<a class="link" href="libs-GstVaapiWindow.html#GstVaapiWindow" title="GstVaapiWindow"><span class="returnvalue">GstVaapiWindow</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libs-GstVaapiWindowEGL.html#gst-vaapi-window-egl-new" title="gst_vaapi_window_egl_new ()">gst_vaapi_window_egl_new</a> <span class="c_punctuation">()</span>
+</td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="libs-GstVaapiWindowEGL.description"></a><h2>Description</h2>
+</div>
+<div class="refsect1">
+<a name="libs-GstVaapiWindowEGL.functions_details"></a><h2>Functions</h2>
+<div class="refsect2">
+<a name="gst-vaapi-window-egl-new"></a><h3>gst_vaapi_window_egl_new ()</h3>
+<pre class="programlisting"><a class="link" href="libs-GstVaapiWindow.html#GstVaapiWindow" title="GstVaapiWindow"><span class="returnvalue">GstVaapiWindow</span></a> *
+gst_vaapi_window_egl_new (<em class="parameter"><code><a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a> *display</code></em>,
+                          <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> width</code></em>,
+                          <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> height</code></em>);</pre>
+<p>Creates a window with the specified <em class="parameter"><code>width</code></em>
+ and <em class="parameter"><code>height</code></em>
+. The window
+will be attached to the <em class="parameter"><code>display</code></em>
+ and remains invisible to the user
+until <a class="link" href="libs-GstVaapiWindow.html#gst-vaapi-window-show" title="gst_vaapi_window_show ()"><code class="function">gst_vaapi_window_show()</code></a> is called.</p>
+<div class="refsect3">
+<a name="id-1.3.13.5.2.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>display</p></td>
+<td class="parameter_description"><p>a <a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>width</p></td>
+<td class="parameter_description"><p>the requested window width, in pixels</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>height</p></td>
+<td class="parameter_description"><p>the requested windo height, in pixels</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="id-1.3.13.5.2.6"></a><h4>Returns</h4>
+<p> the newly allocated <a class="link" href="libs-GstVaapiWindow.html#GstVaapiWindow" title="GstVaapiWindow"><span class="type">GstVaapiWindow</span></a> object</p>
+<p></p>
+</div>
+</div>
+</div>
+<div class="refsect1">
+<a name="libs-GstVaapiWindowEGL.other_details"></a><h2>Types and Values</h2>
+</div>
+</div>
+<div class="footer">
+<hr>
+          Generated by GTK-Doc V1.21</div>
+</body>
+</html>
\ No newline at end of file
diff -Nru gstreamer-vaapi-0.5.10/docs/reference/libs/html/libs-GstVaapiWindowGLX.html gstreamer-vaapi-0.6.0/docs/reference/libs/html/libs-GstVaapiWindowGLX.html
--- gstreamer-vaapi-0.5.10/docs/reference/libs/html/libs-GstVaapiWindowGLX.html	2015-02-03 08:45:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/docs/reference/libs/html/libs-GstVaapiWindowGLX.html	2015-07-15 12:52:27.000000000 +0000
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="GStreamer VA-API Plugins 1.4 Library Reference Manual">
 <link rel="up" href="ch01.html" title="gst-plugins-vaapi Library">
 <link rel="prev" href="libs-GstVaapiWindowX11.html" title="GstVaapiWindowX11">
-<link rel="next" href="libs-GstVaapiPixmap.html" title="GstVaapiPixmap">
+<link rel="next" href="libs-GstVaapiWindowEGL.html" title="GstVaapiWindowEGL">
 <meta name="generator" content="GTK-Doc V1.21 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
@@ -20,14 +20,14 @@
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
 <td><a accesskey="u" href="ch01.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
 <td><a accesskey="p" href="libs-GstVaapiWindowX11.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
-<td><a accesskey="n" href="libs-GstVaapiPixmap.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+<td><a accesskey="n" href="libs-GstVaapiWindowEGL.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
 </tr></table>
 <div class="refentry">
 <a name="libs-GstVaapiWindowGLX"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
 <td valign="top">
 <h2><span class="refentrytitle"><a name="libs-GstVaapiWindowGLX.top_of_page"></a>GstVaapiWindowGLX</span></h2>
-<p>GstVaapiWindowGLX — VA/GLX window abstraction</p>
+<p>GstVaapiWindowGLX</p>
 </td>
 <td class="gallery_image" valign="top" align="right"></td>
 </tr></table></div>
@@ -122,44 +122,6 @@
 gst_vaapi_window_glx_new (<em class="parameter"><code><a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a> *display</code></em>,
                           <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> width</code></em>,
                           <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> height</code></em>);</pre>
-<p>Creates a window with the specified <em class="parameter"><code>width</code></em>
- and <em class="parameter"><code>height</code></em>
-. The window
-will be attached to the <em class="parameter"><code>display</code></em>
- and remains invisible to the user
-until <a class="link" href="libs-GstVaapiWindow.html#gst-vaapi-window-show" title="gst_vaapi_window_show ()"><code class="function">gst_vaapi_window_show()</code></a> is called.</p>
-<div class="refsect3">
-<a name="id-1.2.9.6.2.5"></a><h4>Parameters</h4>
-<div class="informaltable"><table width="100%" border="0">
-<colgroup>
-<col width="150px" class="parameters_name">
-<col class="parameters_description">
-<col width="200px" class="parameters_annotations">
-</colgroup>
-<tbody>
-<tr>
-<td class="parameter_name"><p>display</p></td>
-<td class="parameter_description"><p>a <a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a></p></td>
-<td class="parameter_annotations"> </td>
-</tr>
-<tr>
-<td class="parameter_name"><p>width</p></td>
-<td class="parameter_description"><p>the requested window width, in pixels</p></td>
-<td class="parameter_annotations"> </td>
-</tr>
-<tr>
-<td class="parameter_name"><p>height</p></td>
-<td class="parameter_description"><p>the requested windo height, in pixels</p></td>
-<td class="parameter_annotations"> </td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<div class="refsect3">
-<a name="id-1.2.9.6.2.6"></a><h4>Returns</h4>
-<p> the newly allocated <a class="link" href="libs-GstVaapiWindow.html#GstVaapiWindow" title="GstVaapiWindow"><span class="type">GstVaapiWindow</span></a> object</p>
-<p></p>
-</div>
 </div>
 <hr>
 <div class="refsect2">
@@ -167,67 +129,12 @@
 <pre class="programlisting"><a class="link" href="libs-GstVaapiWindow.html#GstVaapiWindow" title="GstVaapiWindow"><span class="returnvalue">GstVaapiWindow</span></a> *
 gst_vaapi_window_glx_new_with_xid (<em class="parameter"><code><a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a> *display</code></em>,
                                    <em class="parameter"><code><span class="type">Window</span> xid</code></em>);</pre>
-<p>Creates a <a class="link" href="libs-GstVaapiWindow.html#GstVaapiWindow" title="GstVaapiWindow"><span class="type">GstVaapiWindow</span></a> using the X11 <span class="type">Window</span> <em class="parameter"><code>xid</code></em>
-. The caller
-still owns the window and must call <code class="function">XDestroyWindow()</code> when all
-<a class="link" href="libs-GstVaapiWindow.html#GstVaapiWindow" title="GstVaapiWindow"><span class="type">GstVaapiWindow</span></a> references are released. Doing so too early can
-yield undefined behaviour.</p>
-<div class="refsect3">
-<a name="id-1.2.9.6.3.5"></a><h4>Parameters</h4>
-<div class="informaltable"><table width="100%" border="0">
-<colgroup>
-<col width="150px" class="parameters_name">
-<col class="parameters_description">
-<col width="200px" class="parameters_annotations">
-</colgroup>
-<tbody>
-<tr>
-<td class="parameter_name"><p>display</p></td>
-<td class="parameter_description"><p>a <a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a></p></td>
-<td class="parameter_annotations"> </td>
-</tr>
-<tr>
-<td class="parameter_name"><p>xid</p></td>
-<td class="parameter_description"><p>an X11 <span class="type">Window</span> id</p></td>
-<td class="parameter_annotations"> </td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<div class="refsect3">
-<a name="id-1.2.9.6.3.6"></a><h4>Returns</h4>
-<p> the newly allocated <a class="link" href="libs-GstVaapiWindow.html#GstVaapiWindow" title="GstVaapiWindow"><span class="type">GstVaapiWindow</span></a> object</p>
-<p></p>
-</div>
 </div>
 <hr>
 <div class="refsect2">
 <a name="gst-vaapi-window-glx-get-context"></a><h3>gst_vaapi_window_glx_get_context ()</h3>
 <pre class="programlisting"><span class="returnvalue">GLXContext</span>
 gst_vaapi_window_glx_get_context (<em class="parameter"><code><a class="link" href="libs-GstVaapiWindowGLX.html#GstVaapiWindowGLX" title="GstVaapiWindowGLX"><span class="type">GstVaapiWindowGLX</span></a> *window</code></em>);</pre>
-<p>Returns the <span class="type">GLXContext</span> bound to the <em class="parameter"><code>window</code></em>
-.</p>
-<div class="refsect3">
-<a name="id-1.2.9.6.4.5"></a><h4>Parameters</h4>
-<div class="informaltable"><table width="100%" border="0">
-<colgroup>
-<col width="150px" class="parameters_name">
-<col class="parameters_description">
-<col width="200px" class="parameters_annotations">
-</colgroup>
-<tbody><tr>
-<td class="parameter_name"><p>window</p></td>
-<td class="parameter_description"><p>a <a class="link" href="libs-GstVaapiWindowGLX.html#GstVaapiWindowGLX" title="GstVaapiWindowGLX"><span class="type">GstVaapiWindowGLX</span></a></p></td>
-<td class="parameter_annotations"> </td>
-</tr></tbody>
-</table></div>
-</div>
-<div class="refsect3">
-<a name="id-1.2.9.6.4.6"></a><h4>Returns</h4>
-<p> the <span class="type">GLXContext</span> bound to the <em class="parameter"><code>window</code></em>
-</p>
-<p></p>
-</div>
 </div>
 <hr>
 <div class="refsect2">
@@ -235,98 +142,18 @@
 <pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 gst_vaapi_window_glx_set_context (<em class="parameter"><code><a class="link" href="libs-GstVaapiWindowGLX.html#GstVaapiWindowGLX" title="GstVaapiWindowGLX"><span class="type">GstVaapiWindowGLX</span></a> *window</code></em>,
                                   <em class="parameter"><code><span class="type">GLXContext</span> ctx</code></em>);</pre>
-<p>Binds GLX context <em class="parameter"><code>ctx</code></em>
- to <em class="parameter"><code>window</code></em>
-. If <em class="parameter"><code>ctx</code></em>
- is non <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>, the caller
-is responsible to making sure it has compatible visual with that of
-the underlying X window. If <em class="parameter"><code>ctx</code></em>
- is <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>, a new context is created
-and the <em class="parameter"><code>window</code></em>
- owns it.</p>
-<div class="refsect3">
-<a name="id-1.2.9.6.5.5"></a><h4>Parameters</h4>
-<div class="informaltable"><table width="100%" border="0">
-<colgroup>
-<col width="150px" class="parameters_name">
-<col class="parameters_description">
-<col width="200px" class="parameters_annotations">
-</colgroup>
-<tbody>
-<tr>
-<td class="parameter_name"><p>window</p></td>
-<td class="parameter_description"><p>a <a class="link" href="libs-GstVaapiWindowGLX.html#GstVaapiWindowGLX" title="GstVaapiWindowGLX"><span class="type">GstVaapiWindowGLX</span></a></p></td>
-<td class="parameter_annotations"> </td>
-</tr>
-<tr>
-<td class="parameter_name"><p>ctx</p></td>
-<td class="parameter_description"><p>a GLX context</p></td>
-<td class="parameter_annotations"> </td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<div class="refsect3">
-<a name="id-1.2.9.6.5.6"></a><h4>Returns</h4>
-<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> on success</p>
-<p></p>
-</div>
 </div>
 <hr>
 <div class="refsect2">
 <a name="gst-vaapi-window-glx-make-current"></a><h3>gst_vaapi_window_glx_make_current ()</h3>
 <pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 gst_vaapi_window_glx_make_current (<em class="parameter"><code><a class="link" href="libs-GstVaapiWindowGLX.html#GstVaapiWindowGLX" title="GstVaapiWindowGLX"><span class="type">GstVaapiWindowGLX</span></a> *window</code></em>);</pre>
-<p>Makes the <em class="parameter"><code>window</code></em>
- GLX context the current GLX rendering context of
-the calling thread, replacing the previously current context if
-there was one.</p>
-<div class="refsect3">
-<a name="id-1.2.9.6.6.5"></a><h4>Parameters</h4>
-<div class="informaltable"><table width="100%" border="0">
-<colgroup>
-<col width="150px" class="parameters_name">
-<col class="parameters_description">
-<col width="200px" class="parameters_annotations">
-</colgroup>
-<tbody><tr>
-<td class="parameter_name"><p>window</p></td>
-<td class="parameter_description"><p>a <a class="link" href="libs-GstVaapiWindowGLX.html#GstVaapiWindowGLX" title="GstVaapiWindowGLX"><span class="type">GstVaapiWindowGLX</span></a></p></td>
-<td class="parameter_annotations"> </td>
-</tr></tbody>
-</table></div>
-</div>
-<div class="refsect3">
-<a name="id-1.2.9.6.6.6"></a><h4>Returns</h4>
-<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> on success</p>
-<p></p>
-</div>
 </div>
 <hr>
 <div class="refsect2">
 <a name="gst-vaapi-window-glx-swap-buffers"></a><h3>gst_vaapi_window_glx_swap_buffers ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
 gst_vaapi_window_glx_swap_buffers (<em class="parameter"><code><a class="link" href="libs-GstVaapiWindowGLX.html#GstVaapiWindowGLX" title="GstVaapiWindowGLX"><span class="type">GstVaapiWindowGLX</span></a> *window</code></em>);</pre>
-<p>Promotes the contents of the back buffer of <em class="parameter"><code>window</code></em>
- to become the
-contents of the front buffer of <em class="parameter"><code>window</code></em>
-. This simply is wrapper
-around <code class="function">glXSwapBuffers()</code>.</p>
-<div class="refsect3">
-<a name="id-1.2.9.6.7.5"></a><h4>Parameters</h4>
-<div class="informaltable"><table width="100%" border="0">
-<colgroup>
-<col width="150px" class="parameters_name">
-<col class="parameters_description">
-<col width="200px" class="parameters_annotations">
-</colgroup>
-<tbody><tr>
-<td class="parameter_name"><p>window</p></td>
-<td class="parameter_description"><p>a <a class="link" href="libs-GstVaapiWindowGLX.html#GstVaapiWindowGLX" title="GstVaapiWindowGLX"><span class="type">GstVaapiWindowGLX</span></a></p></td>
-<td class="parameter_annotations"> </td>
-</tr></tbody>
-</table></div>
-</div>
 </div>
 <hr>
 <div class="refsect2">
@@ -336,53 +163,6 @@
                                   <em class="parameter"><code><a class="link" href="libs-GstVaapiTexture.html#GstVaapiTexture" title="GstVaapiTexture"><span class="type">GstVaapiTexture</span></a> *texture</code></em>,
                                   <em class="parameter"><code>const <a class="link" href="libs-Basic-data-structures.html#GstVaapiRectangle" title="struct GstVaapiRectangle"><span class="type">GstVaapiRectangle</span></a> *src_rect</code></em>,
                                   <em class="parameter"><code>const <a class="link" href="libs-Basic-data-structures.html#GstVaapiRectangle" title="struct GstVaapiRectangle"><span class="type">GstVaapiRectangle</span></a> *dst_rect</code></em>);</pre>
-<p>Renders the <em class="parameter"><code>texture</code></em>
- region specified by <em class="parameter"><code>src_rect</code></em>
- into the <em class="parameter"><code>window</code></em>
-
-region specified by <em class="parameter"><code>dst_rect</code></em>
-.</p>
-<p>NOTE: only GL_TEXTURE_2D textures are supported at this time.</p>
-<div class="refsect3">
-<a name="id-1.2.9.6.8.6"></a><h4>Parameters</h4>
-<div class="informaltable"><table width="100%" border="0">
-<colgroup>
-<col width="150px" class="parameters_name">
-<col class="parameters_description">
-<col width="200px" class="parameters_annotations">
-</colgroup>
-<tbody>
-<tr>
-<td class="parameter_name"><p>window</p></td>
-<td class="parameter_description"><p>a <a class="link" href="libs-GstVaapiWindowGLX.html#GstVaapiWindowGLX" title="GstVaapiWindowGLX"><span class="type">GstVaapiWindowGLX</span></a></p></td>
-<td class="parameter_annotations"> </td>
-</tr>
-<tr>
-<td class="parameter_name"><p>texture</p></td>
-<td class="parameter_description"><p>a <a class="link" href="libs-GstVaapiTexture.html#GstVaapiTexture" title="GstVaapiTexture"><span class="type">GstVaapiTexture</span></a></p></td>
-<td class="parameter_annotations"> </td>
-</tr>
-<tr>
-<td class="parameter_name"><p>src_rect</p></td>
-<td class="parameter_description"><p>the sub-rectangle of the source texture to
-extract and process. If <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>, the entire texture will be used.</p></td>
-<td class="parameter_annotations"> </td>
-</tr>
-<tr>
-<td class="parameter_name"><p>dst_rect</p></td>
-<td class="parameter_description"><p>the sub-rectangle of the destination
-window into which the texture is rendered. If <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>, the entire
-window will be used.</p></td>
-<td class="parameter_annotations"> </td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<div class="refsect3">
-<a name="id-1.2.9.6.8.7"></a><h4>Returns</h4>
-<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> on success</p>
-<p></p>
-</div>
 </div>
 </div>
 <div class="refsect1">
@@ -390,7 +170,6 @@
 <div class="refsect2">
 <a name="GstVaapiWindowGLX"></a><h3>GstVaapiWindowGLX</h3>
 <pre class="programlisting">typedef struct _GstVaapiWindowGLX GstVaapiWindowGLX;</pre>
-<p>An X11 <span class="type">Window</span> suitable for GLX rendering.</p>
 </div>
 </div>
 </div>
diff -Nru gstreamer-vaapi-0.5.10/docs/reference/libs/html/libs-GstVaapiWindow.html gstreamer-vaapi-0.6.0/docs/reference/libs/html/libs-GstVaapiWindow.html
--- gstreamer-vaapi-0.5.10/docs/reference/libs/html/libs-GstVaapiWindow.html	2015-02-03 08:45:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/docs/reference/libs/html/libs-GstVaapiWindow.html	2015-07-15 12:52:27.000000000 +0000
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="GStreamer VA-API Plugins 1.4 Library Reference Manual">
 <link rel="up" href="ch01.html" title="gst-plugins-vaapi Library">
-<link rel="prev" href="libs-GstVaapiDisplayGLX.html" title="GstVaapiDisplayGLX">
+<link rel="prev" href="libs-GstVaapiDisplayWayland.html" title="GstVaapiDisplayWayland">
 <link rel="next" href="libs-GstVaapiWindowX11.html" title="GstVaapiWindowX11">
 <meta name="generator" content="GTK-Doc V1.21 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
@@ -19,7 +19,7 @@
 </td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
 <td><a accesskey="u" href="ch01.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
-<td><a accesskey="p" href="libs-GstVaapiDisplayGLX.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="p" href="libs-GstVaapiDisplayWayland.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
 <td><a accesskey="n" href="libs-GstVaapiWindowX11.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
 </tr></table>
 <div class="refentry">
@@ -171,7 +171,7 @@
 <p>Returns the <a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a> this <em class="parameter"><code>window</code></em>
  is bound to.</p>
 <div class="refsect3">
-<a name="id-1.2.7.6.2.5"></a><h4>Parameters</h4>
+<a name="id-1.3.10.6.2.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -186,7 +186,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.7.6.2.6"></a><h4>Returns</h4>
+<a name="id-1.3.10.6.2.6"></a><h4>Returns</h4>
 <p> the parent <a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a> object</p>
 <p></p>
 </div>
@@ -199,7 +199,7 @@
 <p>Flags a window to be displayed. Any window that is not shown will
 not appear on the screen.</p>
 <div class="refsect3">
-<a name="id-1.2.7.6.3.5"></a><h4>Parameters</h4>
+<a name="id-1.3.10.6.3.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -222,7 +222,7 @@
 <p>Reverses the effects of <a class="link" href="libs-GstVaapiWindow.html#gst-vaapi-window-show" title="gst_vaapi_window_show ()"><code class="function">gst_vaapi_window_show()</code></a>, causing the window
 to be hidden (invisible to the user).</p>
 <div class="refsect3">
-<a name="id-1.2.7.6.4.5"></a><h4>Parameters</h4>
+<a name="id-1.3.10.6.4.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -245,7 +245,7 @@
 <p>Retrieves whether the <em class="parameter"><code>window</code></em>
  is fullscreen or not</p>
 <div class="refsect3">
-<a name="id-1.2.7.6.5.5"></a><h4>Parameters</h4>
+<a name="id-1.3.10.6.5.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -260,7 +260,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.7.6.5.6"></a><h4>Returns</h4>
+<a name="id-1.3.10.6.5.6"></a><h4>Returns</h4>
 <p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the window is fullscreen</p>
 <p></p>
 </div>
@@ -274,7 +274,7 @@
 <p>Requests to place the <em class="parameter"><code>window</code></em>
  in fullscreen or unfullscreen states.</p>
 <div class="refsect3">
-<a name="id-1.2.7.6.6.5"></a><h4>Parameters</h4>
+<a name="id-1.3.10.6.6.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -303,7 +303,7 @@
 gst_vaapi_window_get_width (<em class="parameter"><code><a class="link" href="libs-GstVaapiWindow.html#GstVaapiWindow" title="GstVaapiWindow"><span class="type">GstVaapiWindow</span></a> *window</code></em>);</pre>
 <p>Retrieves the width of a <a class="link" href="libs-GstVaapiWindow.html#GstVaapiWindow" title="GstVaapiWindow"><span class="type">GstVaapiWindow</span></a>.</p>
 <div class="refsect3">
-<a name="id-1.2.7.6.7.5"></a><h4>Parameters</h4>
+<a name="id-1.3.10.6.7.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -318,7 +318,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.7.6.7.6"></a><h4>Returns</h4>
+<a name="id-1.3.10.6.7.6"></a><h4>Returns</h4>
 <p> the width of the <em class="parameter"><code>window</code></em>
 , in pixels</p>
 <p></p>
@@ -331,7 +331,7 @@
 gst_vaapi_window_get_height (<em class="parameter"><code><a class="link" href="libs-GstVaapiWindow.html#GstVaapiWindow" title="GstVaapiWindow"><span class="type">GstVaapiWindow</span></a> *window</code></em>);</pre>
 <p>Retrieves the height of a <a class="link" href="libs-GstVaapiWindow.html#GstVaapiWindow" title="GstVaapiWindow"><span class="type">GstVaapiWindow</span></a></p>
 <div class="refsect3">
-<a name="id-1.2.7.6.8.5"></a><h4>Parameters</h4>
+<a name="id-1.3.10.6.8.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -346,7 +346,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.7.6.8.6"></a><h4>Returns</h4>
+<a name="id-1.3.10.6.8.6"></a><h4>Returns</h4>
 <p> the height of the <em class="parameter"><code>window</code></em>
 , in pixels</p>
 <p></p>
@@ -361,7 +361,7 @@
                            <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> *height_ptr</code></em>);</pre>
 <p>Retrieves the dimensions of a <a class="link" href="libs-GstVaapiWindow.html#GstVaapiWindow" title="GstVaapiWindow"><span class="type">GstVaapiWindow</span></a>.</p>
 <div class="refsect3">
-<a name="id-1.2.7.6.9.5"></a><h4>Parameters</h4>
+<a name="id-1.3.10.6.9.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -398,7 +398,7 @@
  to match the specified <em class="parameter"><code>width</code></em>
 .</p>
 <div class="refsect3">
-<a name="id-1.2.7.6.10.5"></a><h4>Parameters</h4>
+<a name="id-1.3.10.6.10.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -430,7 +430,7 @@
  to match the specified <em class="parameter"><code>height</code></em>
 .</p>
 <div class="refsect3">
-<a name="id-1.2.7.6.11.5"></a><h4>Parameters</h4>
+<a name="id-1.3.10.6.11.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -464,7 +464,7 @@
  and <em class="parameter"><code>height</code></em>
 .</p>
 <div class="refsect3">
-<a name="id-1.2.7.6.12.5"></a><h4>Parameters</h4>
+<a name="id-1.3.10.6.12.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -506,7 +506,7 @@
 region specified by <em class="parameter"><code>dst_rect</code></em>
 .</p>
 <div class="refsect3">
-<a name="id-1.2.7.6.13.5"></a><h4>Parameters</h4>
+<a name="id-1.3.10.6.13.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -541,7 +541,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.7.6.13.6"></a><h4>Returns</h4>
+<a name="id-1.3.10.6.13.6"></a><h4>Returns</h4>
 <p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> on success</p>
 <p></p>
 </div>
@@ -565,7 +565,7 @@
 (if needed), color space conversion, scaling and other postprocessing
 transformations are performed.</p>
 <div class="refsect3">
-<a name="id-1.2.7.6.14.5"></a><h4>Parameters</h4>
+<a name="id-1.3.10.6.14.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -605,7 +605,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.7.6.14.6"></a><h4>Returns</h4>
+<a name="id-1.3.10.6.14.6"></a><h4>Returns</h4>
 <p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> on success</p>
 <p></p>
 </div>
diff -Nru gstreamer-vaapi-0.5.10/docs/reference/libs/html/libs-GstVaapiWindowWayland.html gstreamer-vaapi-0.6.0/docs/reference/libs/html/libs-GstVaapiWindowWayland.html
--- gstreamer-vaapi-0.5.10/docs/reference/libs/html/libs-GstVaapiWindowWayland.html	1970-01-01 00:00:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/docs/reference/libs/html/libs-GstVaapiWindowWayland.html	2015-07-15 12:52:27.000000000 +0000
@@ -0,0 +1,110 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>GStreamer VA-API Plugins 1.4 Library Reference Manual: GstVaapiWindowWayland</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="GStreamer VA-API Plugins 1.4 Library Reference Manual">
+<link rel="up" href="ch01.html" title="gst-plugins-vaapi Library">
+<link rel="prev" href="libs-GstVaapiWindowDRM.html" title="GstVaapiWindowDRM">
+<link rel="next" href="libs-GstVaapiPixmap.html" title="GstVaapiPixmap">
+<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts">
+<a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
+                  <a href="#libs-GstVaapiWindowWayland.description" class="shortcut">Description</a></span>
+</td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><a accesskey="u" href="ch01.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="libs-GstVaapiWindowDRM.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="libs-GstVaapiPixmap.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+</tr></table>
+<div class="refentry">
+<a name="libs-GstVaapiWindowWayland"></a><div class="titlepage"></div>
+<div class="refnamediv"><table width="100%"><tr>
+<td valign="top">
+<h2><span class="refentrytitle"><a name="libs-GstVaapiWindowWayland.top_of_page"></a>GstVaapiWindowWayland</span></h2>
+<p>GstVaapiWindowWayland — VA/Wayland window abstraction</p>
+</td>
+<td class="gallery_image" valign="top" align="right"></td>
+</tr></table></div>
+<div class="refsect1">
+<a name="libs-GstVaapiWindowWayland.functions"></a><h2>Functions</h2>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="functions_return">
+<col class="functions_name">
+</colgroup>
+<tbody><tr>
+<td class="function_type">
+<a class="link" href="libs-GstVaapiWindow.html#GstVaapiWindow" title="GstVaapiWindow"><span class="returnvalue">GstVaapiWindow</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libs-GstVaapiWindowWayland.html#gst-vaapi-window-wayland-new" title="gst_vaapi_window_wayland_new ()">gst_vaapi_window_wayland_new</a> <span class="c_punctuation">()</span>
+</td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="libs-GstVaapiWindowWayland.description"></a><h2>Description</h2>
+</div>
+<div class="refsect1">
+<a name="libs-GstVaapiWindowWayland.functions_details"></a><h2>Functions</h2>
+<div class="refsect2">
+<a name="gst-vaapi-window-wayland-new"></a><h3>gst_vaapi_window_wayland_new ()</h3>
+<pre class="programlisting"><a class="link" href="libs-GstVaapiWindow.html#GstVaapiWindow" title="GstVaapiWindow"><span class="returnvalue">GstVaapiWindow</span></a> *
+gst_vaapi_window_wayland_new (<em class="parameter"><code><a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a> *display</code></em>,
+                              <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> width</code></em>,
+                              <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> height</code></em>);</pre>
+<p>Creates a window with the specified <em class="parameter"><code>width</code></em>
+ and <em class="parameter"><code>height</code></em>
+. The window
+will be attached to the <em class="parameter"><code>display</code></em>
+ and remains invisible to the user
+until <a class="link" href="libs-GstVaapiWindow.html#gst-vaapi-window-show" title="gst_vaapi_window_show ()"><code class="function">gst_vaapi_window_show()</code></a> is called.</p>
+<div class="refsect3">
+<a name="id-1.3.15.5.2.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>display</p></td>
+<td class="parameter_description"><p>a <a class="link" href="libs-GstVaapiDisplay.html#GstVaapiDisplay" title="GstVaapiDisplay"><span class="type">GstVaapiDisplay</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>width</p></td>
+<td class="parameter_description"><p>the requested window width, in pixels</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>height</p></td>
+<td class="parameter_description"><p>the requested windo height, in pixels</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="id-1.3.15.5.2.6"></a><h4>Returns</h4>
+<p> the newly allocated <a class="link" href="libs-GstVaapiWindow.html#GstVaapiWindow" title="GstVaapiWindow"><span class="type">GstVaapiWindow</span></a> object</p>
+<p></p>
+</div>
+</div>
+</div>
+<div class="refsect1">
+<a name="libs-GstVaapiWindowWayland.other_details"></a><h2>Types and Values</h2>
+</div>
+</div>
+<div class="footer">
+<hr>
+          Generated by GTK-Doc V1.21</div>
+</body>
+</html>
\ No newline at end of file
diff -Nru gstreamer-vaapi-0.5.10/docs/reference/libs/html/libs-GstVaapiWindowX11.html gstreamer-vaapi-0.6.0/docs/reference/libs/html/libs-GstVaapiWindowX11.html
--- gstreamer-vaapi-0.5.10/docs/reference/libs/html/libs-GstVaapiWindowX11.html	2015-02-03 08:45:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/docs/reference/libs/html/libs-GstVaapiWindowX11.html	2015-07-15 12:52:27.000000000 +0000
@@ -104,7 +104,7 @@
 <p>Macro that evaluates to the underlying X11 <span class="type">Window</span> of <em class="parameter"><code>window</code></em>
 </p>
 <div class="refsect3">
-<a name="id-1.2.8.6.2.5"></a><h4>Parameters</h4>
+<a name="id-1.3.11.6.2.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -133,7 +133,7 @@
  and remains invisible to the user
 until <a class="link" href="libs-GstVaapiWindow.html#gst-vaapi-window-show" title="gst_vaapi_window_show ()"><code class="function">gst_vaapi_window_show()</code></a> is called.</p>
 <div class="refsect3">
-<a name="id-1.2.8.6.3.5"></a><h4>Parameters</h4>
+<a name="id-1.3.11.6.3.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -160,7 +160,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.8.6.3.6"></a><h4>Returns</h4>
+<a name="id-1.3.11.6.3.6"></a><h4>Returns</h4>
 <p> the newly allocated <a class="link" href="libs-GstVaapiWindow.html#GstVaapiWindow" title="GstVaapiWindow"><span class="type">GstVaapiWindow</span></a> object</p>
 <p></p>
 </div>
@@ -177,7 +177,7 @@
 <a class="link" href="libs-GstVaapiWindow.html#GstVaapiWindow" title="GstVaapiWindow"><span class="type">GstVaapiWindow</span></a> references are released. Doing so too early can
 yield undefined behaviour.</p>
 <div class="refsect3">
-<a name="id-1.2.8.6.4.5"></a><h4>Parameters</h4>
+<a name="id-1.3.11.6.4.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -199,7 +199,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.8.6.4.6"></a><h4>Returns</h4>
+<a name="id-1.3.11.6.4.6"></a><h4>Returns</h4>
 <p> the newly allocated <a class="link" href="libs-GstVaapiWindow.html#GstVaapiWindow" title="GstVaapiWindow"><span class="type">GstVaapiWindow</span></a> object</p>
 <p></p>
 </div>
@@ -213,7 +213,7 @@
 <a class="link" href="libs-GstVaapiWindowX11.html#gst-vaapi-window-x11-new" title="gst_vaapi_window_x11_new ()"><code class="function">gst_vaapi_window_x11_new()</code></a> or that was bound with
 <a class="link" href="libs-GstVaapiWindowX11.html#gst-vaapi-window-x11-new-with-xid" title="gst_vaapi_window_x11_new_with_xid ()"><code class="function">gst_vaapi_window_x11_new_with_xid()</code></a>.</p>
 <div class="refsect3">
-<a name="id-1.2.8.6.5.5"></a><h4>Parameters</h4>
+<a name="id-1.3.11.6.5.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -228,7 +228,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.8.6.5.6"></a><h4>Returns</h4>
+<a name="id-1.3.11.6.5.6"></a><h4>Returns</h4>
 <p> the underlying X11 <span class="type">Window</span> bound to <em class="parameter"><code>window</code></em>
 .</p>
 <p></p>
@@ -242,7 +242,7 @@
 <p>Checks whether the <em class="parameter"><code>window</code></em>
  XID was created by <a class="link" href="libs-GstVaapiWindowX11.html#gst-vaapi-window-x11-new" title="gst_vaapi_window_x11_new ()"><code class="function">gst_vaapi_window_x11_new()</code></a> or bound with <a class="link" href="libs-GstVaapiWindowX11.html#gst-vaapi-window-x11-new-with-xid" title="gst_vaapi_window_x11_new_with_xid ()"><code class="function">gst_vaapi_window_x11_new_with_xid()</code></a>.</p>
 <div class="refsect3">
-<a name="id-1.2.8.6.6.5"></a><h4>Parameters</h4>
+<a name="id-1.3.11.6.6.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -257,7 +257,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.8.6.6.6"></a><h4>Returns</h4>
+<a name="id-1.3.11.6.6.6"></a><h4>Returns</h4>
 <p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the underlying X window is owned by the
 caller (foreign window)</p>
 <p></p>
diff -Nru gstreamer-vaapi-0.5.10/docs/reference/libs/html/libs-GstVideoFormat.html gstreamer-vaapi-0.6.0/docs/reference/libs/html/libs-GstVideoFormat.html
--- gstreamer-vaapi-0.5.10/docs/reference/libs/html/libs-GstVideoFormat.html	2015-02-03 08:45:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/docs/reference/libs/html/libs-GstVideoFormat.html	2015-07-15 12:52:27.000000000 +0000
@@ -51,6 +51,14 @@
 <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gst-plugins-base-libs/html/gst-plugins-base-libs-gstvideo.html#GstVideoFormat"><span class="returnvalue">GstVideoFormat</span></a>
 </td>
 <td class="function_name">
+<a class="link" href="libs-GstVideoFormat.html#gst-vaapi-video-format-from-va-fourcc" title="gst_vaapi_video_format_from_va_fourcc ()">gst_vaapi_video_format_from_va_fourcc</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gst-plugins-base-libs/html/gst-plugins-base-libs-gstvideo.html#GstVideoFormat"><span class="returnvalue">GstVideoFormat</span></a>
+</td>
+<td class="function_name">
 <a class="link" href="libs-GstVideoFormat.html#gst-vaapi-video-format-from-va-format" title="gst_vaapi_video_format_from_va_format ()">gst_vaapi_video_format_from_va_format</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
@@ -108,7 +116,7 @@
 <p>Returns the string representation of the <em class="parameter"><code>format</code></em>
  argument.</p>
 <div class="refsect3">
-<a name="id-1.2.2.5.2.5"></a><h4>Parameters</h4>
+<a name="id-1.3.2.5.2.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -123,7 +131,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.2.5.2.6"></a><h4>Returns</h4>
+<a name="id-1.3.2.5.2.6"></a><h4>Returns</h4>
 <p> string representation of <em class="parameter"><code>format</code></em>
 , or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if unknown
 or unsupported.</p>
@@ -132,6 +140,35 @@
 </div>
 <hr>
 <div class="refsect2">
+<a name="gst-vaapi-video-format-from-va-fourcc"></a><h3>gst_vaapi_video_format_from_va_fourcc ()</h3>
+<pre class="programlisting"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gst-plugins-base-libs/html/gst-plugins-base-libs-gstvideo.html#GstVideoFormat"><span class="returnvalue">GstVideoFormat</span></a>
+gst_vaapi_video_format_from_va_fourcc (<em class="parameter"><code><span class="type">guint32</span> fourcc</code></em>);</pre>
+<p>Converts a VA fourcc into the corresponding <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gst-plugins-base-libs/html/gst-plugins-base-libs-gstvideo.html#GstVideoFormat"><span class="type">GstVideoFormat</span></a>. If no
+matching fourcc was found, then zero is returned.</p>
+<div class="refsect3">
+<a name="id-1.3.2.5.3.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>fourcc</p></td>
+<td class="parameter_description"><p>a FOURCC value</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="id-1.3.2.5.3.6"></a><h4>Returns</h4>
+<p> the <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gst-plugins-base-libs/html/gst-plugins-base-libs-gstvideo.html#GstVideoFormat"><span class="type">GstVideoFormat</span></a> corresponding to the VA <em class="parameter"><code>fourcc</code></em>
+</p>
+<p></p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
 <a name="gst-vaapi-video-format-from-va-format"></a><h3>gst_vaapi_video_format_from_va_format ()</h3>
 <pre class="programlisting"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gst-plugins-base-libs/html/gst-plugins-base-libs-gstvideo.html#GstVideoFormat"><span class="returnvalue">GstVideoFormat</span></a>
 gst_vaapi_video_format_from_va_format (<em class="parameter"><code>const <span class="type">VAImageFormat</span> *va_format</code></em>);</pre>
@@ -139,7 +176,7 @@
 If the image format cannot be represented by <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gst-plugins-base-libs/html/gst-plugins-base-libs-gstvideo.html#GstVideoFormat"><span class="type">GstVideoFormat</span></a>,
 then zero is returned.</p>
 <div class="refsect3">
-<a name="id-1.2.2.5.3.5"></a><h4>Parameters</h4>
+<a name="id-1.3.2.5.4.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -154,7 +191,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.2.5.3.6"></a><h4>Returns</h4>
+<a name="id-1.3.2.5.4.6"></a><h4>Returns</h4>
 <p> the <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gst-plugins-base-libs/html/gst-plugins-base-libs-gstvideo.html#GstVideoFormat"><span class="type">GstVideoFormat</span></a> describing the <em class="parameter"><code>va_format</code></em>
 </p>
 <p></p>
@@ -169,7 +206,7 @@
 <p>Converts a <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gst-plugins-base-libs/html/gst-plugins-base-libs-gstvideo.html#GstVideoFormat"><span class="type">GstVideoFormat</span></a> into the corresponding <a class="link" href="libs-gstvaapisurface.html#GstVaapiChromaType" title="enum GstVaapiChromaType"><span class="type">GstVaapiChromaType</span></a>
 format.</p>
 <div class="refsect3">
-<a name="id-1.2.2.5.4.5"></a><h4>Parameters</h4>
+<a name="id-1.3.2.5.5.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -184,7 +221,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.2.5.4.6"></a><h4>Returns</h4>
+<a name="id-1.3.2.5.5.6"></a><h4>Returns</h4>
 <p> the <a class="link" href="libs-gstvaapisurface.html#GstVaapiChromaType" title="enum GstVaapiChromaType"><span class="type">GstVaapiChromaType</span></a> format, or zero if no match
 was found.</p>
 <p></p>
@@ -199,7 +236,7 @@
 . The lower is the returned
 score, the best format this is for the underlying hardware.</p>
 <div class="refsect3">
-<a name="id-1.2.2.5.5.5"></a><h4>Parameters</h4>
+<a name="id-1.3.2.5.6.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -214,7 +251,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.2.5.5.6"></a><h4>Returns</h4>
+<a name="id-1.3.2.5.6.6"></a><h4>Returns</h4>
 <p> the <em class="parameter"><code>format</code></em>
 score, or <code class="literal">G_MAXUINT</code> if none was found</p>
 <p></p>
@@ -227,7 +264,7 @@
 gst_vaapi_video_format_is_rgb (<em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gst-plugins-base-libs/html/gst-plugins-base-libs-gstvideo.html#GstVideoFormat"><span class="type">GstVideoFormat</span></a> format</code></em>);</pre>
 <p>Checks whether the format is an RGB format.</p>
 <div class="refsect3">
-<a name="id-1.2.2.5.6.5"></a><h4>Parameters</h4>
+<a name="id-1.3.2.5.7.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -242,7 +279,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.2.5.6.6"></a><h4>Returns</h4>
+<a name="id-1.3.2.5.7.6"></a><h4>Returns</h4>
 <p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if <em class="parameter"><code>format</code></em>
 is RGB format</p>
 <p></p>
@@ -255,7 +292,7 @@
 gst_vaapi_video_format_is_yuv (<em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gst-plugins-base-libs/html/gst-plugins-base-libs-gstvideo.html#GstVideoFormat"><span class="type">GstVideoFormat</span></a> format</code></em>);</pre>
 <p>Checks whether the format is an YUV format.</p>
 <div class="refsect3">
-<a name="id-1.2.2.5.7.5"></a><h4>Parameters</h4>
+<a name="id-1.3.2.5.8.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -270,7 +307,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.2.5.7.6"></a><h4>Returns</h4>
+<a name="id-1.3.2.5.8.6"></a><h4>Returns</h4>
 <p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if <em class="parameter"><code>format</code></em>
 is YUV format</p>
 <p></p>
@@ -285,7 +322,7 @@
 format. If no matching VA image format was found, <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> is returned
 and this error must be reported to be fixed.</p>
 <div class="refsect3">
-<a name="id-1.2.2.5.8.5"></a><h4>Parameters</h4>
+<a name="id-1.3.2.5.9.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -300,7 +337,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.2.5.8.6"></a><h4>Returns</h4>
+<a name="id-1.3.2.5.9.6"></a><h4>Returns</h4>
 <p> the VA image format, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if none was found</p>
 <p></p>
 </div>
diff -Nru gstreamer-vaapi-0.5.10/docs/reference/libs/html/object-tree.html gstreamer-vaapi-0.6.0/docs/reference/libs/html/object-tree.html
--- gstreamer-vaapi-0.5.10/docs/reference/libs/html/object-tree.html	2015-02-03 08:45:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/docs/reference/libs/html/object-tree.html	2015-07-15 12:52:27.000000000 +0000
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="GStreamer VA-API Plugins 1.4 Library Reference Manual">
 <link rel="up" href="index.html" title="GStreamer VA-API Plugins 1.4 Library Reference Manual">
-<link rel="prev" href="libs-GstVaapiFilter.html" title="GstVaapiFilter">
+<link rel="prev" href="libs-GstVaapiContext.html" title="GstVaapiContext">
 <link rel="next" href="api-index-full.html" title="API Index">
 <meta name="generator" content="GTK-Doc V1.21 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
@@ -16,7 +16,7 @@
 <td width="100%" align="left" class="shortcuts"></td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
 <td><img src="up-insensitive.png" width="16" height="16" border="0"></td>
-<td><a accesskey="p" href="libs-GstVaapiFilter.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="p" href="libs-GstVaapiContext.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
 <td><a accesskey="n" href="api-index-full.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
 </tr></table>
 <div class="chapter">
diff -Nru gstreamer-vaapi-0.5.10/docs/reference/libs/libs-docs.xml gstreamer-vaapi-0.6.0/docs/reference/libs/libs-docs.xml
--- gstreamer-vaapi-0.5.10/docs/reference/libs/libs-docs.xml	2015-02-03 08:39:58.000000000 +0000
+++ gstreamer-vaapi-0.6.0/docs/reference/libs/libs-docs.xml	2015-07-15 12:50:38.000000000 +0000
@@ -6,6 +6,11 @@
     <title>GStreamer VA-API Plugins 1.4 Library Reference Manual</title>
   </bookinfo>
 
+  <para>
+    To ease the creation of plugins, a Gstreamer-oriented library was created,
+    which wraps <ulink rule="online-location" url="https://wiki.freedesktop.org/www/Software/vaapi/">VA-API</ulink>.
+  </para>
+
   <chapter>
     <title>gst-plugins-vaapi Library</title>
     <xi:include href="xml/videoformat.xml"/>
@@ -13,9 +18,15 @@
     <xi:include href="xml/gstvaapidisplay.xml"/>
     <xi:include href="xml/gstvaapidisplay_x11.xml"/>
     <xi:include href="xml/gstvaapidisplay_glx.xml"/>
+    <xi:include href="xml/gstvaapidisplay_egl.xml"/>
+    <xi:include href="xml/gstvaapidisplay_drm.xml"/>
+    <xi:include href="xml/gstvaapidisplay_wayland.xml"/>
     <xi:include href="xml/gstvaapiwindow.xml"/>
     <xi:include href="xml/gstvaapiwindow_x11.xml"/>
     <xi:include href="xml/gstvaapiwindow_glx.xml"/>
+    <xi:include href="xml/gstvaapiwindow_egl.xml"/>
+    <xi:include href="xml/gstvaapiwindow_drm.xml"/>
+    <xi:include href="xml/gstvaapiwindow_wayland.xml"/>
     <xi:include href="xml/gstvaapipixmap.xml"/>
     <xi:include href="xml/gstvaapipixmap_x11.xml"/>
     <xi:include href="xml/gstvaapiobject.xml"/>
@@ -23,6 +34,8 @@
     <xi:include href="xml/gstvaapiimage.xml"/>
     <xi:include href="xml/gstvaapisubpicture.xml"/>
     <xi:include href="xml/gstvaapitexture.xml"/>
+    <xi:include href="xml/gstvaapitexture_egl.xml"/>
+    <xi:include href="xml/gstvaapitexture_glx.xml"/>
     <xi:include href="xml/gstvaapiprofile.xml"/>
     <xi:include href="xml/gstvaapivideopool.xml"/>
     <xi:include href="xml/gstvaapisurfacepool.xml"/>
@@ -33,8 +46,14 @@
     <xi:include href="xml/gstvaapidecoder_mpeg4.xml"/>
     <xi:include href="xml/gstvaapidecoder_h264.xml"/>
     <xi:include href="xml/gstvaapidecoder_vc1.xml"/>
+    <xi:include href="xml/gstvaapidecoder_vp8.xml"/>
+    <xi:include href="xml/gstvaapidecoder_h265.xml"/>
+    <xi:include href="xml/gstvaapidecoder_unit.xml"/>
     <xi:include href="xml/gstvaapisurfaceproxy.xml"/>
     <xi:include href="xml/gstvaapifilter.xml"/>
+    <xi:include href="xml/gstvaapivalue.xml"/>
+    <xi:include href="xml/gstvaapiparser_frame.xml"/>
+    <xi:include href="xml/gstvaapicontext.xml"/>
   </chapter>
 
   <chapter id="object-tree">
diff -Nru gstreamer-vaapi-0.5.10/docs/reference/libs/libs-docs.xml.in gstreamer-vaapi-0.6.0/docs/reference/libs/libs-docs.xml.in
--- gstreamer-vaapi-0.5.10/docs/reference/libs/libs-docs.xml.in	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/docs/reference/libs/libs-docs.xml.in	2015-07-15 12:47:43.000000000 +0000
@@ -6,6 +6,11 @@
     <title>GStreamer VA-API Plugins @GST_API_VERSION@ Library Reference Manual</title>
   </bookinfo>
 
+  <para>
+    To ease the creation of plugins, a Gstreamer-oriented library was created,
+    which wraps <ulink rule="online-location" url="https://wiki.freedesktop.org/www/Software/vaapi/">VA-API</ulink>.
+  </para>
+
   <chapter>
     <title>gst-plugins-vaapi Library</title>
     <xi:include href="xml/videoformat.xml"/>
@@ -13,9 +18,15 @@
     <xi:include href="xml/gstvaapidisplay.xml"/>
     <xi:include href="xml/gstvaapidisplay_x11.xml"/>
     <xi:include href="xml/gstvaapidisplay_glx.xml"/>
+    <xi:include href="xml/gstvaapidisplay_egl.xml"/>
+    <xi:include href="xml/gstvaapidisplay_drm.xml"/>
+    <xi:include href="xml/gstvaapidisplay_wayland.xml"/>
     <xi:include href="xml/gstvaapiwindow.xml"/>
     <xi:include href="xml/gstvaapiwindow_x11.xml"/>
     <xi:include href="xml/gstvaapiwindow_glx.xml"/>
+    <xi:include href="xml/gstvaapiwindow_egl.xml"/>
+    <xi:include href="xml/gstvaapiwindow_drm.xml"/>
+    <xi:include href="xml/gstvaapiwindow_wayland.xml"/>
     <xi:include href="xml/gstvaapipixmap.xml"/>
     <xi:include href="xml/gstvaapipixmap_x11.xml"/>
     <xi:include href="xml/gstvaapiobject.xml"/>
@@ -23,6 +34,8 @@
     <xi:include href="xml/gstvaapiimage.xml"/>
     <xi:include href="xml/gstvaapisubpicture.xml"/>
     <xi:include href="xml/gstvaapitexture.xml"/>
+    <xi:include href="xml/gstvaapitexture_egl.xml"/>
+    <xi:include href="xml/gstvaapitexture_glx.xml"/>
     <xi:include href="xml/gstvaapiprofile.xml"/>
     <xi:include href="xml/gstvaapivideopool.xml"/>
     <xi:include href="xml/gstvaapisurfacepool.xml"/>
@@ -33,8 +46,14 @@
     <xi:include href="xml/gstvaapidecoder_mpeg4.xml"/>
     <xi:include href="xml/gstvaapidecoder_h264.xml"/>
     <xi:include href="xml/gstvaapidecoder_vc1.xml"/>
+    <xi:include href="xml/gstvaapidecoder_vp8.xml"/>
+    <xi:include href="xml/gstvaapidecoder_h265.xml"/>
+    <xi:include href="xml/gstvaapidecoder_unit.xml"/>
     <xi:include href="xml/gstvaapisurfaceproxy.xml"/>
     <xi:include href="xml/gstvaapifilter.xml"/>
+    <xi:include href="xml/gstvaapivalue.xml"/>
+    <xi:include href="xml/gstvaapiparser_frame.xml"/>
+    <xi:include href="xml/gstvaapicontext.xml"/>
   </chapter>
 
   <chapter id="object-tree">
diff -Nru gstreamer-vaapi-0.5.10/docs/reference/libs/libs-sections.txt gstreamer-vaapi-0.6.0/docs/reference/libs/libs-sections.txt
--- gstreamer-vaapi-0.5.10/docs/reference/libs/libs-sections.txt	2015-02-03 08:45:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/docs/reference/libs/libs-sections.txt	2015-07-15 12:52:27.000000000 +0000
@@ -2,14 +2,12 @@
 <FILE>videoformat</FILE>
 <TITLE>GstVideoFormat</TITLE>
 gst_vaapi_video_format_to_string
-gst_vaapi_video_format_from_caps
-gst_vaapi_video_format_from_structure
+gst_vaapi_video_format_from_va_fourcc
 gst_vaapi_video_format_from_va_format
 gst_vaapi_video_format_get_chroma_type
 gst_vaapi_video_format_get_score
 gst_vaapi_video_format_is_rgb
 gst_vaapi_video_format_is_yuv
-gst_vaapi_video_format_to_caps
 gst_vaapi_video_format_to_va_format
 </SECTION>
 
@@ -53,6 +51,36 @@
 </SECTION>
 
 <SECTION>
+<FILE>gstvaapidisplay_drm</FILE>
+<TITLE>GstVaapiDisplayDRM</TITLE>
+gst_vaapi_display_drm_new
+gst_vaapi_display_drm_new_with_device
+gst_vaapi_display_drm_get_device
+gst_vaapi_display_drm_get_device_path
+</SECTION>
+
+<SECTION>
+<FILE>gstvaapidisplay_wayland</FILE>
+<TITLE>GstVaapiDisplayWayland</TITLE>
+gst_vaapi_display_wayland_new
+gst_vaapi_display_wayland_new_with_display
+gst_vaapi_display_wayland_get_display
+</SECTION>
+
+<SECTION>
+<FILE>gstvaapidisplay_egl</FILE>
+<TITLE>GstVaapiDisplayEGL</TITLE>
+GstVaapiDisplayEGL
+gst_vaapi_display_egl_new
+gst_vaapi_display_egl_new_with_native_display
+gst_vaapi_display_egl_get_gl_display
+gst_vaapi_display_egl_set_gl_context
+gst_vaapi_display_egl_get_gl_context
+<SUBSECTION Standard>
+GST_VAAPI_DISPLAY_EGL
+</SECTION>
+
+<SECTION>
 <FILE>gstvaapiwindow_x11</FILE>
 <TITLE>GstVaapiWindowX11</TITLE>
 GstVaapiWindowX11
@@ -66,6 +94,36 @@
 </SECTION>
 
 <SECTION>
+<FILE>gstvaapiwindow_wayland</FILE>
+<TITLE>GstVaapiWindowWayland</TITLE>
+gst_vaapi_window_wayland_new
+</SECTION>
+
+<SECTION>
+<FILE>gstvaapiwindow_drm</FILE>
+<TITLE>GstVaapiWindowDRM</TITLE>
+gst_vaapi_window_drm_new
+</SECTION>
+
+<SECTION>
+<FILE>gstvaapiwindow_glx</FILE>
+<TITLE>GstVaapiWindowGLX</TITLE>
+gst_vaapi_window_glx_new
+gst_vaapi_window_glx_new_with_xid
+gst_vaapi_window_glx_get_context
+gst_vaapi_window_glx_set_context
+gst_vaapi_window_glx_make_current
+gst_vaapi_window_glx_swap_buffers
+gst_vaapi_window_glx_put_texture
+</SECTION>
+
+<SECTION>
+<FILE>gstvaapiwindow_egl</FILE>
+<TITLE>GstVaapiWindowEGL</TITLE>
+gst_vaapi_window_egl_new
+</SECTION>
+
+<SECTION>
 <FILE>gstvaapipixmap_x11</FILE>
 <TITLE>GstVaapiPixmapX11</TITLE>
 GstVaapiPixmapX11
@@ -106,32 +164,56 @@
 <SECTION>
 <FILE>gstvaapidisplay</FILE>
 <TITLE>GstVaapiDisplay</TITLE>
+GstVaapiDisplayType
 GstVaapiDisplay
+GstVaapiDisplayInfo
 gst_vaapi_display_new_with_display
+gst_vaapi_display_ref
+gst_vaapi_display_unref
+gst_vaapi_display_replace
 gst_vaapi_display_lock
 gst_vaapi_display_unlock
 gst_vaapi_display_sync
 gst_vaapi_display_flush
+gst_vaapi_display_get_class_type
+gst_vaapi_display_get_display_type
+gst_vaapi_display_get_display_name
 gst_vaapi_display_get_display
 gst_vaapi_display_get_width
 gst_vaapi_display_get_height
 gst_vaapi_display_get_size
 gst_vaapi_display_get_pixel_aspect_ratio
-gst_vaapi_display_get_decode_caps
+gst_vaapi_display_has_video_processing
+gst_vaapi_display_get_decode_profiles
 gst_vaapi_display_has_decoder
-gst_vaapi_display_get_encode_caps
+gst_vaapi_display_get_encode_profiles
 gst_vaapi_display_has_encoder
-gst_vaapi_display_get_image_caps
+gst_vaapi_display_get_image_formats
 gst_vaapi_display_has_image_format
-gst_vaapi_display_get_subpicture_caps
+gst_vaapi_display_get_subpicture_formats
 gst_vaapi_display_has_subpicture_format
 gst_vaapi_display_has_property
-gst_vaapi_display_get_rotation
-gst_vaapi_display_set_rotation
+gst_vaapi_display_get_property
+gst_vaapi_display_set_property
 gst_vaapi_display_get_render_mode
 gst_vaapi_display_set_render_mode
+gst_vaapi_display_get_rotation
+gst_vaapi_display_set_rotation
+gst_vaapi_display_get_vendor_string
+gst_vaapi_display_has_opengl
 <SUBSECTION Standard>
 GST_VAAPI_DISPLAY
+GST_VAAPI_DISPLAY_GET_CLASS_TYPE
+GST_VAAPI_DISPLAY_VADISPLAY_TYPE
+GST_VAAPI_DISPLAY_VADISPLAY
+GST_VAAPI_DISPLAY_LOCK
+GST_VAAPI_DISPLAY_UNLOCK
+GST_VAAPI_DISPLAY_PROP_RENDER_MODE
+GST_VAAPI_DISPLAY_PROP_ROTATION
+GST_VAAPI_DISPLAY_PROP_HUE
+GST_VAAPI_DISPLAY_PROP_SATURATION
+GST_VAAPI_DISPLAY_PROP_BRIGHTNESS
+GST_VAAPI_DISPLAY_PROP_CONTRAST
 </SECTION>
 
 <SECTION>
@@ -294,17 +376,36 @@
 <TITLE>GstVaapiTexture</TITLE>
 GstVaapiTexture
 gst_vaapi_texture_new
-gst_vaapi_texture_new_with_texture
+gst_vaapi_texture_new_wrapped
+gst_vaapi_texture_ref
+gst_vaapi_texture_unref
+gst_vaapi_texture_replace
 gst_vaapi_texture_get_id
 gst_vaapi_texture_get_target
 gst_vaapi_texture_get_format
 gst_vaapi_texture_get_width
 gst_vaapi_texture_get_height
 gst_vaapi_texture_get_size
+gst_vaapi_texture_get_orientation_flags
+gst_vaapi_texture_set_orientation_flags
 gst_vaapi_texture_put_surface
 </SECTION>
 
 <SECTION>
+<FILE>gstvaapitexture_egl</FILE>
+<TITLE>GstVaapiTextureEGL</TITLE>
+gst_vaapi_texture_egl_new
+gst_vaapi_texture_egl_new_wrapped
+</SECTION>
+
+<SECTION>
+<FILE>gstvaapitexture_glx</FILE>
+<TITLE>GstVaapiTextureGLX</TITLE>
+gst_vaapi_texture_glx_new
+gst_vaapi_texture_glx_new_wrapped
+</SECTION>
+
+<SECTION>
 <FILE>gstvaapidecoder</FILE>
 GstVaapiDecoderStatus
 <TITLE>GstVaapiDecoder</TITLE>
@@ -358,6 +459,22 @@
 </SECTION>
 
 <SECTION>
+<FILE>gstvaapidecoder_vp8</FILE>
+<TITLE>GstVaapiDecoderVp8</TITLE>
+GstVaapiDecoderVp8
+gst_vaapi_decoder_vp8_new
+</SECTION>
+
+<SECTION>
+<FILE>gstvaapidecoder_h265</FILE>
+<TITLE>GstVaapiDecoderH265</TITLE>
+GstVaapiDecoderH265
+GstVaapiStreamAlignH265
+gst_vaapi_decoder_h265_new
+gst_vaapi_decoder_h265_set_alignment
+</SECTION>
+
+<SECTION>
 <FILE>gstvaapisurfaceproxy</FILE>
 <TITLE>GstVaapiSurfaceProxy</TITLE>
 gst_vaapi_surface_proxy_get_duration
@@ -379,6 +496,7 @@
 <FILE>gstvaapifilter</FILE>
 <TITLE>GstVaapiFilter</TITLE>
 GstVaapiFilter
+GstVaapiFilterOp
 gst_vaapi_filter_new
 gst_vaapi_filter_ref
 gst_vaapi_filter_unref
@@ -394,7 +512,6 @@
 gst_vaapi_filter_set_denoising_level
 gst_vaapi_filter_set_sharpening_level
 gst_vaapi_filter_set_hue
-gst_vaapi_filter_set_saturation
 gst_vaapi_filter_set_brightness
 gst_vaapi_filter_set_saturation
 gst_vaapi_filter_set_deinterlacing
@@ -402,3 +519,61 @@
 <SUBSECTION Standard>
 GST_VAAPI_FILTER
 </SECTION>
+
+<SECTION>
+<FILE>gstvaapiparser_frame</FILE>
+<TITLE>GstVaapiParserFrame</TITLE>
+gst_vaapi_parser_frame_new
+gst_vaapi_parser_frame_free
+gst_vaapi_parser_frame_append_unit
+gst_vaapi_parser_frame_ref
+gst_vaapi_parser_frame_unref
+gst_vaapi_parser_frame_replace
+</SECTION>
+
+<SECTION>
+<FILE>gstvaapicontext</FILE>
+<TITLE>GstVaapiContext</TITLE>
+GstVaapiConfigInfoEncoder
+GstVaapiContextInfo
+GstVaapiContext
+GstVaapiContextUsage
+gst_vaapi_context_new
+gst_vaapi_context_reset
+gst_vaapi_context_get_id
+gst_vaapi_context_get_surface_proxy
+gst_vaapi_context_get_surface_count
+</SECTION>
+
+<SECTION>
+<FILE>gstvaapidecoder_unit</FILE>
+<TITLE>GstVaapiDecoderUnit</TITLE>
+GstVaapiDecoderUnitFlags
+GstVaapiDecoderUnit
+gst_vaapi_decoder_unit_init
+gst_vaapi_decoder_unit_clear
+gst_vaapi_decoder_unit_new
+gst_vaapi_decoder_unit_set_parsed_info
+<SUBSECTION Standard>
+GST_VAAPI_DECODER_UNIT_FLAGS
+GST_VAAPI_DECODER_UNIT_FLAG_IS_SET
+GST_VAAPI_DECODER_UNIT_FLAG_SET
+GST_VAAPI_DECODER_UNIT_FLAG_UNSET
+GST_VAAPI_DECODER_UNIT_IS_FRAME_START
+GST_VAAPI_DECODER_UNIT_IS_FRAME_END
+GST_VAAPI_DECODER_UNIT_IS_STREAM_END
+GST_VAAPI_DECODER_UNIT_IS_SLICE
+GST_VAAPI_DECODER_UNIT_IS_SKIPPED
+</SECTION>
+
+<SECTION>
+<FILE>gstvaapivalue</FILE>
+<TITLE>GstVaapiValue</TITLE>
+GstVaapiEnumSubset
+GST_VAAPI_TYPE_POINT
+GST_VAAPI_TYPE_RECTANGLE
+GST_VAAPI_TYPE_RENDER_MODE
+GST_VAAPI_TYPE_ROTATION
+GST_VAAPI_TYPE_RATE_CONTROL
+GST_VAAPI_POPCOUNT32
+</SECTION>
diff -Nru gstreamer-vaapi-0.5.10/docs/reference/libs/Makefile.am gstreamer-vaapi-0.6.0/docs/reference/libs/Makefile.am
--- gstreamer-vaapi-0.5.10/docs/reference/libs/Makefile.am	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/docs/reference/libs/Makefile.am	2015-07-15 12:47:43.000000000 +0000
@@ -123,5 +123,4 @@
 	libs-docs.xml.in \
 	$(NULL)
 
-# Extra clean files so that maintainer-clean removes *everything*
-MAINTAINERCLEANFILES = Makefile.in lib-docs.xml
+-include $(top_srcdir)/git.mk
diff -Nru gstreamer-vaapi-0.5.10/docs/reference/libs/Makefile.in gstreamer-vaapi-0.6.0/docs/reference/libs/Makefile.in
--- gstreamer-vaapi-0.5.10/docs/reference/libs/Makefile.in	2015-02-03 08:39:54.000000000 +0000
+++ gstreamer-vaapi-0.6.0/docs/reference/libs/Makefile.in	2015-07-15 12:50:34.000000000 +0000
@@ -147,10 +147,16 @@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
+EGL_CFLAGS = @EGL_CFLAGS@
+EGL_LIBS = @EGL_LIBS@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GIT = @GIT@
+GLES2_CFLAGS = @GLES2_CFLAGS@
+GLES2_LIBS = @GLES2_LIBS@
+GLES3_CFLAGS = @GLES3_CFLAGS@
+GLES3_LIBS = @GLES3_LIBS@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_VERSION_REQUIRED = @GLIB_VERSION_REQUIRED@
@@ -168,6 +174,8 @@
 GST_CFLAGS = @GST_CFLAGS@
 GST_CODEC_PARSERS_CFLAGS = @GST_CODEC_PARSERS_CFLAGS@
 GST_CODEC_PARSERS_LIBS = @GST_CODEC_PARSERS_LIBS@
+GST_GL_CFLAGS = @GST_GL_CFLAGS@
+GST_GL_LIBS = @GST_GL_LIBS@
 GST_INTERFACES_CFLAGS = @GST_INTERFACES_CFLAGS@
 GST_INTERFACES_LIBS = @GST_INTERFACES_LIBS@
 GST_LIBS = @GST_LIBS@
@@ -177,7 +185,6 @@
 GST_PLUGINS_BASE_LIBS = @GST_PLUGINS_BASE_LIBS@
 GST_PLUGINS_BASE_VERSION_REQUIRED = @GST_PLUGINS_BASE_VERSION_REQUIRED@
 GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
-GST_PLUGIN_PATH = @GST_PLUGIN_PATH@
 GST_PLUGIN_PATH_1_0 = @GST_PLUGIN_PATH_1_0@
 GST_VAAPI_LT_LDFLAGS = @GST_VAAPI_LT_LDFLAGS@
 GST_VAAPI_LT_VERSION = @GST_VAAPI_LT_VERSION@
@@ -507,9 +514,6 @@
 GTK_DOC_V_PDF = $(GTK_DOC_V_PDF_$(V))
 GTK_DOC_V_PDF_ = $(GTK_DOC_V_PDF_$(AM_DEFAULT_VERBOSITY))
 GTK_DOC_V_PDF_0 = @echo "  DOC   Building PDF";
-
-# Extra clean files so that maintainer-clean removes *everything*
-MAINTAINERCLEANFILES = Makefile.in lib-docs.xml
 all: all-am
 
 .SUFFIXES:
@@ -628,7 +632,6 @@
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
 clean: clean-am
 
 clean-am: clean-generic clean-libtool clean-local mostlyclean-am
@@ -916,6 +919,8 @@
 
 .PHONY : dist-hook-local docs
 
+-include $(top_srcdir)/git.mk
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -Nru gstreamer-vaapi-0.5.10/docs/reference/libs/tmpl/gstvaapicontext.sgml gstreamer-vaapi-0.6.0/docs/reference/libs/tmpl/gstvaapicontext.sgml
--- gstreamer-vaapi-0.5.10/docs/reference/libs/tmpl/gstvaapicontext.sgml	1970-01-01 00:00:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/docs/reference/libs/tmpl/gstvaapicontext.sgml	2015-07-15 12:52:26.000000000 +0000
@@ -0,0 +1,107 @@
+<!-- ##### SECTION Title ##### -->
+GstVaapiContext
+
+<!-- ##### SECTION Short_Description ##### -->
+
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### SECTION Image ##### -->
+
+
+<!-- ##### STRUCT GstVaapiConfigInfoEncoder ##### -->
+<para>
+
+</para>
+
+@rc_mode: 
+@packed_headers: 
+
+<!-- ##### STRUCT GstVaapiContextInfo ##### -->
+<para>
+
+</para>
+
+@usage: 
+@profile: 
+@entrypoint: 
+@chroma_type: 
+@width: 
+@height: 
+@ref_frames: 
+
+<!-- ##### STRUCT GstVaapiContext ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ENUM GstVaapiContextUsage ##### -->
+<para>
+
+</para>
+
+@GST_VAAPI_CONTEXT_USAGE_DECODE: 
+@GST_VAAPI_CONTEXT_USAGE_ENCODE: 
+@GST_VAAPI_CONTEXT_USAGE_VPP: 
+
+<!-- ##### FUNCTION gst_vaapi_context_new ##### -->
+<para>
+
+</para>
+
+@display: 
+@cip: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gst_vaapi_context_reset ##### -->
+<para>
+
+</para>
+
+@context: 
+@new_cip: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gst_vaapi_context_get_id ##### -->
+<para>
+
+</para>
+
+@context: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gst_vaapi_context_get_surface_proxy ##### -->
+<para>
+
+</para>
+
+@context: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gst_vaapi_context_get_surface_count ##### -->
+<para>
+
+</para>
+
+@context: 
+@Returns: 
+
+
diff -Nru gstreamer-vaapi-0.5.10/docs/reference/libs/tmpl/gstvaapidecoder_h265.sgml gstreamer-vaapi-0.6.0/docs/reference/libs/tmpl/gstvaapidecoder_h265.sgml
--- gstreamer-vaapi-0.5.10/docs/reference/libs/tmpl/gstvaapidecoder_h265.sgml	1970-01-01 00:00:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/docs/reference/libs/tmpl/gstvaapidecoder_h265.sgml	2015-07-15 12:52:26.000000000 +0000
@@ -0,0 +1,58 @@
+<!-- ##### SECTION Title ##### -->
+GstVaapiDecoderH265
+
+<!-- ##### SECTION Short_Description ##### -->
+
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### SECTION Image ##### -->
+
+
+<!-- ##### STRUCT GstVaapiDecoderH265 ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ENUM GstVaapiStreamAlignH265 ##### -->
+<para>
+
+</para>
+
+@GST_VAAPI_STREAM_ALIGN_H265_NONE: 
+@GST_VAAPI_STREAM_ALIGN_H265_NALU: 
+@GST_VAAPI_STREAM_ALIGN_H265_AU: 
+
+<!-- ##### FUNCTION gst_vaapi_decoder_h265_new ##### -->
+<para>
+
+</para>
+
+@display: 
+@caps: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gst_vaapi_decoder_h265_set_alignment ##### -->
+<para>
+
+</para>
+
+@decoder: 
+@alignment: 
+
+
diff -Nru gstreamer-vaapi-0.5.10/docs/reference/libs/tmpl/gstvaapidecoder_unit.sgml gstreamer-vaapi-0.6.0/docs/reference/libs/tmpl/gstvaapidecoder_unit.sgml
--- gstreamer-vaapi-0.5.10/docs/reference/libs/tmpl/gstvaapidecoder_unit.sgml	1970-01-01 00:00:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/docs/reference/libs/tmpl/gstvaapidecoder_unit.sgml	2015-07-15 12:52:26.000000000 +0000
@@ -0,0 +1,82 @@
+<!-- ##### SECTION Title ##### -->
+GstVaapiDecoderUnit
+
+<!-- ##### SECTION Short_Description ##### -->
+
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### SECTION Image ##### -->
+
+
+<!-- ##### ENUM GstVaapiDecoderUnitFlags ##### -->
+<para>
+
+</para>
+
+@GST_VAAPI_DECODER_UNIT_FLAG_FRAME_START: 
+@GST_VAAPI_DECODER_UNIT_FLAG_FRAME_END: 
+@GST_VAAPI_DECODER_UNIT_FLAG_STREAM_END: 
+@GST_VAAPI_DECODER_UNIT_FLAG_SLICE: 
+@GST_VAAPI_DECODER_UNIT_FLAG_SKIP: 
+@GST_VAAPI_DECODER_UNIT_FLAG_LAST: 
+
+<!-- ##### STRUCT GstVaapiDecoderUnit ##### -->
+<para>
+
+</para>
+
+@flags: 
+@size: 
+@offset: 
+@parsed_info: 
+@parsed_info_destroy_notify: 
+
+<!-- ##### FUNCTION gst_vaapi_decoder_unit_init ##### -->
+<para>
+
+</para>
+
+@unit: 
+
+
+<!-- ##### FUNCTION gst_vaapi_decoder_unit_clear ##### -->
+<para>
+
+</para>
+
+@unit: 
+
+
+<!-- ##### FUNCTION gst_vaapi_decoder_unit_new ##### -->
+<para>
+
+</para>
+
+@void: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gst_vaapi_decoder_unit_set_parsed_info ##### -->
+<para>
+
+</para>
+
+@unit: 
+@parsed_info: 
+@destroy_notify: 
+
+
diff -Nru gstreamer-vaapi-0.5.10/docs/reference/libs/tmpl/gstvaapidecoder_vp8.sgml gstreamer-vaapi-0.6.0/docs/reference/libs/tmpl/gstvaapidecoder_vp8.sgml
--- gstreamer-vaapi-0.5.10/docs/reference/libs/tmpl/gstvaapidecoder_vp8.sgml	1970-01-01 00:00:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/docs/reference/libs/tmpl/gstvaapidecoder_vp8.sgml	2015-07-15 12:52:26.000000000 +0000
@@ -0,0 +1,40 @@
+<!-- ##### SECTION Title ##### -->
+GstVaapiDecoderVp8
+
+<!-- ##### SECTION Short_Description ##### -->
+
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### SECTION Image ##### -->
+
+
+<!-- ##### STRUCT GstVaapiDecoderVp8 ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### FUNCTION gst_vaapi_decoder_vp8_new ##### -->
+<para>
+
+</para>
+
+@display: 
+@caps: 
+@Returns: 
+
+
diff -Nru gstreamer-vaapi-0.5.10/docs/reference/libs/tmpl/gstvaapidisplay_drm.sgml gstreamer-vaapi-0.6.0/docs/reference/libs/tmpl/gstvaapidisplay_drm.sgml
--- gstreamer-vaapi-0.5.10/docs/reference/libs/tmpl/gstvaapidisplay_drm.sgml	1970-01-01 00:00:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/docs/reference/libs/tmpl/gstvaapidisplay_drm.sgml	2015-07-15 12:52:26.000000000 +0000
@@ -0,0 +1,60 @@
+<!-- ##### SECTION Title ##### -->
+GstVaapiDisplayDRM
+
+<!-- ##### SECTION Short_Description ##### -->
+
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### SECTION Image ##### -->
+
+
+<!-- ##### FUNCTION gst_vaapi_display_drm_new ##### -->
+<para>
+
+</para>
+
+@device_path: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gst_vaapi_display_drm_new_with_device ##### -->
+<para>
+
+</para>
+
+@device: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gst_vaapi_display_drm_get_device ##### -->
+<para>
+
+</para>
+
+@display: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gst_vaapi_display_drm_get_device_path ##### -->
+<para>
+
+</para>
+
+@display: 
+@Returns: 
+
+
diff -Nru gstreamer-vaapi-0.5.10/docs/reference/libs/tmpl/gstvaapidisplay_egl.sgml gstreamer-vaapi-0.6.0/docs/reference/libs/tmpl/gstvaapidisplay_egl.sgml
--- gstreamer-vaapi-0.5.10/docs/reference/libs/tmpl/gstvaapidisplay_egl.sgml	1970-01-01 00:00:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/docs/reference/libs/tmpl/gstvaapidisplay_egl.sgml	2015-07-15 12:52:26.000000000 +0000
@@ -0,0 +1,79 @@
+<!-- ##### SECTION Title ##### -->
+GstVaapiDisplayEGL
+
+<!-- ##### SECTION Short_Description ##### -->
+
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### SECTION Image ##### -->
+
+
+<!-- ##### STRUCT GstVaapiDisplayEGL ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### FUNCTION gst_vaapi_display_egl_new ##### -->
+<para>
+
+</para>
+
+@display: 
+@gles_version: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gst_vaapi_display_egl_new_with_native_display ##### -->
+<para>
+
+</para>
+
+@native_display: 
+@display_type: 
+@gles_version: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gst_vaapi_display_egl_get_gl_display ##### -->
+<para>
+
+</para>
+
+@display: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gst_vaapi_display_egl_set_gl_context ##### -->
+<para>
+
+</para>
+
+@display: 
+@gl_context: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gst_vaapi_display_egl_get_gl_context ##### -->
+<para>
+
+</para>
+
+@display: 
+@Returns: 
+
+
diff -Nru gstreamer-vaapi-0.5.10/docs/reference/libs/tmpl/gstvaapidisplay.sgml gstreamer-vaapi-0.6.0/docs/reference/libs/tmpl/gstvaapidisplay.sgml
--- gstreamer-vaapi-0.5.10/docs/reference/libs/tmpl/gstvaapidisplay.sgml	2015-02-03 08:45:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/docs/reference/libs/tmpl/gstvaapidisplay.sgml	2015-07-15 12:52:26.000000000 +0000
@@ -22,12 +22,35 @@
 <!-- ##### SECTION Image ##### -->
 
 
+<!-- ##### ENUM GstVaapiDisplayType ##### -->
+<para>
+
+</para>
+
+@GST_VAAPI_DISPLAY_TYPE_ANY: 
+@GST_VAAPI_DISPLAY_TYPE_X11: 
+@GST_VAAPI_DISPLAY_TYPE_GLX: 
+@GST_VAAPI_DISPLAY_TYPE_WAYLAND: 
+@GST_VAAPI_DISPLAY_TYPE_DRM: 
+@GST_VAAPI_DISPLAY_TYPE_EGL: 
+
 <!-- ##### STRUCT GstVaapiDisplay ##### -->
 <para>
 
 </para>
 
 
+<!-- ##### STRUCT GstVaapiDisplayInfo ##### -->
+<para>
+
+</para>
+
+@display: 
+@display_type: 
+@display_name: 
+@va_display: 
+@native_display: 
+
 <!-- ##### FUNCTION gst_vaapi_display_new_with_display ##### -->
 <para>
 
@@ -37,6 +60,32 @@
 @Returns: 
 
 
+<!-- ##### FUNCTION gst_vaapi_display_ref ##### -->
+<para>
+
+</para>
+
+@display: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gst_vaapi_display_unref ##### -->
+<para>
+
+</para>
+
+@display: 
+
+
+<!-- ##### FUNCTION gst_vaapi_display_replace ##### -->
+<para>
+
+</para>
+
+@old_display_ptr: 
+@new_display: 
+
+
 <!-- ##### FUNCTION gst_vaapi_display_lock ##### -->
 <para>
 
@@ -69,6 +118,33 @@
 @display: 
 
 
+<!-- ##### FUNCTION gst_vaapi_display_get_class_type ##### -->
+<para>
+
+</para>
+
+@display: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gst_vaapi_display_get_display_type ##### -->
+<para>
+
+</para>
+
+@display: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gst_vaapi_display_get_display_name ##### -->
+<para>
+
+</para>
+
+@display: 
+@Returns: 
+
+
 <!-- ##### FUNCTION gst_vaapi_display_get_display ##### -->
 <para>
 
@@ -116,6 +192,24 @@
 @par_d: 
 
 
+<!-- ##### FUNCTION gst_vaapi_display_has_video_processing ##### -->
+<para>
+
+</para>
+
+@display: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gst_vaapi_display_get_decode_profiles ##### -->
+<para>
+
+</para>
+
+@display: 
+@Returns: 
+
+
 <!-- ##### FUNCTION gst_vaapi_display_has_decoder ##### -->
 <para>
 
@@ -127,6 +221,15 @@
 @Returns: 
 
 
+<!-- ##### FUNCTION gst_vaapi_display_get_encode_profiles ##### -->
+<para>
+
+</para>
+
+@display: 
+@Returns: 
+
+
 <!-- ##### FUNCTION gst_vaapi_display_has_encoder ##### -->
 <para>
 
@@ -138,6 +241,15 @@
 @Returns: 
 
 
+<!-- ##### FUNCTION gst_vaapi_display_get_image_formats ##### -->
+<para>
+
+</para>
+
+@display: 
+@Returns: 
+
+
 <!-- ##### FUNCTION gst_vaapi_display_has_image_format ##### -->
 <para>
 
@@ -148,6 +260,15 @@
 @Returns: 
 
 
+<!-- ##### FUNCTION gst_vaapi_display_get_subpicture_formats ##### -->
+<para>
+
+</para>
+
+@display: 
+@Returns: 
+
+
 <!-- ##### FUNCTION gst_vaapi_display_has_subpicture_format ##### -->
 <para>
 
@@ -169,22 +290,25 @@
 @Returns: 
 
 
-<!-- ##### FUNCTION gst_vaapi_display_get_rotation ##### -->
+<!-- ##### FUNCTION gst_vaapi_display_get_property ##### -->
 <para>
 
 </para>
 
 @display: 
+@name: 
+@out_value: 
 @Returns: 
 
 
-<!-- ##### FUNCTION gst_vaapi_display_set_rotation ##### -->
+<!-- ##### FUNCTION gst_vaapi_display_set_property ##### -->
 <para>
 
 </para>
 
 @display: 
-@rotation: 
+@name: 
+@value: 
 @Returns: 
 
 
@@ -208,3 +332,40 @@
 @Returns: 
 
 
+<!-- ##### FUNCTION gst_vaapi_display_get_rotation ##### -->
+<para>
+
+</para>
+
+@display: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gst_vaapi_display_set_rotation ##### -->
+<para>
+
+</para>
+
+@display: 
+@rotation: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gst_vaapi_display_get_vendor_string ##### -->
+<para>
+
+</para>
+
+@display: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gst_vaapi_display_has_opengl ##### -->
+<para>
+
+</para>
+
+@display: 
+@Returns: 
+
+
diff -Nru gstreamer-vaapi-0.5.10/docs/reference/libs/tmpl/gstvaapidisplay_wayland.sgml gstreamer-vaapi-0.6.0/docs/reference/libs/tmpl/gstvaapidisplay_wayland.sgml
--- gstreamer-vaapi-0.5.10/docs/reference/libs/tmpl/gstvaapidisplay_wayland.sgml	1970-01-01 00:00:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/docs/reference/libs/tmpl/gstvaapidisplay_wayland.sgml	2015-07-15 12:52:26.000000000 +0000
@@ -0,0 +1,51 @@
+<!-- ##### SECTION Title ##### -->
+GstVaapiDisplayWayland
+
+<!-- ##### SECTION Short_Description ##### -->
+
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### SECTION Image ##### -->
+
+
+<!-- ##### FUNCTION gst_vaapi_display_wayland_new ##### -->
+<para>
+
+</para>
+
+@display_name: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gst_vaapi_display_wayland_new_with_display ##### -->
+<para>
+
+</para>
+
+@wl_display: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gst_vaapi_display_wayland_get_display ##### -->
+<para>
+
+</para>
+
+@display: 
+@Returns: 
+
+
diff -Nru gstreamer-vaapi-0.5.10/docs/reference/libs/tmpl/gstvaapifilter.sgml gstreamer-vaapi-0.6.0/docs/reference/libs/tmpl/gstvaapifilter.sgml
--- gstreamer-vaapi-0.5.10/docs/reference/libs/tmpl/gstvaapifilter.sgml	2015-02-03 08:45:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/docs/reference/libs/tmpl/gstvaapifilter.sgml	2015-07-15 12:52:26.000000000 +0000
@@ -28,6 +28,23 @@
 </para>
 
 
+<!-- ##### ENUM GstVaapiFilterOp ##### -->
+<para>
+
+</para>
+
+@GST_VAAPI_FILTER_OP_FORMAT: 
+@GST_VAAPI_FILTER_OP_CROP: 
+@GST_VAAPI_FILTER_OP_DENOISE: 
+@GST_VAAPI_FILTER_OP_SHARPEN: 
+@GST_VAAPI_FILTER_OP_HUE: 
+@GST_VAAPI_FILTER_OP_SATURATION: 
+@GST_VAAPI_FILTER_OP_BRIGHTNESS: 
+@GST_VAAPI_FILTER_OP_CONTRAST: 
+@GST_VAAPI_FILTER_OP_DEINTERLACING: 
+@GST_VAAPI_FILTER_OP_SCALING: 
+@GST_VAAPI_FILTER_OP_SKINTONE: 
+
 <!-- ##### FUNCTION gst_vaapi_filter_new ##### -->
 <para>
 
@@ -166,16 +183,6 @@
 <para>
 
 </para>
-
-@filter: 
-@value: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gst_vaapi_filter_set_saturation ##### -->
-<para>
-
-</para>
 
 @filter: 
 @value: 
diff -Nru gstreamer-vaapi-0.5.10/docs/reference/libs/tmpl/gstvaapiparser_frame.sgml gstreamer-vaapi-0.6.0/docs/reference/libs/tmpl/gstvaapiparser_frame.sgml
--- gstreamer-vaapi-0.5.10/docs/reference/libs/tmpl/gstvaapiparser_frame.sgml	1970-01-01 00:00:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/docs/reference/libs/tmpl/gstvaapiparser_frame.sgml	2015-07-15 12:52:26.000000000 +0000
@@ -0,0 +1,76 @@
+<!-- ##### SECTION Title ##### -->
+GstVaapiParserFrame
+
+<!-- ##### SECTION Short_Description ##### -->
+
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### SECTION Image ##### -->
+
+
+<!-- ##### FUNCTION gst_vaapi_parser_frame_new ##### -->
+<para>
+
+</para>
+
+@width: 
+@height: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gst_vaapi_parser_frame_free ##### -->
+<para>
+
+</para>
+
+@frame: 
+
+
+<!-- ##### FUNCTION gst_vaapi_parser_frame_append_unit ##### -->
+<para>
+
+</para>
+
+@frame: 
+@unit: 
+
+
+<!-- ##### MACRO gst_vaapi_parser_frame_ref ##### -->
+<para>
+
+</para>
+
+@frame: 
+
+
+<!-- ##### MACRO gst_vaapi_parser_frame_unref ##### -->
+<para>
+
+</para>
+
+@frame: 
+
+
+<!-- ##### MACRO gst_vaapi_parser_frame_replace ##### -->
+<para>
+
+</para>
+
+@old_frame_p: 
+@new_frame: 
+
+
diff -Nru gstreamer-vaapi-0.5.10/docs/reference/libs/tmpl/gstvaapiprofile.sgml gstreamer-vaapi-0.6.0/docs/reference/libs/tmpl/gstvaapiprofile.sgml
--- gstreamer-vaapi-0.5.10/docs/reference/libs/tmpl/gstvaapiprofile.sgml	2015-02-03 08:45:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/docs/reference/libs/tmpl/gstvaapiprofile.sgml	2015-07-15 12:52:26.000000000 +0000
@@ -36,6 +36,7 @@
 @GST_VAAPI_CODEC_VC1: 
 @GST_VAAPI_CODEC_JPEG: 
 @GST_VAAPI_CODEC_VP8: 
+@GST_VAAPI_CODEC_H265: 
 
 <!-- ##### ENUM GstVaapiProfile ##### -->
 <para>
@@ -68,6 +69,9 @@
 @GST_VAAPI_PROFILE_VC1_ADVANCED: 
 @GST_VAAPI_PROFILE_JPEG_BASELINE: 
 @GST_VAAPI_PROFILE_VP8: 
+@GST_VAAPI_PROFILE_H265_MAIN: 
+@GST_VAAPI_PROFILE_H265_MAIN10: 
+@GST_VAAPI_PROFILE_H265_MAIN_STILL_PICTURE: 
 
 <!-- ##### ENUM GstVaapiEntrypoint ##### -->
 <para>
@@ -78,6 +82,7 @@
 @GST_VAAPI_ENTRYPOINT_IDCT: 
 @GST_VAAPI_ENTRYPOINT_MOCO: 
 @GST_VAAPI_ENTRYPOINT_SLICE_ENCODE: 
+@GST_VAAPI_ENTRYPOINT_PICTURE_ENCODE: 
 
 <!-- ##### FUNCTION gst_vaapi_profile ##### -->
 <para>
diff -Nru gstreamer-vaapi-0.5.10/docs/reference/libs/tmpl/gstvaapitexture_egl.sgml gstreamer-vaapi-0.6.0/docs/reference/libs/tmpl/gstvaapitexture_egl.sgml
--- gstreamer-vaapi-0.5.10/docs/reference/libs/tmpl/gstvaapitexture_egl.sgml	1970-01-01 00:00:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/docs/reference/libs/tmpl/gstvaapitexture_egl.sgml	2015-07-15 12:52:26.000000000 +0000
@@ -0,0 +1,51 @@
+<!-- ##### SECTION Title ##### -->
+GstVaapiTextureEGL
+
+<!-- ##### SECTION Short_Description ##### -->
+
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### SECTION Image ##### -->
+
+
+<!-- ##### FUNCTION gst_vaapi_texture_egl_new ##### -->
+<para>
+
+</para>
+
+@display: 
+@target: 
+@format: 
+@width: 
+@height: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gst_vaapi_texture_egl_new_wrapped ##### -->
+<para>
+
+</para>
+
+@display: 
+@id: 
+@target: 
+@format: 
+@width: 
+@height: 
+@Returns: 
+
+
diff -Nru gstreamer-vaapi-0.5.10/docs/reference/libs/tmpl/gstvaapitexture_glx.sgml gstreamer-vaapi-0.6.0/docs/reference/libs/tmpl/gstvaapitexture_glx.sgml
--- gstreamer-vaapi-0.5.10/docs/reference/libs/tmpl/gstvaapitexture_glx.sgml	1970-01-01 00:00:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/docs/reference/libs/tmpl/gstvaapitexture_glx.sgml	2015-07-15 12:52:26.000000000 +0000
@@ -0,0 +1,49 @@
+<!-- ##### SECTION Title ##### -->
+GstVaapiTextureGLX
+
+<!-- ##### SECTION Short_Description ##### -->
+
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### SECTION Image ##### -->
+
+
+<!-- ##### FUNCTION gst_vaapi_texture_glx_new ##### -->
+<para>
+
+</para>
+
+@display: 
+@target: 
+@format: 
+@width: 
+@height: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gst_vaapi_texture_glx_new_wrapped ##### -->
+<para>
+
+</para>
+
+@display: 
+@id: 
+@target: 
+@format: 
+@Returns: 
+
+
diff -Nru gstreamer-vaapi-0.5.10/docs/reference/libs/tmpl/gstvaapitexture.sgml gstreamer-vaapi-0.6.0/docs/reference/libs/tmpl/gstvaapitexture.sgml
--- gstreamer-vaapi-0.5.10/docs/reference/libs/tmpl/gstvaapitexture.sgml	2015-02-03 08:45:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/docs/reference/libs/tmpl/gstvaapitexture.sgml	2015-07-15 12:52:26.000000000 +0000
@@ -41,6 +41,46 @@
 @Returns: 
 
 
+<!-- ##### FUNCTION gst_vaapi_texture_new_wrapped ##### -->
+<para>
+
+</para>
+
+@display: 
+@id: 
+@target: 
+@format: 
+@width: 
+@height: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gst_vaapi_texture_ref ##### -->
+<para>
+
+</para>
+
+@texture: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gst_vaapi_texture_unref ##### -->
+<para>
+
+</para>
+
+@texture: 
+
+
+<!-- ##### FUNCTION gst_vaapi_texture_replace ##### -->
+<para>
+
+</para>
+
+@old_texture_ptr: 
+@new_texture: 
+
+
 <!-- ##### FUNCTION gst_vaapi_texture_get_id ##### -->
 <para>
 
@@ -96,6 +136,24 @@
 @height_ptr: 
 
 
+<!-- ##### FUNCTION gst_vaapi_texture_get_orientation_flags ##### -->
+<para>
+
+</para>
+
+@texture: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gst_vaapi_texture_set_orientation_flags ##### -->
+<para>
+
+</para>
+
+@texture: 
+@flags: 
+
+
 <!-- ##### FUNCTION gst_vaapi_texture_put_surface ##### -->
 <para>
 
diff -Nru gstreamer-vaapi-0.5.10/docs/reference/libs/tmpl/gstvaapivalue.sgml gstreamer-vaapi-0.6.0/docs/reference/libs/tmpl/gstvaapivalue.sgml
--- gstreamer-vaapi-0.5.10/docs/reference/libs/tmpl/gstvaapivalue.sgml	1970-01-01 00:00:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/docs/reference/libs/tmpl/gstvaapivalue.sgml	2015-07-15 12:52:26.000000000 +0000
@@ -0,0 +1,79 @@
+<!-- ##### SECTION Title ##### -->
+GstVaapiValue
+
+<!-- ##### SECTION Short_Description ##### -->
+
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### SECTION Image ##### -->
+
+
+<!-- ##### STRUCT GstVaapiEnumSubset ##### -->
+<para>
+
+</para>
+
+@parent_type: 
+@type: 
+@type_info: 
+@type_name: 
+@values: 
+@num_values: 
+
+<!-- ##### MACRO GST_VAAPI_TYPE_POINT ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GST_VAAPI_TYPE_RECTANGLE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GST_VAAPI_TYPE_RENDER_MODE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GST_VAAPI_TYPE_ROTATION ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GST_VAAPI_TYPE_RATE_CONTROL ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GST_VAAPI_POPCOUNT32 ##### -->
+<para>
+
+</para>
+
+@x: 
+
+
diff -Nru gstreamer-vaapi-0.5.10/docs/reference/libs/tmpl/gstvaapiwindow_drm.sgml gstreamer-vaapi-0.6.0/docs/reference/libs/tmpl/gstvaapiwindow_drm.sgml
--- gstreamer-vaapi-0.5.10/docs/reference/libs/tmpl/gstvaapiwindow_drm.sgml	1970-01-01 00:00:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/docs/reference/libs/tmpl/gstvaapiwindow_drm.sgml	2015-07-15 12:52:26.000000000 +0000
@@ -0,0 +1,35 @@
+<!-- ##### SECTION Title ##### -->
+GstVaapiWindowDRM
+
+<!-- ##### SECTION Short_Description ##### -->
+
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### SECTION Image ##### -->
+
+
+<!-- ##### FUNCTION gst_vaapi_window_drm_new ##### -->
+<para>
+
+</para>
+
+@display: 
+@width: 
+@height: 
+@Returns: 
+
+
diff -Nru gstreamer-vaapi-0.5.10/docs/reference/libs/tmpl/gstvaapiwindow_egl.sgml gstreamer-vaapi-0.6.0/docs/reference/libs/tmpl/gstvaapiwindow_egl.sgml
--- gstreamer-vaapi-0.5.10/docs/reference/libs/tmpl/gstvaapiwindow_egl.sgml	1970-01-01 00:00:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/docs/reference/libs/tmpl/gstvaapiwindow_egl.sgml	2015-07-15 12:52:26.000000000 +0000
@@ -0,0 +1,35 @@
+<!-- ##### SECTION Title ##### -->
+GstVaapiWindowEGL
+
+<!-- ##### SECTION Short_Description ##### -->
+
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### SECTION Image ##### -->
+
+
+<!-- ##### FUNCTION gst_vaapi_window_egl_new ##### -->
+<para>
+
+</para>
+
+@display: 
+@width: 
+@height: 
+@Returns: 
+
+
diff -Nru gstreamer-vaapi-0.5.10/docs/reference/libs/tmpl/gstvaapiwindow_wayland.sgml gstreamer-vaapi-0.6.0/docs/reference/libs/tmpl/gstvaapiwindow_wayland.sgml
--- gstreamer-vaapi-0.5.10/docs/reference/libs/tmpl/gstvaapiwindow_wayland.sgml	1970-01-01 00:00:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/docs/reference/libs/tmpl/gstvaapiwindow_wayland.sgml	2015-07-15 12:52:26.000000000 +0000
@@ -0,0 +1,35 @@
+<!-- ##### SECTION Title ##### -->
+GstVaapiWindowWayland
+
+<!-- ##### SECTION Short_Description ##### -->
+
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### SECTION Image ##### -->
+
+
+<!-- ##### FUNCTION gst_vaapi_window_wayland_new ##### -->
+<para>
+
+</para>
+
+@display: 
+@width: 
+@height: 
+@Returns: 
+
+
diff -Nru gstreamer-vaapi-0.5.10/docs/reference/libs/tmpl/videoformat.sgml gstreamer-vaapi-0.6.0/docs/reference/libs/tmpl/videoformat.sgml
--- gstreamer-vaapi-0.5.10/docs/reference/libs/tmpl/videoformat.sgml	2015-02-03 08:45:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/docs/reference/libs/tmpl/videoformat.sgml	2015-07-15 12:52:26.000000000 +0000
@@ -31,6 +31,15 @@
 @Returns: 
 
 
+<!-- ##### FUNCTION gst_vaapi_video_format_from_va_fourcc ##### -->
+<para>
+
+</para>
+
+@fourcc: 
+@Returns: 
+
+
 <!-- ##### FUNCTION gst_vaapi_video_format_from_va_format ##### -->
 <para>
 
diff -Nru gstreamer-vaapi-0.5.10/docs/reference/Makefile.am gstreamer-vaapi-0.6.0/docs/reference/Makefile.am
--- gstreamer-vaapi-0.5.10/docs/reference/Makefile.am	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/docs/reference/Makefile.am	2015-07-15 12:47:43.000000000 +0000
@@ -1,4 +1,3 @@
 SUBDIRS = libs plugins
 
-# Extra clean files so that maintainer-clean removes *everything*
-MAINTAINERCLEANFILES = Makefile.in
+-include $(top_srcdir)/git.mk
diff -Nru gstreamer-vaapi-0.5.10/docs/reference/Makefile.in gstreamer-vaapi-0.6.0/docs/reference/Makefile.in
--- gstreamer-vaapi-0.5.10/docs/reference/Makefile.in	2015-02-03 08:39:54.000000000 +0000
+++ gstreamer-vaapi-0.6.0/docs/reference/Makefile.in	2015-07-15 12:50:34.000000000 +0000
@@ -197,10 +197,16 @@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
+EGL_CFLAGS = @EGL_CFLAGS@
+EGL_LIBS = @EGL_LIBS@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GIT = @GIT@
+GLES2_CFLAGS = @GLES2_CFLAGS@
+GLES2_LIBS = @GLES2_LIBS@
+GLES3_CFLAGS = @GLES3_CFLAGS@
+GLES3_LIBS = @GLES3_LIBS@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_VERSION_REQUIRED = @GLIB_VERSION_REQUIRED@
@@ -218,6 +224,8 @@
 GST_CFLAGS = @GST_CFLAGS@
 GST_CODEC_PARSERS_CFLAGS = @GST_CODEC_PARSERS_CFLAGS@
 GST_CODEC_PARSERS_LIBS = @GST_CODEC_PARSERS_LIBS@
+GST_GL_CFLAGS = @GST_GL_CFLAGS@
+GST_GL_LIBS = @GST_GL_LIBS@
 GST_INTERFACES_CFLAGS = @GST_INTERFACES_CFLAGS@
 GST_INTERFACES_LIBS = @GST_INTERFACES_LIBS@
 GST_LIBS = @GST_LIBS@
@@ -227,7 +235,6 @@
 GST_PLUGINS_BASE_LIBS = @GST_PLUGINS_BASE_LIBS@
 GST_PLUGINS_BASE_VERSION_REQUIRED = @GST_PLUGINS_BASE_VERSION_REQUIRED@
 GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
-GST_PLUGIN_PATH = @GST_PLUGIN_PATH@
 GST_PLUGIN_PATH_1_0 = @GST_PLUGIN_PATH_1_0@
 GST_VAAPI_LT_LDFLAGS = @GST_VAAPI_LT_LDFLAGS@
 GST_VAAPI_LT_VERSION = @GST_VAAPI_LT_VERSION@
@@ -365,9 +372,6 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 SUBDIRS = libs plugins
-
-# Extra clean files so that maintainer-clean removes *everything*
-MAINTAINERCLEANFILES = Makefile.in
 all: all-recursive
 
 .SUFFIXES:
@@ -597,7 +601,6 @@
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
 clean: clean-recursive
 
 clean-am: clean-generic clean-libtool mostlyclean-am
@@ -680,6 +683,8 @@
 	ps ps-am tags tags-am uninstall uninstall-am
 
 
+-include $(top_srcdir)/git.mk
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -Nru gstreamer-vaapi-0.5.10/docs/reference/plugins/html/api-index-full.html gstreamer-vaapi-0.6.0/docs/reference/plugins/html/api-index-full.html
--- gstreamer-vaapi-0.5.10/docs/reference/plugins/html/api-index-full.html	2015-02-03 08:45:02.000000000 +0000
+++ gstreamer-vaapi-0.6.0/docs/reference/plugins/html/api-index-full.html	2015-07-15 12:52:28.000000000 +0000
@@ -79,6 +79,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="GstVaapiPostproc.html#GstVaapiPostproc--skin-tone-enhancement" title="The “skin-tone-enhancement” property">GstVaapiPostproc:skin-tone-enhancement</a>, object property in <a class="link" href="GstVaapiPostproc.html" title="GstVaapiPostproc">GstVaapiPostproc</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="GstVaapiPostproc.html#GstVaapiPostproc--width" title="The “width” property">GstVaapiPostproc:width</a>, object property in <a class="link" href="GstVaapiPostproc.html" title="GstVaapiPostproc">GstVaapiPostproc</a>
 </dt>
 <dd></dd>
@@ -87,6 +91,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="GstVaapiSink.html#GstVaapiSink-handoff" title="The “handoff” signal">GstVaapiSink::handoff</a>, object signal in <a class="link" href="GstVaapiSink.html" title="GstVaapiSink">GstVaapiSink</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="GstVaapiSink.html#GstVaapiSink--brightness" title="The “brightness” property">GstVaapiSink:brightness</a>, object property in <a class="link" href="GstVaapiSink.html" title="GstVaapiSink">GstVaapiSink</a>
 </dt>
 <dd></dd>
@@ -123,6 +131,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="GstVaapiSink.html#GstVaapiSink--signal-handoffs" title="The “signal-handoffs” property">GstVaapiSink:signal-handoffs</a>, object property in <a class="link" href="GstVaapiSink.html" title="GstVaapiSink">GstVaapiSink</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="GstVaapiSink.html#GstVaapiSink--view-id" title="The “view-id” property">GstVaapiSink:view-id</a>, object property in <a class="link" href="GstVaapiSink.html" title="GstVaapiSink">GstVaapiSink</a>
 </dt>
 <dd></dd>
diff -Nru gstreamer-vaapi-0.5.10/docs/reference/plugins/html/GstVaapiPostproc.html gstreamer-vaapi-0.6.0/docs/reference/plugins/html/GstVaapiPostproc.html
--- gstreamer-vaapi-0.5.10/docs/reference/plugins/html/GstVaapiPostproc.html	2015-02-03 08:45:02.000000000 +0000
+++ gstreamer-vaapi-0.6.0/docs/reference/plugins/html/GstVaapiPostproc.html	2015-07-15 12:52:28.000000000 +0000
@@ -16,7 +16,8 @@
 <td width="100%" align="left" class="shortcuts">
 <a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
                   <a href="#GstVaapiPostproc.description" class="shortcut">Description</a></span><span id="nav_hierarchy">  <span class="dim">|</span> 
-                  <a href="#GstVaapiPostproc.object-hierarchy" class="shortcut">Object Hierarchy</a></span><span id="nav_properties">  <span class="dim">|</span> 
+                  <a href="#GstVaapiPostproc.object-hierarchy" class="shortcut">Object Hierarchy</a></span><span id="nav_interfaces">  <span class="dim">|</span> 
+                  <a href="#GstVaapiPostproc.implemented-interfaces" class="shortcut">Implemented Interfaces</a></span><span id="nav_properties">  <span class="dim">|</span> 
                   <a href="#GstVaapiPostproc.properties" class="shortcut">Properties</a></span>
 </td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
@@ -103,6 +104,11 @@
 <td class="property_flags">Read / Write</td>
 </tr>
 <tr>
+<td class="property_type"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a></td>
+<td class="property_name"><a class="link" href="GstVaapiPostproc.html#GstVaapiPostproc--skin-tone-enhancement" title="The “skin-tone-enhancement” property">skin-tone-enhancement</a></td>
+<td class="property_flags">Read / Write</td>
+</tr>
+<tr>
 <td class="property_type"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a></td>
 <td class="property_name"><a class="link" href="GstVaapiPostproc.html#GstVaapiPostproc--width" title="The “width” property">width</a></td>
 <td class="property_flags">Read / Write</td>
@@ -134,6 +140,12 @@
 </pre>
 </div>
 <div class="refsect1">
+<a name="GstVaapiPostproc.implemented-interfaces"></a><h2>Implemented Interfaces</h2>
+<p>
+GstVaapiPostproc implements
+ <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gst-plugins-base-libs/html/gst-plugins-base-libs-gstcolorbalance.html#GstColorBalance">GstColorBalance</a>.</p>
+</div>
+<div class="refsect1">
 <a name="GstVaapiPostproc.description"></a><h2>Description</h2>
 <p>vaapipostproc consists in various postprocessing algorithms to be
 applied to VA surfaces. So far, only basic bob deinterlacing is
@@ -268,6 +280,14 @@
 </div>
 <hr>
 <div class="refsect2">
+<a name="GstVaapiPostproc--skin-tone-enhancement"></a><h3>The <code class="literal">“skin-tone-enhancement”</code> property</h3>
+<pre class="programlisting">  “skin-tone-enhancement”    <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a></pre>
+<p>Apply the skin tone enhancement algorithm.</p>
+<p>Flags: Read / Write</p>
+<p>Default value: FALSE</p>
+</div>
+<hr>
+<div class="refsect2">
 <a name="GstVaapiPostproc--width"></a><h3>The <code class="literal">“width”</code> property</h3>
 <pre class="programlisting">  “width”                    <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a></pre>
 <p>The forced output width in pixels. If set to zero, the width is
diff -Nru gstreamer-vaapi-0.5.10/docs/reference/plugins/html/GstVaapiSink.html gstreamer-vaapi-0.6.0/docs/reference/plugins/html/GstVaapiSink.html
--- gstreamer-vaapi-0.5.10/docs/reference/plugins/html/GstVaapiSink.html	2015-02-03 08:45:02.000000000 +0000
+++ gstreamer-vaapi-0.6.0/docs/reference/plugins/html/GstVaapiSink.html	2015-07-15 12:52:28.000000000 +0000
@@ -18,7 +18,8 @@
                   <a href="#GstVaapiSink.description" class="shortcut">Description</a></span><span id="nav_hierarchy">  <span class="dim">|</span> 
                   <a href="#GstVaapiSink.object-hierarchy" class="shortcut">Object Hierarchy</a></span><span id="nav_interfaces">  <span class="dim">|</span> 
                   <a href="#GstVaapiSink.implemented-interfaces" class="shortcut">Implemented Interfaces</a></span><span id="nav_properties">  <span class="dim">|</span> 
-                  <a href="#GstVaapiSink.properties" class="shortcut">Properties</a></span>
+                  <a href="#GstVaapiSink.properties" class="shortcut">Properties</a></span><span id="nav_signals">  <span class="dim">|</span> 
+                  <a href="#GstVaapiSink.signals" class="shortcut">Signals</a></span>
 </td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
 <td><a accesskey="u" href="ch01.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
@@ -90,6 +91,11 @@
 <td class="property_flags">Read / Write / Construct</td>
 </tr>
 <tr>
+<td class="property_type"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a></td>
+<td class="property_name"><a class="link" href="GstVaapiSink.html#GstVaapiSink--signal-handoffs" title="The “signal-handoffs” property">signal-handoffs</a></td>
+<td class="property_flags">Read / Write</td>
+</tr>
+<tr>
 <td class="property_type"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="type">gint</span></a></td>
 <td class="property_name"><a class="link" href="GstVaapiSink.html#GstVaapiSink--view-id" title="The “view-id” property">view-id</a></td>
 <td class="property_flags">Read / Write</td>
@@ -98,6 +104,21 @@
 </table></div>
 </div>
 <div class="refsect1">
+<a name="GstVaapiSink.signals"></a><h2>Signals</h2>
+<div class="informaltable"><table border="0">
+<colgroup>
+<col width="150px" class="signals_return">
+<col width="300px" class="signals_name">
+<col width="200px" class="signals_flags">
+</colgroup>
+<tbody><tr>
+<td class="signal_type"><span class="returnvalue">void</span></td>
+<td class="signal_name"><a class="link" href="GstVaapiSink.html#GstVaapiSink-handoff" title="The “handoff” signal">handoff</a></td>
+<td class="signal_flags">Run Last</td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect1">
 <a name="GstVaapiSink.other"></a><h2>Types and Values</h2>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
@@ -229,6 +250,14 @@
 </div>
 <hr>
 <div class="refsect2">
+<a name="GstVaapiSink--signal-handoffs"></a><h3>The <code class="literal">“signal-handoffs”</code> property</h3>
+<pre class="programlisting">  “signal-handoffs”          <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a></pre>
+<p>Send a signal after rendering the buffer.</p>
+<p>Flags: Read / Write</p>
+<p>Default value: FALSE</p>
+</div>
+<hr>
+<div class="refsect2">
 <a name="GstVaapiSink--view-id"></a><h3>The <code class="literal">“view-id”</code> property</h3>
 <pre class="programlisting">  “view-id”                  <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="type">gint</span></a></pre>
 <p>When not set to -1, the displayed frame will always be the one
@@ -240,6 +269,45 @@
 <p>Default value: -1</p>
 </div>
 </div>
+<div class="refsect1">
+<a name="GstVaapiSink.signal-details"></a><h2>Signal Details</h2>
+<div class="refsect2">
+<a name="GstVaapiSink-handoff"></a><h3>The <code class="literal">“handoff”</code> signal</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+user_function (<a class="link" href="GstVaapiSink.html" title="GstVaapiSink"><span class="type">GstVaapiSink</span></a> *object,
+               <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstBuffer.html"><span class="type">GstBuffer</span></a>    *buffer,
+               <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a>      user_data)</pre>
+<p>This signal gets emitted after rendering the frame.</p>
+<div class="refsect3">
+<a name="id-1.2.4.12.2.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>object</p></td>
+<td class="parameter_description"><p>the <a class="link" href="GstVaapiSink.html" title="GstVaapiSink"><span class="type">GstVaapiSink</span></a> instance</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>buffer</p></td>
+<td class="parameter_description"><p>the buffer that was rendered</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>user_data</p></td>
+<td class="parameter_description"><p>user data set when the signal handler was connected.</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<p>Flags: Run Last</p>
+</div>
+</div>
 </div>
 <div class="footer">
 <hr>
diff -Nru gstreamer-vaapi-0.5.10/docs/reference/plugins/html/index.sgml gstreamer-vaapi-0.6.0/docs/reference/plugins/html/index.sgml
--- gstreamer-vaapi-0.5.10/docs/reference/plugins/html/index.sgml	2015-02-03 08:45:02.000000000 +0000
+++ gstreamer-vaapi-0.6.0/docs/reference/plugins/html/index.sgml	2015-07-15 12:52:28.000000000 +0000
@@ -9,6 +9,7 @@
 <ANCHOR id="GstVaapiPostproc.properties" href="plugins/GstVaapiPostproc.html#GstVaapiPostproc.properties">
 <ANCHOR id="GstVaapiPostproc.other" href="plugins/GstVaapiPostproc.html#GstVaapiPostproc.other">
 <ANCHOR id="GstVaapiPostproc.object-hierarchy" href="plugins/GstVaapiPostproc.html#GstVaapiPostproc.object-hierarchy">
+<ANCHOR id="GstVaapiPostproc.implemented-interfaces" href="plugins/GstVaapiPostproc.html#GstVaapiPostproc.implemented-interfaces">
 <ANCHOR id="GstVaapiPostproc.description" href="plugins/GstVaapiPostproc.html#GstVaapiPostproc.description">
 <ANCHOR id="GstVaapiPostproc.functions_details" href="plugins/GstVaapiPostproc.html#GstVaapiPostproc.functions_details">
 <ANCHOR id="GstVaapiPostproc.other_details" href="plugins/GstVaapiPostproc.html#GstVaapiPostproc.other_details">
@@ -26,9 +27,11 @@
 <ANCHOR id="GstVaapiPostproc--saturation" href="plugins/GstVaapiPostproc.html#GstVaapiPostproc--saturation">
 <ANCHOR id="GstVaapiPostproc--scale-method" href="plugins/GstVaapiPostproc.html#GstVaapiPostproc--scale-method">
 <ANCHOR id="GstVaapiPostproc--sharpen" href="plugins/GstVaapiPostproc.html#GstVaapiPostproc--sharpen">
+<ANCHOR id="GstVaapiPostproc--skin-tone-enhancement" href="plugins/GstVaapiPostproc.html#GstVaapiPostproc--skin-tone-enhancement">
 <ANCHOR id="GstVaapiPostproc--width" href="plugins/GstVaapiPostproc.html#GstVaapiPostproc--width">
 <ANCHOR id="GstVaapiSink" href="plugins/GstVaapiSink.html">
 <ANCHOR id="GstVaapiSink.properties" href="plugins/GstVaapiSink.html#GstVaapiSink.properties">
+<ANCHOR id="GstVaapiSink.signals" href="plugins/GstVaapiSink.html#GstVaapiSink.signals">
 <ANCHOR id="GstVaapiSink.other" href="plugins/GstVaapiSink.html#GstVaapiSink.other">
 <ANCHOR id="GstVaapiSink.object-hierarchy" href="plugins/GstVaapiSink.html#GstVaapiSink.object-hierarchy">
 <ANCHOR id="GstVaapiSink.implemented-interfaces" href="plugins/GstVaapiSink.html#GstVaapiSink.implemented-interfaces">
@@ -46,4 +49,7 @@
 <ANCHOR id="GstVaapiSink--hue" href="plugins/GstVaapiSink.html#GstVaapiSink--hue">
 <ANCHOR id="GstVaapiSink--rotation" href="plugins/GstVaapiSink.html#GstVaapiSink--rotation">
 <ANCHOR id="GstVaapiSink--saturation" href="plugins/GstVaapiSink.html#GstVaapiSink--saturation">
+<ANCHOR id="GstVaapiSink--signal-handoffs" href="plugins/GstVaapiSink.html#GstVaapiSink--signal-handoffs">
 <ANCHOR id="GstVaapiSink--view-id" href="plugins/GstVaapiSink.html#GstVaapiSink--view-id">
+<ANCHOR id="GstVaapiSink.signal-details" href="plugins/GstVaapiSink.html#GstVaapiSink.signal-details">
+<ANCHOR id="GstVaapiSink-handoff" href="plugins/GstVaapiSink.html#GstVaapiSink-handoff">
diff -Nru gstreamer-vaapi-0.5.10/docs/reference/plugins/html/plugins.devhelp2 gstreamer-vaapi-0.6.0/docs/reference/plugins/html/plugins.devhelp2
--- gstreamer-vaapi-0.5.10/docs/reference/plugins/html/plugins.devhelp2	2015-02-03 08:45:02.000000000 +0000
+++ gstreamer-vaapi-0.6.0/docs/reference/plugins/html/plugins.devhelp2	2015-07-15 12:52:28.000000000 +0000
@@ -25,6 +25,7 @@
     <keyword type="property" name="The “saturation” property" link="GstVaapiPostproc.html#GstVaapiPostproc--saturation"/>
     <keyword type="property" name="The “scale-method” property" link="GstVaapiPostproc.html#GstVaapiPostproc--scale-method"/>
     <keyword type="property" name="The “sharpen” property" link="GstVaapiPostproc.html#GstVaapiPostproc--sharpen"/>
+    <keyword type="property" name="The “skin-tone-enhancement” property" link="GstVaapiPostproc.html#GstVaapiPostproc--skin-tone-enhancement"/>
     <keyword type="property" name="The “width” property" link="GstVaapiPostproc.html#GstVaapiPostproc--width"/>
     <keyword type="struct" name="struct GstVaapiSink" link="GstVaapiSink.html#GstVaapiSink-struct"/>
     <keyword type="property" name="The “brightness” property" link="GstVaapiSink.html#GstVaapiSink--brightness"/>
@@ -36,6 +37,8 @@
     <keyword type="property" name="The “hue” property" link="GstVaapiSink.html#GstVaapiSink--hue"/>
     <keyword type="property" name="The “rotation” property" link="GstVaapiSink.html#GstVaapiSink--rotation"/>
     <keyword type="property" name="The “saturation” property" link="GstVaapiSink.html#GstVaapiSink--saturation"/>
+    <keyword type="property" name="The “signal-handoffs” property" link="GstVaapiSink.html#GstVaapiSink--signal-handoffs"/>
     <keyword type="property" name="The “view-id” property" link="GstVaapiSink.html#GstVaapiSink--view-id"/>
+    <keyword type="signal" name="The “handoff” signal" link="GstVaapiSink.html#GstVaapiSink-handoff"/>
   </functions>
 </book>
diff -Nru gstreamer-vaapi-0.5.10/docs/reference/plugins/Makefile.am gstreamer-vaapi-0.6.0/docs/reference/plugins/Makefile.am
--- gstreamer-vaapi-0.5.10/docs/reference/plugins/Makefile.am	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/docs/reference/plugins/Makefile.am	2015-07-15 12:47:43.000000000 +0000
@@ -87,9 +87,18 @@
 	$(GST_CFLAGS) \
 	$(NULL)
 
-GTKDOC_LIBS = \
+gtkdoc_vaapi_libs = \
 	$(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-$(GST_API_VERSION).la \
+	$(NULL)
+
+if USE_X11
+gtkdoc_vaapi_libs += \
 	$(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-x11-$(GST_API_VERSION).la \
+	$(NULL)
+endif
+
+GTKDOC_LIBS = \
+	$(gtkdoc_vaapi_libs) \
 	$(top_builddir)/gst/vaapi/libgstvaapi.la \
 	$(GLIB_LIBS) \
 	$(GST_LIBS) \
@@ -104,5 +113,4 @@
 	$(DOC_MODULE)-docs.xml.in \
 	$(NULL)
 
-# Extra clean files so that maintainer-clean removes *everything*
-MAINTAINERCLEANFILES = Makefile.in $(DOC_MODULE)-docs.xml
+-include $(top_srcdir)/git.mk
diff -Nru gstreamer-vaapi-0.5.10/docs/reference/plugins/Makefile.in gstreamer-vaapi-0.6.0/docs/reference/plugins/Makefile.in
--- gstreamer-vaapi-0.5.10/docs/reference/plugins/Makefile.in	2015-02-03 08:39:54.000000000 +0000
+++ gstreamer-vaapi-0.6.0/docs/reference/plugins/Makefile.in	2015-07-15 12:50:34.000000000 +0000
@@ -84,6 +84,10 @@
 build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
+@USE_X11_TRUE@am__append_1 = \
+@USE_X11_TRUE@	$(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-x11-$(GST_API_VERSION).la \
+@USE_X11_TRUE@	$(NULL)
+
 DIST_COMMON = $(top_srcdir)/gtk-doc.make $(srcdir)/Makefile.in \
 	$(srcdir)/Makefile.am $(srcdir)/plugins-docs.xml.in
 subdir = docs/reference/plugins
@@ -144,10 +148,16 @@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
+EGL_CFLAGS = @EGL_CFLAGS@
+EGL_LIBS = @EGL_LIBS@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GIT = @GIT@
+GLES2_CFLAGS = @GLES2_CFLAGS@
+GLES2_LIBS = @GLES2_LIBS@
+GLES3_CFLAGS = @GLES3_CFLAGS@
+GLES3_LIBS = @GLES3_LIBS@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_VERSION_REQUIRED = @GLIB_VERSION_REQUIRED@
@@ -165,6 +175,8 @@
 GST_CFLAGS = @GST_CFLAGS@
 GST_CODEC_PARSERS_CFLAGS = @GST_CODEC_PARSERS_CFLAGS@
 GST_CODEC_PARSERS_LIBS = @GST_CODEC_PARSERS_LIBS@
+GST_GL_CFLAGS = @GST_GL_CFLAGS@
+GST_GL_LIBS = @GST_GL_LIBS@
 GST_INTERFACES_CFLAGS = @GST_INTERFACES_CFLAGS@
 GST_INTERFACES_LIBS = @GST_INTERFACES_LIBS@
 GST_LIBS = @GST_LIBS@
@@ -174,7 +186,6 @@
 GST_PLUGINS_BASE_LIBS = @GST_PLUGINS_BASE_LIBS@
 GST_PLUGINS_BASE_VERSION_REQUIRED = @GST_PLUGINS_BASE_VERSION_REQUIRED@
 GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
-GST_PLUGIN_PATH = @GST_PLUGIN_PATH@
 GST_PLUGIN_PATH_1_0 = @GST_PLUGIN_PATH_1_0@
 GST_VAAPI_LT_LDFLAGS = @GST_VAAPI_LT_LDFLAGS@
 GST_VAAPI_LT_VERSION = @GST_VAAPI_LT_VERSION@
@@ -403,9 +414,10 @@
 	$(GST_CFLAGS) \
 	$(NULL)
 
+gtkdoc_vaapi_libs = $(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-$(GST_API_VERSION).la \
+	$(NULL) $(am__append_1)
 GTKDOC_LIBS = \
-	$(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-$(GST_API_VERSION).la \
-	$(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-x11-$(GST_API_VERSION).la \
+	$(gtkdoc_vaapi_libs) \
 	$(top_builddir)/gst/vaapi/libgstvaapi.la \
 	$(GLIB_LIBS) \
 	$(GST_LIBS) \
@@ -495,9 +507,6 @@
 GTK_DOC_V_PDF = $(GTK_DOC_V_PDF_$(V))
 GTK_DOC_V_PDF_ = $(GTK_DOC_V_PDF_$(AM_DEFAULT_VERBOSITY))
 GTK_DOC_V_PDF_0 = @echo "  DOC   Building PDF";
-
-# Extra clean files so that maintainer-clean removes *everything*
-MAINTAINERCLEANFILES = Makefile.in $(DOC_MODULE)-docs.xml
 all: all-am
 
 .SUFFIXES:
@@ -616,7 +625,6 @@
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
 clean: clean-am
 
 clean-am: clean-generic clean-libtool clean-local mostlyclean-am
@@ -904,6 +912,8 @@
 
 .PHONY : dist-hook-local docs
 
+-include $(top_srcdir)/git.mk
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -Nru gstreamer-vaapi-0.5.10/docs/reference/plugins/plugins.types gstreamer-vaapi-0.6.0/docs/reference/plugins/plugins.types
--- gstreamer-vaapi-0.5.10/docs/reference/plugins/plugins.types	2015-02-03 08:45:02.000000000 +0000
+++ gstreamer-vaapi-0.6.0/docs/reference/plugins/plugins.types	2015-07-15 12:52:28.000000000 +0000
@@ -1,3 +1,9 @@
+#include <gst/gst.h>
+
+#include <gst/vaapi/gstvaapidecode.h>
+#include <gst/vaapi/gstvaapipostproc.h>
+#include <gst/vaapi/gstvaapisink.h>
+
 gst_vaapidecode_get_type
 gst_vaapipostproc_get_type
 gst_vaapisink_get_type
diff -Nru gstreamer-vaapi-0.5.10/docs/reference/plugins/tmpl/gstvaapipostproc.sgml gstreamer-vaapi-0.6.0/docs/reference/plugins/tmpl/gstvaapipostproc.sgml
--- gstreamer-vaapi-0.5.10/docs/reference/plugins/tmpl/gstvaapipostproc.sgml	2015-02-03 08:45:02.000000000 +0000
+++ gstreamer-vaapi-0.6.0/docs/reference/plugins/tmpl/gstvaapipostproc.sgml	2015-07-15 12:52:28.000000000 +0000
@@ -88,6 +88,11 @@
 
 </para>
 
+<!-- ##### ARG GstVaapiPostproc:skin-tone-enhancement ##### -->
+<para>
+
+</para>
+
 <!-- ##### ARG GstVaapiPostproc:width ##### -->
 <para>
 
diff -Nru gstreamer-vaapi-0.5.10/docs/reference/plugins/tmpl/gstvaapisink.sgml gstreamer-vaapi-0.6.0/docs/reference/plugins/tmpl/gstvaapisink.sgml
--- gstreamer-vaapi-0.5.10/docs/reference/plugins/tmpl/gstvaapisink.sgml	2015-02-03 08:45:02.000000000 +0000
+++ gstreamer-vaapi-0.6.0/docs/reference/plugins/tmpl/gstvaapisink.sgml	2015-07-15 12:52:28.000000000 +0000
@@ -28,6 +28,14 @@
 </para>
 
 
+<!-- ##### SIGNAL GstVaapiSink::handoff ##### -->
+<para>
+
+</para>
+
+@gstvaapisink: the object which received the signal.
+@arg1: 
+
 <!-- ##### ARG GstVaapiSink:brightness ##### -->
 <para>
 
@@ -72,6 +80,11 @@
 <para>
 
 </para>
+
+<!-- ##### ARG GstVaapiSink:signal-handoffs ##### -->
+<para>
+
+</para>
 
 <!-- ##### ARG GstVaapiSink:view-id ##### -->
 <para>
diff -Nru gstreamer-vaapi-0.5.10/ext/codecparsers/gst/videoparsers/gsth264parse.c gstreamer-vaapi-0.6.0/ext/codecparsers/gst/videoparsers/gsth264parse.c
--- gstreamer-vaapi-0.5.10/ext/codecparsers/gst/videoparsers/gsth264parse.c	2015-02-03 08:38:55.000000000 +0000
+++ gstreamer-vaapi-0.6.0/ext/codecparsers/gst/videoparsers/gsth264parse.c	2015-07-15 12:50:06.000000000 +0000
@@ -41,8 +41,7 @@
 enum
 {
   PROP_0,
-  PROP_CONFIG_INTERVAL,
-  PROP_LAST
+  PROP_CONFIG_INTERVAL
 };
 
 enum
@@ -195,8 +194,10 @@
 }
 
 static void
-gst_h264_parse_reset (GstH264Parse * h264parse)
+gst_h264_parse_reset_stream_info (GstH264Parse * h264parse)
 {
+  gint i;
+
   h264parse->width = 0;
   h264parse->height = 0;
   h264parse->fps_num = 0;
@@ -205,19 +206,32 @@
   h264parse->upstream_par_d = -1;
   h264parse->parsed_par_n = 0;
   h264parse->parsed_par_d = 0;
-  gst_buffer_replace (&h264parse->codec_data, NULL);
-  gst_buffer_replace (&h264parse->codec_data_in, NULL);
-  h264parse->nal_length_size = 4;
-  h264parse->packetized = FALSE;
-  h264parse->transform = FALSE;
+  h264parse->have_pps = FALSE;
+  h264parse->have_sps = FALSE;
 
   h264parse->align = GST_H264_PARSE_ALIGN_NONE;
   h264parse->format = GST_H264_PARSE_FORMAT_NONE;
 
-  h264parse->last_report = GST_CLOCK_TIME_NONE;
+  h264parse->transform = FALSE;
+  h264parse->nal_length_size = 4;
+  h264parse->packetized = FALSE;
   h264parse->push_codec = FALSE;
-  h264parse->have_pps = FALSE;
-  h264parse->have_sps = FALSE;
+
+  gst_buffer_replace (&h264parse->codec_data, NULL);
+  gst_buffer_replace (&h264parse->codec_data_in, NULL);
+
+  gst_h264_parse_reset_frame (h264parse);
+
+  for (i = 0; i < GST_H264_MAX_SPS_COUNT; i++)
+    gst_buffer_replace (&h264parse->sps_nals[i], NULL);
+  for (i = 0; i < GST_H264_MAX_PPS_COUNT; i++)
+    gst_buffer_replace (&h264parse->pps_nals[i], NULL);
+}
+
+static void
+gst_h264_parse_reset (GstH264Parse * h264parse)
+{
+  h264parse->last_report = GST_CLOCK_TIME_NONE;
 
   h264parse->dts = GST_CLOCK_TIME_NONE;
   h264parse->ts_trn_nb = GST_CLOCK_TIME_NONE;
@@ -230,7 +244,7 @@
 
   h264parse->discont = FALSE;
 
-  gst_h264_parse_reset_frame (h264parse);
+  gst_h264_parse_reset_stream_info (h264parse);
 }
 
 static gboolean
@@ -257,17 +271,11 @@
 static gboolean
 gst_h264_parse_stop (GstBaseParse * parse)
 {
-  guint i;
   GstH264Parse *h264parse = GST_H264_PARSE (parse);
 
   GST_DEBUG_OBJECT (parse, "stop");
   gst_h264_parse_reset (h264parse);
 
-  for (i = 0; i < GST_H264_MAX_SPS_COUNT; i++)
-    gst_buffer_replace (&h264parse->sps_nals[i], NULL);
-  for (i = 0; i < GST_H264_MAX_PPS_COUNT; i++)
-    gst_buffer_replace (&h264parse->pps_nals[i], NULL);
-
   gst_h264_nal_parser_free (h264parse->nalparser);
 
   return TRUE;
@@ -352,7 +360,7 @@
   caps = gst_pad_get_allowed_caps (GST_BASE_PARSE_SRC_PAD (h264parse));
   GST_DEBUG_OBJECT (h264parse, "allowed caps: %" GST_PTR_FORMAT, caps);
 
-  /* concentrate on leading structure, since decodebin2 parser
+  /* concentrate on leading structure, since decodebin parser
    * capsfilter always includes parser template caps */
   if (caps) {
     caps = gst_caps_truncate (caps);
@@ -536,6 +544,16 @@
             sei.payload.recovery_point.broken_link_flag,
             sei.payload.recovery_point.changing_slice_group_idc);
         break;
+
+        /* Additional messages that are not innerly useful to the
+         * element but for debugging purposes */
+      case GST_H264_SEI_STEREO_VIDEO_INFO:
+        GST_LOG_OBJECT (h264parse, "stereo video information message");
+        break;
+      case GST_H264_SEI_FRAME_PACKING:
+        GST_LOG_OBJECT (h264parse, "frame packing arrangement message: type %d",
+            sei.payload.frame_packing.frame_packing_type);
+        break;
     }
   }
   g_array_free (messages, TRUE);
@@ -637,6 +655,7 @@
       if (!GST_H264_PARSE_STATE_VALID (h264parse, GST_H264_PARSE_STATE_GOT_SPS))
         return FALSE;
 
+      h264parse->header |= TRUE;
       gst_h264_parse_process_sei (h264parse, nalu);
       /* mark SEI pos */
       if (h264parse->sei_pos == -1) {
@@ -868,7 +887,6 @@
     if (h264parse->split_packetized) {
       GST_ELEMENT_ERROR (h264parse, STREAM, FAILED, (NULL),
           ("invalid AVC input data"));
-      gst_buffer_unref (buffer);
 
       return GST_FLOW_ERROR;
     } else {
@@ -1378,6 +1396,121 @@
   gst_caps_unref (filter_caps);
 }
 
+static const gchar *
+digit_to_string (guint digit)
+{
+  static const char itoa[][2] = {
+    "0", "1", "2", "3", "4", "5", "6", "7", "8", "9"
+  };
+
+  if (G_LIKELY (digit < 10))
+    return itoa[digit];
+  else
+    return NULL;
+}
+
+static const gchar *
+get_profile_string (GstH264SPS * sps)
+{
+  const gchar *profile = NULL;
+
+  switch (sps->profile_idc) {
+    case 66:
+      if (sps->constraint_set1_flag)
+        profile = "constrained-baseline";
+      else
+        profile = "baseline";
+      break;
+    case 77:
+      profile = "main";
+      break;
+    case 88:
+      profile = "extended";
+      break;
+    case 100:
+      profile = "high";
+      break;
+    case 110:
+      if (sps->constraint_set3_flag)
+        profile = "high-10-intra";
+      else
+        profile = "high-10";
+      break;
+    case 122:
+      if (sps->constraint_set3_flag)
+        profile = "high-4:2:2-intra";
+      else
+        profile = "high-4:2:2";
+      break;
+    case 244:
+      if (sps->constraint_set3_flag)
+        profile = "high-4:4:4-intra";
+      else
+        profile = "high-4:4:4";
+      break;
+    case 44:
+      profile = "cavlc-4:4:4-intra";
+      break;
+    case 118:
+      profile = "multiview-high";
+      break;
+    case 128:
+      profile = "stereo-high";
+      break;
+    case 83:
+      if (sps->constraint_set5_flag)
+        profile = "scalable-constrained-baseline";
+      else
+        profile = "scalable-baseline";
+      break;
+    case 86:
+      profile = "scalable-high";
+      break;
+    default:
+      return NULL;
+  }
+
+  return profile;
+}
+
+static const gchar *
+get_level_string (GstH264SPS * sps)
+{
+  if ((sps->level_idc == 11 && sps->constraint_set3_flag)
+      || sps->level_idc == 9)
+    return "1b";
+  else if (sps->level_idc % 10 == 0)
+    return digit_to_string (sps->level_idc / 10);
+  else {
+    switch (sps->level_idc) {
+      case 11:
+        return "1.1";
+      case 12:
+        return "1.2";
+      case 13:
+        return "1.3";
+      case 21:
+        return "2.1";
+      case 22:
+        return "2.2";
+      case 31:
+        return "3.1";
+      case 32:
+        return "3.2";
+      case 41:
+        return "4.1";
+      case 42:
+        return "4.2";
+      case 51:
+        return "5.1";
+      case 52:
+        return "5.2";
+      default:
+        return NULL;
+    }
+  }
+}
+
 static void
 gst_h264_parse_update_src_caps (GstH264Parse * h264parse, GstCaps * caps)
 {
@@ -1537,17 +1670,18 @@
 
     /* set profile and level in caps */
     if (sps) {
-      GstMapInfo map;
-      GstBuffer *sps_buf = h264parse->sps_nals[sps->id];
+      const gchar *profile, *level;
 
-      if (sps_buf) {
-        gst_buffer_map (sps_buf, &map, GST_MAP_READ);
-        gst_codec_utils_h264_caps_set_level_and_profile (caps,
-            map.data + 1, map.size - 1);
-        gst_buffer_unmap (sps_buf, &map);
-        /* relax the profile constraint to find a suitable decoder */
-        ensure_caps_profile (h264parse, caps, sps);
-      }
+      profile = get_profile_string (sps);
+      if (profile != NULL)
+        gst_caps_set_simple (caps, "profile", G_TYPE_STRING, profile, NULL);
+
+      level = get_level_string (sps);
+      if (level != NULL)
+        gst_caps_set_simple (caps, "level", G_TYPE_STRING, level, NULL);
+
+      /* relax the profile constraint to find a suitable decoder */
+      ensure_caps_profile (h264parse, caps, sps);
     }
 
     src_caps = gst_pad_get_current_caps (GST_BASE_PARSE_SRC_PAD (h264parse));
@@ -2063,18 +2197,26 @@
 {
   GstH264Parse *h264parse;
   GstStructure *str;
-  const GValue *value;
+  const GValue *codec_data_value;
   GstBuffer *codec_data = NULL;
   gsize size;
   guint format, align, off;
   GstH264NalUnit nalu;
   GstH264ParserResult parseres;
+  GstCaps *old_caps;
 
   h264parse = GST_H264_PARSE (parse);
 
   /* reset */
   h264parse->push_codec = FALSE;
 
+  old_caps = gst_pad_get_current_caps (GST_BASE_PARSE_SINK_PAD (parse));
+  if (old_caps) {
+    if (!gst_caps_is_equal (old_caps, caps))
+      gst_h264_parse_reset_stream_info (h264parse);
+    gst_caps_unref (old_caps);
+  }
+
   str = gst_caps_get_structure (caps, 0);
 
   /* accept upstream info if provided */
@@ -2088,9 +2230,43 @@
   /* get upstream format and align from caps */
   gst_h264_parse_format_from_caps (caps, &format, &align);
 
-  /* packetized video has a codec_data */
-  if (format != GST_H264_PARSE_FORMAT_BYTE &&
-      (value = gst_structure_get_value (str, "codec_data"))) {
+  codec_data_value = gst_structure_get_value (str, "codec_data");
+
+  /* fix up caps without stream-format for max. backwards compatibility */
+  if (format == GST_H264_PARSE_FORMAT_NONE) {
+    /* codec_data implies avc */
+    if (codec_data_value != NULL) {
+      GST_ERROR ("video/x-h264 caps with codec_data but no stream-format=avc");
+      format = GST_H264_PARSE_FORMAT_AVC;
+    } else {
+      /* otherwise assume bytestream input */
+      GST_ERROR ("video/x-h264 caps without codec_data or stream-format");
+      format = GST_H264_PARSE_FORMAT_BYTE;
+    }
+  }
+
+  /* avc caps sanity checks */
+  if (format == GST_H264_PARSE_FORMAT_AVC) {
+    /* AVC requires codec_data, AVC3 might have one and/or SPS/PPS inline */
+    if (codec_data_value == NULL)
+      goto avc_caps_codec_data_missing;
+
+    /* AVC implies alignment=au, everything else is not allowed */
+    if (align == GST_H264_PARSE_ALIGN_NONE)
+      align = GST_H264_PARSE_ALIGN_AU;
+    else if (align != GST_H264_PARSE_ALIGN_AU)
+      goto avc_caps_wrong_alignment;
+  }
+
+  /* bytestream caps sanity checks */
+  if (format == GST_H264_PARSE_FORMAT_BYTE) {
+    /* should have SPS/PSS in-band (and/or oob in streamheader field) */
+    if (codec_data_value != NULL)
+      goto bytestream_caps_with_codec_data;
+  }
+
+  /* packetized video has codec_data (required for AVC, optional for AVC3) */
+  if (codec_data_value != NULL) {
     GstMapInfo map;
     guint8 *data;
     guint num_sps, num_pps;
@@ -2103,9 +2279,13 @@
     /* make note for optional split processing */
     h264parse->packetized = TRUE;
 
-    codec_data = gst_value_get_buffer (value);
+    /* codec_data field should hold a buffer */
+    if (!GST_VALUE_HOLDS_BUFFER (codec_data_value))
+      goto avc_caps_codec_data_wrong_type;
+
+    codec_data = gst_value_get_buffer (codec_data_value);
     if (!codec_data)
-      goto wrong_type;
+      goto avc_caps_codec_data_missing;
     gst_buffer_map (codec_data, &map, GST_MAP_READ);
     data = map.data;
     size = map.size;
@@ -2167,24 +2347,14 @@
     gst_buffer_unmap (codec_data, &map);
 
     gst_buffer_replace (&h264parse->codec_data_in, codec_data);
-
-    /* if upstream sets codec_data without setting stream-format and alignment, we
-     * assume stream-format=avc,alignment=au */
-    if (format == GST_H264_PARSE_FORMAT_NONE)
-      format = GST_H264_PARSE_FORMAT_AVC;
-    if (align == GST_H264_PARSE_ALIGN_NONE)
-      align = GST_H264_PARSE_ALIGN_AU;
-  } else {
+  } else if (format == GST_H264_PARSE_FORMAT_BYTE) {
     GST_DEBUG_OBJECT (h264parse, "have bytestream h264");
     /* nothing to pre-process */
     h264parse->packetized = FALSE;
     /* we have 4 sync bytes */
     h264parse->nal_length_size = 4;
-
-    if (format == GST_H264_PARSE_FORMAT_NONE) {
-      format = GST_H264_PARSE_FORMAT_BYTE;
-      align = GST_H264_PARSE_ALIGN_AU;
-    }
+  } else {
+    /* probably AVC3 without codec_data field, anything to do here? */
   }
 
   {
@@ -2226,6 +2396,27 @@
   return TRUE;
 
   /* ERRORS */
+avc_caps_codec_data_wrong_type:
+  {
+    GST_WARNING_OBJECT (parse, "H.264 AVC caps, codec_data field not a buffer");
+    goto refuse_caps;
+  }
+avc_caps_codec_data_missing:
+  {
+    GST_WARNING_OBJECT (parse, "H.264 AVC caps, but no codec_data");
+    goto refuse_caps;
+  }
+avc_caps_wrong_alignment:
+  {
+    GST_WARNING_OBJECT (parse, "H.264 AVC caps with NAL alignment, must be AU");
+    goto refuse_caps;
+  }
+bytestream_caps_with_codec_data:
+  {
+    GST_WARNING_OBJECT (parse, "H.264 bytestream caps with codec_data is not "
+        "expected, send SPS/PPS in-band with data or in streamheader field");
+    goto refuse_caps;
+  }
 avcc_too_small:
   {
     GST_DEBUG_OBJECT (h264parse, "avcC size %" G_GSIZE_FORMAT " < 8", size);
@@ -2236,11 +2427,6 @@
     GST_DEBUG_OBJECT (h264parse, "wrong avcC version");
     goto refuse_caps;
   }
-wrong_type:
-  {
-    GST_DEBUG_OBJECT (h264parse, "wrong codec-data type");
-    goto refuse_caps;
-  }
 refuse_caps:
   {
     GST_WARNING_OBJECT (h264parse, "refused caps %" GST_PTR_FORMAT, caps);
diff -Nru gstreamer-vaapi-0.5.10/ext/codecparsers/gst/videoparsers/gsth265parse.c gstreamer-vaapi-0.6.0/ext/codecparsers/gst/videoparsers/gsth265parse.c
--- gstreamer-vaapi-0.5.10/ext/codecparsers/gst/videoparsers/gsth265parse.c	1970-01-01 00:00:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/ext/codecparsers/gst/videoparsers/gsth265parse.c	2015-07-15 12:50:06.000000000 +0000
@@ -0,0 +1,2169 @@
+/* GStreamer H.265 Parser
+ * Copyright (C) 2013 Intel Corporation
+ *  Contact:Sreerenj Balachandran <sreerenj.balachandran@intel.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
+#include <gst/base/base.h>
+#include <gst/pbutils/pbutils.h>
+#include <gst/video/video.h>
+#include "gsth265parse.h"
+
+#include <string.h>
+
+GST_DEBUG_CATEGORY (h265_parse_debug);
+#define GST_CAT_DEFAULT h265_parse_debug
+
+#define DEFAULT_CONFIG_INTERVAL      (0)
+
+enum
+{
+  PROP_0,
+  PROP_CONFIG_INTERVAL,
+  PROP_LAST
+};
+
+enum
+{
+  GST_H265_PARSE_FORMAT_NONE,
+  GST_H265_PARSE_FORMAT_HVC1,
+  GST_H265_PARSE_FORMAT_HEV1,
+  GST_H265_PARSE_FORMAT_BYTE
+};
+
+enum
+{
+  GST_H265_PARSE_ALIGN_NONE = 0,
+  GST_H265_PARSE_ALIGN_NAL,
+  GST_H265_PARSE_ALIGN_AU
+};
+
+static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE ("sink",
+    GST_PAD_SINK,
+    GST_PAD_ALWAYS,
+    GST_STATIC_CAPS ("video/x-h265"));
+
+static GstStaticPadTemplate srctemplate = GST_STATIC_PAD_TEMPLATE ("src",
+    GST_PAD_SRC,
+    GST_PAD_ALWAYS,
+    GST_STATIC_CAPS ("video/x-h265, parsed = (boolean) true, "
+        "stream-format=(string) { hvc1, hev1, byte-stream }, "
+        "alignment=(string) { au, nal }"));
+
+#define parent_class gst_h265_parse_parent_class
+G_DEFINE_TYPE (GstH265Parse, gst_h265_parse, GST_TYPE_BASE_PARSE);
+
+static void gst_h265_parse_finalize (GObject * object);
+
+static gboolean gst_h265_parse_start (GstBaseParse * parse);
+static gboolean gst_h265_parse_stop (GstBaseParse * parse);
+static GstFlowReturn gst_h265_parse_handle_frame (GstBaseParse * parse,
+    GstBaseParseFrame * frame, gint * skipsize);
+static GstFlowReturn gst_h265_parse_parse_frame (GstBaseParse * parse,
+    GstBaseParseFrame * frame);
+static GstFlowReturn gst_h265_parse_pre_push_frame (GstBaseParse * parse,
+    GstBaseParseFrame * frame);
+
+static void gst_h265_parse_set_property (GObject * object, guint prop_id,
+    const GValue * value, GParamSpec * pspec);
+static void gst_h265_parse_get_property (GObject * object, guint prop_id,
+    GValue * value, GParamSpec * pspec);
+
+static gboolean gst_h265_parse_set_caps (GstBaseParse * parse, GstCaps * caps);
+static GstCaps *gst_h265_parse_get_caps (GstBaseParse * parse,
+    GstCaps * filter);
+static gboolean gst_h265_parse_event (GstBaseParse * parse, GstEvent * event);
+static gboolean gst_h265_parse_src_event (GstBaseParse * parse,
+    GstEvent * event);
+
+static void
+gst_h265_parse_class_init (GstH265ParseClass * klass)
+{
+  GObjectClass *gobject_class = (GObjectClass *) klass;
+  GstBaseParseClass *parse_class = GST_BASE_PARSE_CLASS (klass);
+  GstElementClass *gstelement_class = GST_ELEMENT_CLASS (klass);
+
+  GST_DEBUG_CATEGORY_INIT (h265_parse_debug, "h265parse", 0, "h265 parser");
+
+  gobject_class->finalize = gst_h265_parse_finalize;
+  gobject_class->set_property = gst_h265_parse_set_property;
+  gobject_class->get_property = gst_h265_parse_get_property;
+
+  g_object_class_install_property (gobject_class, PROP_CONFIG_INTERVAL,
+      g_param_spec_uint ("config-interval",
+          "VPS SPS PPS Send Interval",
+          "Send VPS, SPS and PPS Insertion Interval in seconds (sprop parameter sets "
+          "will be multiplexed in the data stream when detected.) (0 = disabled)",
+          0, 3600, DEFAULT_CONFIG_INTERVAL,
+          G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS));
+  /* Override BaseParse vfuncs */
+  parse_class->start = GST_DEBUG_FUNCPTR (gst_h265_parse_start);
+  parse_class->stop = GST_DEBUG_FUNCPTR (gst_h265_parse_stop);
+  parse_class->handle_frame = GST_DEBUG_FUNCPTR (gst_h265_parse_handle_frame);
+  parse_class->pre_push_frame =
+      GST_DEBUG_FUNCPTR (gst_h265_parse_pre_push_frame);
+  parse_class->set_sink_caps = GST_DEBUG_FUNCPTR (gst_h265_parse_set_caps);
+  parse_class->get_sink_caps = GST_DEBUG_FUNCPTR (gst_h265_parse_get_caps);
+  parse_class->sink_event = GST_DEBUG_FUNCPTR (gst_h265_parse_event);
+  parse_class->src_event = GST_DEBUG_FUNCPTR (gst_h265_parse_src_event);
+
+  gst_element_class_add_pad_template (gstelement_class,
+      gst_static_pad_template_get (&srctemplate));
+  gst_element_class_add_pad_template (gstelement_class,
+      gst_static_pad_template_get (&sinktemplate));
+
+  gst_element_class_set_static_metadata (gstelement_class, "H.265 parser",
+      "Codec/Parser/Converter/Video",
+      "Parses H.265 streams",
+      "Sreerenj Balachandran <sreerenj.balachandran@intel.com>");
+}
+
+static void
+gst_h265_parse_init (GstH265Parse * h265parse)
+{
+  h265parse->frame_out = gst_adapter_new ();
+  gst_base_parse_set_pts_interpolation (GST_BASE_PARSE (h265parse), FALSE);
+  GST_PAD_SET_ACCEPT_INTERSECT (GST_BASE_PARSE_SINK_PAD (h265parse));
+}
+
+
+static void
+gst_h265_parse_finalize (GObject * object)
+{
+  GstH265Parse *h265parse = GST_H265_PARSE (object);
+
+  g_object_unref (h265parse->frame_out);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gst_h265_parse_reset_frame (GstH265Parse * h265parse)
+{
+  GST_DEBUG_OBJECT (h265parse, "reset frame");
+
+  /* done parsing; reset state */
+  h265parse->current_off = -1;
+
+  h265parse->picture_start = FALSE;
+  h265parse->update_caps = FALSE;
+  h265parse->idr_pos = -1;
+  h265parse->sei_pos = -1;
+  h265parse->keyframe = FALSE;
+  h265parse->header = FALSE;
+  gst_adapter_clear (h265parse->frame_out);
+}
+
+static void
+gst_h265_parse_reset (GstH265Parse * h265parse)
+{
+  h265parse->width = 0;
+  h265parse->height = 0;
+  h265parse->fps_num = 0;
+  h265parse->fps_den = 0;
+  h265parse->upstream_par_n = -1;
+  h265parse->upstream_par_d = -1;
+  h265parse->parsed_par_n = 0;
+  h265parse->parsed_par_n = 0;
+  gst_buffer_replace (&h265parse->codec_data, NULL);
+  gst_buffer_replace (&h265parse->codec_data_in, NULL);
+  h265parse->nal_length_size = 4;
+  h265parse->packetized = FALSE;
+  h265parse->transform = FALSE;
+
+  h265parse->align = GST_H265_PARSE_ALIGN_NONE;
+  h265parse->format = GST_H265_PARSE_FORMAT_NONE;
+
+  h265parse->last_report = GST_CLOCK_TIME_NONE;
+  h265parse->push_codec = FALSE;
+  h265parse->have_pps = FALSE;
+  h265parse->have_sps = FALSE;
+  h265parse->have_vps = FALSE;
+
+  h265parse->sent_codec_tag = FALSE;
+
+  h265parse->pending_key_unit_ts = GST_CLOCK_TIME_NONE;
+  h265parse->force_key_unit_event = NULL;
+
+  gst_h265_parse_reset_frame (h265parse);
+}
+
+static gboolean
+gst_h265_parse_start (GstBaseParse * parse)
+{
+  GstH265Parse *h265parse = GST_H265_PARSE (parse);
+
+  GST_DEBUG_OBJECT (parse, "start");
+  gst_h265_parse_reset (h265parse);
+
+  h265parse->nalparser = gst_h265_parser_new ();
+
+  gst_base_parse_set_min_frame_size (parse, 7);
+
+  return TRUE;
+}
+
+static gboolean
+gst_h265_parse_stop (GstBaseParse * parse)
+{
+  guint i;
+  GstH265Parse *h265parse = GST_H265_PARSE (parse);
+
+  GST_DEBUG_OBJECT (parse, "stop");
+  gst_h265_parse_reset (h265parse);
+
+  for (i = 0; i < GST_H265_MAX_VPS_COUNT; i++)
+    gst_buffer_replace (&h265parse->vps_nals[i], NULL);
+  for (i = 0; i < GST_H265_MAX_SPS_COUNT; i++)
+    gst_buffer_replace (&h265parse->sps_nals[i], NULL);
+  for (i = 0; i < GST_H265_MAX_PPS_COUNT; i++)
+    gst_buffer_replace (&h265parse->pps_nals[i], NULL);
+
+  gst_h265_parser_free (h265parse->nalparser);
+
+  return TRUE;
+}
+
+static const gchar *
+gst_h265_parse_get_string (GstH265Parse * parse, gboolean format, gint code)
+{
+  if (format) {
+    switch (code) {
+      case GST_H265_PARSE_FORMAT_HVC1:
+        return "hvc1";
+      case GST_H265_PARSE_FORMAT_HEV1:
+        return "hev1";
+      case GST_H265_PARSE_FORMAT_BYTE:
+        return "byte-stream";
+      default:
+        return "none";
+    }
+  } else {
+    switch (code) {
+      case GST_H265_PARSE_ALIGN_NAL:
+        return "nal";
+      case GST_H265_PARSE_ALIGN_AU:
+        return "au";
+      default:
+        return "none";
+    }
+  }
+}
+
+static void
+gst_h265_parse_format_from_caps (GstCaps * caps, guint * format, guint * align)
+{
+  g_return_if_fail (gst_caps_is_fixed (caps));
+
+  GST_DEBUG ("parsing caps: %" GST_PTR_FORMAT, caps);
+
+  if (format)
+    *format = GST_H265_PARSE_FORMAT_NONE;
+
+  if (align)
+    *align = GST_H265_PARSE_ALIGN_NONE;
+
+  if (caps && gst_caps_get_size (caps) > 0) {
+    GstStructure *s = gst_caps_get_structure (caps, 0);
+    const gchar *str = NULL;
+
+    if (format) {
+      if ((str = gst_structure_get_string (s, "stream-format"))) {
+        if (strcmp (str, "hvc1") == 0)
+          *format = GST_H265_PARSE_FORMAT_HVC1;
+        else if (strcmp (str, "hev1") == 0)
+          *format = GST_H265_PARSE_FORMAT_HEV1;
+        else if (strcmp (str, "byte-stream") == 0)
+          *format = GST_H265_PARSE_FORMAT_BYTE;
+      }
+    }
+
+    if (align) {
+      if ((str = gst_structure_get_string (s, "alignment"))) {
+        if (strcmp (str, "au") == 0)
+          *align = GST_H265_PARSE_ALIGN_AU;
+        else if (strcmp (str, "nal") == 0)
+          *align = GST_H265_PARSE_ALIGN_NAL;
+      }
+    }
+  }
+}
+
+/* check downstream caps to configure format and alignment */
+static void
+gst_h265_parse_negotiate (GstH265Parse * h265parse, gint in_format,
+    GstCaps * in_caps)
+{
+  GstCaps *caps;
+  guint format = GST_H265_PARSE_FORMAT_NONE;
+  guint align = GST_H265_PARSE_ALIGN_NONE;
+
+  g_return_if_fail ((in_caps == NULL) || gst_caps_is_fixed (in_caps));
+
+  caps = gst_pad_get_allowed_caps (GST_BASE_PARSE_SRC_PAD (h265parse));
+  GST_DEBUG_OBJECT (h265parse, "allowed caps: %" GST_PTR_FORMAT, caps);
+
+  /* concentrate on leading structure, since decodebin2 parser
+   * capsfilter always includes parser template caps */
+  if (caps) {
+    caps = gst_caps_truncate (caps);
+    GST_DEBUG_OBJECT (h265parse, "negotiating with caps: %" GST_PTR_FORMAT,
+        caps);
+  }
+
+  if (in_caps && caps) {
+    if (gst_caps_can_intersect (in_caps, caps)) {
+      GST_DEBUG_OBJECT (h265parse, "downstream accepts upstream caps");
+      gst_h265_parse_format_from_caps (in_caps, &format, &align);
+      gst_caps_unref (caps);
+      caps = NULL;
+    }
+  }
+
+  if (caps) {
+    /* fixate to avoid ambiguity with lists when parsing */
+    caps = gst_caps_fixate (caps);
+    gst_h265_parse_format_from_caps (caps, &format, &align);
+    gst_caps_unref (caps);
+  }
+
+  /* default */
+  if (!format)
+    format = GST_H265_PARSE_FORMAT_BYTE;
+  if (!align)
+    align = GST_H265_PARSE_ALIGN_AU;
+
+  GST_DEBUG_OBJECT (h265parse, "selected format %s, alignment %s",
+      gst_h265_parse_get_string (h265parse, TRUE, format),
+      gst_h265_parse_get_string (h265parse, FALSE, align));
+
+  h265parse->format = format;
+  h265parse->align = align;
+
+  h265parse->transform = (in_format != h265parse->format);
+}
+
+static GstBuffer *
+gst_h265_parse_wrap_nal (GstH265Parse * h265parse, guint format, guint8 * data,
+    guint size)
+{
+  GstBuffer *buf;
+  guint nl = h265parse->nal_length_size;
+  guint32 tmp;
+
+  GST_DEBUG_OBJECT (h265parse, "nal length %d", size);
+
+  buf = gst_buffer_new_allocate (NULL, 4 + size, NULL);
+  if (format == GST_H265_PARSE_FORMAT_HVC1
+      || format == GST_H265_PARSE_FORMAT_HEV1) {
+    tmp = GUINT32_TO_BE (size << (32 - 8 * nl));
+  } else {
+    /* HACK: nl should always be 4 here, otherwise this won't work.
+     * There are legit cases where nl in hevc stream is 2, but byte-stream
+     * SC is still always 4 bytes. */
+    nl = 4;
+    tmp = GUINT32_TO_BE (1);
+  }
+
+  gst_buffer_fill (buf, 0, &tmp, sizeof (guint32));
+  gst_buffer_fill (buf, nl, data, size);
+  gst_buffer_set_size (buf, size + nl);
+
+  return buf;
+}
+
+static void
+gst_h265_parser_store_nal (GstH265Parse * h265parse, guint id,
+    GstH265NalUnitType naltype, GstH265NalUnit * nalu)
+{
+  GstBuffer *buf, **store;
+  guint size = nalu->size, store_size;
+
+  if (naltype == GST_H265_NAL_VPS) {
+    store_size = GST_H265_MAX_VPS_COUNT;
+    store = h265parse->vps_nals;
+    GST_DEBUG_OBJECT (h265parse, "storing vps %u", id);
+  } else if (naltype == GST_H265_NAL_SPS) {
+    store_size = GST_H265_MAX_SPS_COUNT;
+    store = h265parse->sps_nals;
+    GST_DEBUG_OBJECT (h265parse, "storing sps %u", id);
+  } else if (naltype == GST_H265_NAL_PPS) {
+    store_size = GST_H265_MAX_PPS_COUNT;
+    store = h265parse->pps_nals;
+    GST_DEBUG_OBJECT (h265parse, "storing pps %u", id);
+  } else
+    return;
+
+  if (id >= store_size) {
+    GST_DEBUG_OBJECT (h265parse, "unable to store nal, id out-of-range %d", id);
+    return;
+  }
+
+  buf = gst_buffer_new_allocate (NULL, size, NULL);
+  gst_buffer_fill (buf, 0, nalu->data + nalu->offset, size);
+
+  /* Indicate that buffer contain a header needed for decoding */
+  if (naltype >= GST_H265_NAL_VPS && naltype <= GST_H265_NAL_PPS)
+    GST_BUFFER_FLAG_SET (buf, GST_BUFFER_FLAG_HEADER);
+
+  if (store[id])
+    gst_buffer_unref (store[id]);
+
+  store[id] = buf;
+}
+
+#ifndef GST_DISABLE_GST_DEBUG
+static const gchar *nal_names[] = {
+  "Slice_TRAIL_N",
+  "Slice_TRAIL_R",
+  "Slice_TSA_N",
+  "Slice_TSA_R",
+  "Slice_STSA_N",
+  "Slice_STSA_R",
+  "Slice_RADL_N",
+  "Slice_RADL_R",
+  "SLICE_RASL_N",
+  "SLICE_RASL_R",
+  "Invalid (10)",
+  "Invalid (11)",
+  "Invalid (12)",
+  "Invalid (13)",
+  "Invalid (14)",
+  "Invalid (15)",
+  "SLICE_BLA_W_LP",
+  "SLICE_BLA_W_RADL",
+  "SLICE_BLA_N_LP",
+  "SLICE_IDR_W_RADL",
+  "SLICE_IDR_N_LP",
+  "SLICE_CRA_NUT",
+  "Invalid (22)",
+  "Invalid (23)",
+  "Invalid (24)",
+  "Invalid (25)",
+  "Invalid (26)",
+  "Invalid (27)",
+  "Invalid (28)",
+  "Invalid (29)",
+  "Invalid (30)",
+  "Invalid (31)",
+  "VPS",
+  "SPS",
+  "PPS",
+  "AUD",
+  "EOS",
+  "EOB",
+  "FD",
+  "PREFIX_SEI",
+  "SUFFIX_SEI"
+};
+
+static const gchar *
+_nal_name (GstH265NalUnitType nal_type)
+{
+  if (nal_type <= GST_H265_NAL_SUFFIX_SEI)
+    return nal_names[nal_type];
+  return "Invalid";
+}
+#endif
+
+/* caller guarantees 2 bytes of nal payload */
+static void
+gst_h265_parse_process_nal (GstH265Parse * h265parse, GstH265NalUnit * nalu)
+{
+  GstH265PPS pps = { 0, };
+  GstH265SPS sps = { 0, };
+  GstH265VPS vps = { 0, };
+  gboolean is_irap;
+  guint nal_type;
+  GstH265Parser *nalparser = h265parse->nalparser;
+  GstH265ParserResult pres = GST_H265_PARSER_ERROR;
+
+  /* nothing to do for broken input */
+  if (G_UNLIKELY (nalu->size < 3)) {
+    GST_DEBUG_OBJECT (h265parse, "not processing nal size %u", nalu->size);
+    return;
+  }
+
+  /* we have a peek as well */
+  nal_type = nalu->type;
+
+  GST_DEBUG_OBJECT (h265parse, "processing nal of type %u %s, size %u",
+      nal_type, _nal_name (nal_type), nalu->size);
+  switch (nal_type) {
+    case GST_H265_NAL_VPS:
+      /* It is not mandatory to have VPS in the stream. But it might
+       * be needed for other extensions like svc */
+      pres = gst_h265_parser_parse_vps (nalparser, nalu, &vps);
+      if (pres != GST_H265_PARSER_OK)
+        GST_WARNING_OBJECT (h265parse, "failed to parse VPS");
+
+      GST_DEBUG_OBJECT (h265parse, "triggering src caps check");
+      h265parse->update_caps = TRUE;
+      h265parse->have_vps = TRUE;
+      if (h265parse->push_codec && h265parse->have_pps) {
+        /* VPS/SPS/PPS found in stream before the first pre_push_frame, no need
+         * to forcibly push at start */
+        GST_INFO_OBJECT (h265parse, "have VPS/SPS/PPS in stream");
+        h265parse->push_codec = FALSE;
+        h265parse->have_vps = FALSE;
+        h265parse->have_sps = FALSE;
+        h265parse->have_pps = FALSE;
+      }
+
+      gst_h265_parser_store_nal (h265parse, vps.id, nal_type, nalu);
+      h265parse->header |= TRUE;
+      break;
+    case GST_H265_NAL_SPS:
+      pres = gst_h265_parser_parse_sps (nalparser, nalu, &sps, TRUE);
+
+
+      /* arranged for a fallback sps.id, so use that one and only warn */
+      if (pres != GST_H265_PARSER_OK)
+        GST_WARNING_OBJECT (h265parse, "failed to parse SPS:");
+
+      GST_DEBUG_OBJECT (h265parse, "triggering src caps check");
+      h265parse->update_caps = TRUE;
+      h265parse->have_sps = TRUE;
+      if (h265parse->push_codec && h265parse->have_pps) {
+        /* SPS and PPS found in stream before the first pre_push_frame, no need
+         * to forcibly push at start */
+        GST_INFO_OBJECT (h265parse, "have SPS/PPS in stream");
+        h265parse->push_codec = FALSE;
+        h265parse->have_sps = FALSE;
+        h265parse->have_pps = FALSE;
+      }
+
+      gst_h265_parser_store_nal (h265parse, sps.id, nal_type, nalu);
+      h265parse->header |= TRUE;
+      break;
+    case GST_H265_NAL_PPS:
+      pres = gst_h265_parser_parse_pps (nalparser, nalu, &pps);
+
+
+      /* arranged for a fallback pps.id, so use that one and only warn */
+      if (pres != GST_H265_PARSER_OK)
+        GST_WARNING_OBJECT (h265parse, "failed to parse PPS:");
+
+      /* parameters might have changed, force caps check */
+      if (!h265parse->have_pps) {
+        GST_DEBUG_OBJECT (h265parse, "triggering src caps check");
+        h265parse->update_caps = TRUE;
+      }
+      h265parse->have_pps = TRUE;
+      if (h265parse->push_codec && h265parse->have_sps) {
+        /* SPS and PPS found in stream before the first pre_push_frame, no need
+         * to forcibly push at start */
+        GST_INFO_OBJECT (h265parse, "have SPS/PPS in stream");
+        h265parse->push_codec = FALSE;
+        h265parse->have_sps = FALSE;
+        h265parse->have_pps = FALSE;
+      }
+
+      gst_h265_parser_store_nal (h265parse, pps.id, nal_type, nalu);
+      h265parse->header |= TRUE;
+      break;
+    case GST_H265_NAL_PREFIX_SEI:
+    case GST_H265_NAL_SUFFIX_SEI:
+      /*Fixme: parse sei messages */
+      /* mark SEI pos */
+      if (h265parse->sei_pos == -1) {
+        if (h265parse->transform)
+          h265parse->sei_pos = gst_adapter_available (h265parse->frame_out);
+        else
+          h265parse->sei_pos = nalu->sc_offset;
+        GST_DEBUG_OBJECT (h265parse, "marking SEI in frame at offset %d",
+            h265parse->sei_pos);
+      }
+      break;
+
+    case GST_H265_NAL_SLICE_TRAIL_N:
+    case GST_H265_NAL_SLICE_TRAIL_R:
+    case GST_H265_NAL_SLICE_TSA_N:
+    case GST_H265_NAL_SLICE_TSA_R:
+    case GST_H265_NAL_SLICE_STSA_N:
+    case GST_H265_NAL_SLICE_STSA_R:
+    case GST_H265_NAL_SLICE_RADL_N:
+    case GST_H265_NAL_SLICE_RADL_R:
+    case GST_H265_NAL_SLICE_RASL_N:
+    case GST_H265_NAL_SLICE_RASL_R:
+    case GST_H265_NAL_SLICE_BLA_W_LP:
+    case GST_H265_NAL_SLICE_BLA_W_RADL:
+    case GST_H265_NAL_SLICE_BLA_N_LP:
+    case GST_H265_NAL_SLICE_IDR_W_RADL:
+    case GST_H265_NAL_SLICE_IDR_N_LP:
+    case GST_H265_NAL_SLICE_CRA_NUT:
+    {
+      GstH265SliceHdr slice;
+
+      pres = gst_h265_parser_parse_slice_hdr (nalparser, nalu, &slice);
+
+      if (pres == GST_H265_PARSER_OK) {
+        if (GST_H265_IS_I_SLICE (&slice))
+          h265parse->keyframe |= TRUE;
+      }
+      if (slice.first_slice_segment_in_pic_flag == 1)
+        GST_DEBUG_OBJECT (h265parse,
+            "frame start, first_slice_segment_in_pic_flag = 1");
+
+      GST_DEBUG_OBJECT (h265parse,
+          "parse result %d, first slice_segment: %u, slice type: %u",
+          pres, slice.first_slice_segment_in_pic_flag, slice.type);
+
+      gst_h265_slice_hdr_free (&slice);
+    }
+
+      is_irap = ((nal_type >= GST_H265_NAL_SLICE_BLA_W_LP)
+          && (nal_type <= GST_H265_NAL_SLICE_CRA_NUT)) ? TRUE : FALSE;
+      if (G_LIKELY (!is_irap && !h265parse->push_codec))
+        break;
+
+      /* if we need to sneak codec NALs into the stream,
+       * this is a good place, so fake it as IDR
+       * (which should be at start anyway) */
+      /* mark where config needs to go if interval expired */
+      /* mind replacement buffer if applicable */
+      if (h265parse->idr_pos == -1) {
+        if (h265parse->transform)
+          h265parse->idr_pos = gst_adapter_available (h265parse->frame_out);
+        else
+          h265parse->idr_pos = nalu->sc_offset;
+        GST_DEBUG_OBJECT (h265parse, "marking IDR in frame at offset %d",
+            h265parse->idr_pos);
+      }
+      /* if SEI preceeds (faked) IDR, then we have to insert config there */
+      if (h265parse->sei_pos >= 0 && h265parse->idr_pos > h265parse->sei_pos) {
+        h265parse->idr_pos = h265parse->sei_pos;
+        GST_DEBUG_OBJECT (h265parse, "moved IDR mark to SEI position %d",
+            h265parse->idr_pos);
+      }
+      break;
+    default:
+      gst_h265_parser_parse_nal (nalparser, nalu);
+  }
+
+  /* if HEVC output needed, collect properly prefixed nal in adapter,
+   * and use that to replace outgoing buffer data later on */
+  if (h265parse->transform) {
+    GstBuffer *buf;
+
+    GST_LOG_OBJECT (h265parse, "collecting NAL in HEVC frame");
+    buf = gst_h265_parse_wrap_nal (h265parse, h265parse->format,
+        nalu->data + nalu->offset, nalu->size);
+    gst_adapter_push (h265parse->frame_out, buf);
+  }
+}
+
+/* caller guarantees at least 3 bytes of nal payload for each nal
+ * returns TRUE if next_nal indicates that nal terminates an AU */
+static inline gboolean
+gst_h265_parse_collect_nal (GstH265Parse * h265parse, const guint8 * data,
+    guint size, GstH265NalUnit * nalu)
+{
+  gboolean complete;
+  GstH265ParserResult parse_res;
+  GstH265NalUnitType nal_type = nalu->type;
+  GstH265NalUnit nnalu;
+
+  GST_DEBUG_OBJECT (h265parse, "parsing collected nal");
+  parse_res = gst_h265_parser_identify_nalu (h265parse->nalparser, data,
+      nalu->offset + nalu->size, size, &nnalu);
+
+  if (parse_res == GST_H265_PARSER_ERROR)
+    return FALSE;
+
+  /* determine if AU complete */
+  GST_LOG_OBJECT (h265parse, "nal type: %d %s", nal_type, _nal_name (nal_type));
+  /* coded slice NAL starts a picture,
+   * i.e. other types become aggregated in front of it */
+  h265parse->picture_start |= ((nal_type >= GST_H265_NAL_SLICE_TRAIL_N
+          && nal_type <= GST_H265_NAL_SLICE_TRAIL_R)
+      || (nal_type >= GST_H265_NAL_SLICE_BLA_W_LP
+          && nal_type <= RESERVED_IRAP_NAL_TYPE_MAX));
+
+  /* consider a coded slices (IRAP or not) to start a picture,
+   * (so ending the previous one) if first_slice_segment_in_pic_flag == 1*/
+  nal_type = nnalu.type;
+  complete = h265parse->picture_start && ((nal_type >= GST_H265_NAL_VPS
+          && nal_type <= GST_H265_NAL_AUD)
+      || nal_type == GST_H265_NAL_PREFIX_SEI || (nal_type >= 41
+          && nal_type <= 44) || (nal_type >= 48 && nal_type <= 55));
+
+  GST_LOG_OBJECT (h265parse, "next nal type: %d %s", nal_type,
+      _nal_name (nal_type));
+
+  /* Any VCL Nal unit with first_slice_segment_in_pic_flag == 1 considered start of frame */
+  complete |= h265parse->picture_start
+      && (((nal_type >= GST_H265_NAL_SLICE_TRAIL_N
+              && nal_type <= GST_H265_NAL_SLICE_TRAIL_R)
+          || (nal_type >= GST_H265_NAL_SLICE_BLA_W_LP
+              && nal_type <= RESERVED_IRAP_NAL_TYPE_MAX))
+      && (nnalu.data[nnalu.offset + 2] & 0x80));
+
+  GST_LOG_OBJECT (h265parse, "au complete: %d", complete);
+  return complete;
+}
+
+static GstFlowReturn
+gst_h265_parse_handle_frame_packetized (GstBaseParse * parse,
+    GstBaseParseFrame * frame)
+{
+  GstH265Parse *h265parse = GST_H265_PARSE (parse);
+  GstBuffer *buffer = frame->buffer;
+  GstFlowReturn ret = GST_FLOW_OK;
+  GstH265ParserResult parse_res;
+  GstH265NalUnit nalu;
+  const guint nl = h265parse->nal_length_size;
+  GstMapInfo map;
+  gint left;
+
+  if (nl < 1 || nl > 4) {
+    GST_DEBUG_OBJECT (h265parse, "insufficient data to split input");
+    return GST_FLOW_NOT_NEGOTIATED;
+  }
+
+  /* need to save buffer from invalidation upon _finish_frame */
+  if (h265parse->split_packetized)
+    buffer = gst_buffer_copy (frame->buffer);
+
+  gst_buffer_map (buffer, &map, GST_MAP_READ);
+
+  left = map.size;
+
+  GST_LOG_OBJECT (h265parse,
+      "processing packet buffer of size %" G_GSIZE_FORMAT, map.size);
+
+  parse_res = gst_h265_parser_identify_nalu_hevc (h265parse->nalparser,
+      map.data, 0, map.size, nl, &nalu);
+
+  while (parse_res == GST_H265_PARSER_OK) {
+    GST_DEBUG_OBJECT (h265parse, "HEVC nal offset %d", nalu.offset + nalu.size);
+
+    /* either way, have a look at it */
+    gst_h265_parse_process_nal (h265parse, &nalu);
+
+    /* dispatch per NALU if needed */
+    if (h265parse->split_packetized) {
+      /* note we don't need to come up with a sub-buffer, since
+       * subsequent code only considers input buffer's metadata.
+       * Real data is either taken from input by baseclass or
+       * a replacement output buffer is provided anyway. */
+      gst_h265_parse_parse_frame (parse, frame);
+      ret = gst_base_parse_finish_frame (parse, frame, nl + nalu.size);
+      left -= nl + nalu.size;
+    }
+
+    parse_res = gst_h265_parser_identify_nalu_hevc (h265parse->nalparser,
+        map.data, nalu.offset + nalu.size, map.size, nl, &nalu);
+  }
+
+  gst_buffer_unmap (buffer, &map);
+
+  if (!h265parse->split_packetized) {
+    gst_h265_parse_parse_frame (parse, frame);
+    ret = gst_base_parse_finish_frame (parse, frame, map.size);
+  } else {
+    gst_buffer_unref (buffer);
+    if (G_UNLIKELY (left)) {
+      /* should not be happening for nice HEVC */
+      GST_WARNING_OBJECT (parse, "skipping leftover HEVC data %d", left);
+      frame->flags |= GST_BASE_PARSE_FRAME_FLAG_DROP;
+      ret = gst_base_parse_finish_frame (parse, frame, map.size);
+    }
+  }
+
+  if (parse_res == GST_H265_PARSER_NO_NAL_END ||
+      parse_res == GST_H265_PARSER_BROKEN_DATA) {
+
+    if (h265parse->split_packetized) {
+      GST_ELEMENT_ERROR (h265parse, STREAM, FAILED, (NULL),
+          ("invalid HEVC input data"));
+      gst_buffer_unref (buffer);
+
+      return GST_FLOW_ERROR;
+    } else {
+      /* do not meddle to much in this case */
+      GST_DEBUG_OBJECT (h265parse, "parsing packet failed");
+    }
+  }
+
+  return ret;
+}
+
+static GstFlowReturn
+gst_h265_parse_handle_frame (GstBaseParse * parse,
+    GstBaseParseFrame * frame, gint * skipsize)
+{
+  GstH265Parse *h265parse = GST_H265_PARSE (parse);
+  GstBuffer *buffer = frame->buffer;
+  GstMapInfo map;
+  guint8 *data;
+  gsize size;
+  gint current_off = 0;
+  gboolean drain, nonext;
+  GstH265Parser *nalparser = h265parse->nalparser;
+  GstH265NalUnit nalu;
+  GstH265ParserResult pres;
+  gint framesize;
+
+  /* delegate in packetized case, no skipping should be needed */
+  if (h265parse->packetized)
+    return gst_h265_parse_handle_frame_packetized (parse, frame);
+
+  gst_buffer_map (buffer, &map, GST_MAP_READ);
+  data = map.data;
+  size = map.size;
+
+  /* expect at least 3 bytes startcode == sc, and 3 bytes NALU payload */
+  if (G_UNLIKELY (size < 6)) {
+    gst_buffer_unmap (buffer, &map);
+    *skipsize = 1;
+    return GST_FLOW_OK;
+  }
+
+  /* need to configure aggregation */
+  if (G_UNLIKELY (h265parse->format == GST_H265_PARSE_FORMAT_NONE))
+    gst_h265_parse_negotiate (h265parse, GST_H265_PARSE_FORMAT_BYTE, NULL);
+
+  /* avoid stale cached parsing state */
+  if (frame->flags & GST_BASE_PARSE_FRAME_FLAG_NEW_FRAME) {
+    GST_LOG_OBJECT (h265parse, "parsing new frame");
+    gst_h265_parse_reset_frame (h265parse);
+  } else {
+    GST_LOG_OBJECT (h265parse, "resuming frame parsing");
+  }
+
+  drain = GST_BASE_PARSE_DRAINING (parse);
+  nonext = FALSE;
+
+  current_off = h265parse->current_off;
+  if (current_off < 0)
+    current_off = 0;
+  g_assert (current_off < size);
+  GST_DEBUG_OBJECT (h265parse, "last parse position %d", current_off);
+
+  /* check for initial skip */
+  if (h265parse->current_off == -1) {
+    pres =
+        gst_h265_parser_identify_nalu_unchecked (nalparser, data, current_off,
+        size, &nalu);
+    switch (pres) {
+      case GST_H265_PARSER_OK:
+        if (nalu.sc_offset > 0) {
+          *skipsize = nalu.sc_offset;
+          goto skip;
+        }
+        break;
+      case GST_H265_PARSER_NO_NAL:
+        *skipsize = size - 3;
+        goto skip;
+      default:
+        g_assert_not_reached ();
+        break;
+    }
+  }
+
+  while (TRUE) {
+    pres =
+        gst_h265_parser_identify_nalu (nalparser, data, current_off, size,
+        &nalu);
+
+    switch (pres) {
+      case GST_H265_PARSER_OK:
+        GST_DEBUG_OBJECT (h265parse, "complete nal (offset, size): (%u, %u) ",
+            nalu.offset, nalu.size);
+        break;
+      case GST_H265_PARSER_NO_NAL_END:
+        GST_DEBUG_OBJECT (h265parse, "not a complete nal found at offset %u",
+            nalu.offset);
+        /* if draining, accept it as complete nal */
+        if (drain) {
+          nonext = TRUE;
+          nalu.size = size - nalu.offset;
+          GST_DEBUG_OBJECT (h265parse, "draining, accepting with size %u",
+              nalu.size);
+          /* if it's not too short at least */
+          if (nalu.size < 3)
+            goto broken;
+          break;
+        }
+        /* otherwise need more */
+        goto more;
+      case GST_H265_PARSER_BROKEN_LINK:
+        GST_ELEMENT_ERROR (h265parse, STREAM, FORMAT,
+            ("Error parsing H.265 stream"),
+            ("The link to structure needed for the parsing couldn't be found"));
+        goto invalid_stream;
+      case GST_H265_PARSER_ERROR:
+        /* should not really occur either */
+        GST_ELEMENT_ERROR (h265parse, STREAM, FORMAT,
+            ("Error parsing H.265 stream"), ("Invalid H.265 stream"));
+        goto invalid_stream;
+      case GST_H265_PARSER_NO_NAL:
+        GST_ELEMENT_ERROR (h265parse, STREAM, FORMAT,
+            ("Error parsing H.265 stream"), ("No H.265 NAL unit found"));
+        goto invalid_stream;
+      case GST_H265_PARSER_BROKEN_DATA:
+        GST_WARNING_OBJECT (h265parse, "input stream is corrupt; "
+            "it contains a NAL unit of length %u", nalu.size);
+      broken:
+        /* broken nal at start -> arrange to skip it,
+         * otherwise have it terminate current au
+         * (and so it will be skipped on next frame round) */
+        if (current_off == 0) {
+          GST_DEBUG_OBJECT (h265parse, "skipping broken nal");
+          *skipsize = nalu.offset;
+          goto skip;
+        } else {
+          GST_DEBUG_OBJECT (h265parse, "terminating au");
+          nalu.size = 0;
+          nalu.offset = nalu.sc_offset;
+          goto end;
+        }
+      default:
+        g_assert_not_reached ();
+        break;
+    }
+
+    GST_DEBUG_OBJECT (h265parse, "%p complete nal found. Off: %u, Size: %u",
+        data, nalu.offset, nalu.size);
+
+    /* simulate no next nal if none needed */
+    nonext = nonext || (h265parse->align == GST_H265_PARSE_ALIGN_NAL);
+
+    if (!nonext) {
+      if (nalu.offset + nalu.size + 5 + 2 > size) {
+        GST_DEBUG_OBJECT (h265parse, "not enough data for next NALU");
+        if (drain) {
+          GST_DEBUG_OBJECT (h265parse, "but draining anyway");
+          nonext = TRUE;
+        } else {
+          goto more;
+        }
+      }
+    }
+
+    if (nalu.type == GST_H265_NAL_VPS ||
+        nalu.type == GST_H265_NAL_SPS ||
+        nalu.type == GST_H265_NAL_PPS ||
+        (h265parse->have_sps && h265parse->have_pps)) {
+      gst_h265_parse_process_nal (h265parse, &nalu);
+    } else {
+      GST_WARNING_OBJECT (h265parse,
+          "no SPS/PPS yet, nal Type: %d %s, Size: %u will be dropped",
+          nalu.type, _nal_name (nalu.type), nalu.size);
+      *skipsize = nalu.size;
+      goto skip;
+    }
+
+    if (nonext)
+      break;
+
+    /* if no next nal, we know it's complete here */
+    if (gst_h265_parse_collect_nal (h265parse, data, size, &nalu))
+      break;
+
+    GST_DEBUG_OBJECT (h265parse, "Looking for more");
+    current_off = nalu.offset + nalu.size;
+  }
+
+end:
+  framesize = nalu.offset + nalu.size;
+
+  gst_buffer_unmap (buffer, &map);
+
+  gst_h265_parse_parse_frame (parse, frame);
+
+  return gst_base_parse_finish_frame (parse, frame, framesize);
+
+more:
+  *skipsize = 0;
+
+  /* Restart parsing from here next time */
+  if (current_off > 0)
+    h265parse->current_off = current_off;
+
+  /* Fall-through. */
+out:
+  gst_buffer_unmap (buffer, &map);
+  return GST_FLOW_OK;
+
+skip:
+  GST_DEBUG_OBJECT (h265parse, "skipping %d", *skipsize);
+  gst_h265_parse_reset_frame (h265parse);
+  goto out;
+
+invalid_stream:
+  gst_buffer_unmap (buffer, &map);
+  return GST_FLOW_ERROR;
+}
+
+/* byte together hevc codec data based on collected pps and sps so far */
+static GstBuffer *
+gst_h265_parse_make_codec_data (GstH265Parse * h265parse)
+{
+  GstBuffer *buf, *nal;
+  gint i, j, k = 0;
+  guint vps_size = 0, sps_size = 0, pps_size = 0;
+  guint num_vps = 0, num_sps = 0, num_pps = 0;
+  gboolean found = FALSE;
+  GstMapInfo map;
+  guint8 *data;
+  gint nl;
+  guint8 num_arrays = 0;
+  GstH265SPS *sps = NULL;
+  guint16 min_spatial_segmentation_idc = 0;
+  GstH265ProfileTierLevel *pft;
+
+  /* only nal payload in stored nals */
+  /* Fixme: Current implementation is not embedding SEI in codec_data */
+  for (i = 0; i < GST_H265_MAX_VPS_COUNT; i++) {
+    if ((nal = h265parse->vps_nals[i])) {
+      num_vps++;
+      /* size bytes also count */
+      vps_size += gst_buffer_get_size (nal) + 2;
+    }
+  }
+  if (num_vps > 0)
+    num_arrays++;
+
+  for (i = 0; i < GST_H265_MAX_SPS_COUNT; i++) {
+    if ((nal = h265parse->sps_nals[i])) {
+      num_sps++;
+      /* size bytes also count */
+      sps_size += gst_buffer_get_size (nal) + 2;
+      found = TRUE;
+    }
+  }
+  if (num_sps > 0)
+    num_arrays++;
+
+  for (i = 0; i < GST_H265_MAX_PPS_COUNT; i++) {
+    if ((nal = h265parse->pps_nals[i])) {
+      num_pps++;
+      /* size bytes also count */
+      pps_size += gst_buffer_get_size (nal) + 2;
+    }
+  }
+  if (num_pps > 0)
+    num_arrays++;
+
+  GST_DEBUG_OBJECT (h265parse,
+      "constructing codec_data: num_vps =%d num_sps=%d, num_pps=%d", num_vps,
+      num_sps, num_pps);
+
+  if (!found)
+    return NULL;
+
+  buf =
+      gst_buffer_new_allocate (NULL,
+      23 + num_arrays + (3 * num_arrays) + vps_size + sps_size + pps_size,
+      NULL);
+  gst_buffer_map (buf, &map, GST_MAP_WRITE);
+  data = map.data;
+  memset (data, 0, map.size);
+  nl = h265parse->nal_length_size;
+
+  sps = h265parse->nalparser->last_sps;
+  if (!sps)
+    return NULL;
+  pft = &sps->profile_tier_level;
+  if (sps->vui_parameters_present_flag)
+    min_spatial_segmentation_idc = sps->vui_params.min_spatial_segmentation_idc;
+
+  /* HEVCDecoderConfigurationVersion = 1
+   * profile_space | tier_flat | profile_idc |
+   * profile_compatibility_flags | constraint_indicator_flags |
+   * level_idc */
+  data[0] = 1;
+  data[1] =
+      (pft->profile_space << 5) | (pft->tier_flag << 5) | pft->profile_idc;
+  for (i = 2; i < 6; i++) {
+    for (j = 7; j >= 0; j--) {
+      data[i] |= (pft->profile_compatibility_flag[k] << j);
+      k++;
+    }
+  }
+  data[6] |=
+      (pft->progressive_source_flag << 7) | (pft->interlaced_source_flag << 6) |
+      (pft->non_packed_constraint_flag << 5) | (pft->
+      frame_only_constraint_flag << 4);
+  data[12] = pft->level_idc;
+  /* min_spatial_segmentation_idc */
+  GST_WRITE_UINT16_BE (data + 13, min_spatial_segmentation_idc);
+  data[13] |= 0xf0;
+  data[15] = 0xfc;              /* keeping parrallelismType as zero (unknown) */
+  data[16] = 0xfc | sps->chroma_format_idc;
+  data[17] = 0xf8 | sps->bit_depth_luma_minus8;
+  data[18] = 0xf8 | sps->bit_depth_chroma_minus8;
+  data[19] = 0x00;              /* keep avgFrameRate as unspecified */
+  data[20] = 0x00;              /* keep avgFrameRate as unspecified */
+  /* constFrameRate(2 bits): 0, stream may or may not be of constant framerate
+   * numTemporalLayers (3 bits): number of temporal layers, value from SPS
+   * TemporalIdNested (1 bit): sps_temporal_id_nesting_flag from SPS
+   * lengthSizeMinusOne (2 bits): plus 1 indicates the length of the NALUnitLength */
+  data[21] =
+      0x00 | ((sps->max_sub_layers_minus1 +
+          1) << 3) | (sps->temporal_id_nesting_flag << 2) | (nl - 1);
+  GST_WRITE_UINT8 (data + 22, num_arrays);      /* numOfArrays */
+
+  data += 23;
+
+  /* VPS */
+  if (num_vps > 0) {
+    /* array_completeness | reserved_zero bit | nal_unit_type */
+    data[0] = 0x00 | 0x20;
+    data++;
+
+    GST_WRITE_UINT16_BE (data, num_vps);
+    data += 2;
+
+    for (i = 0; i < num_vps; i++) {
+      if ((nal = h265parse->vps_nals[i])) {
+        gsize nal_size = gst_buffer_get_size (nal);
+        GST_WRITE_UINT16_BE (data, nal_size);
+        gst_buffer_extract (nal, 0, data + 2, nal_size);
+        data += 2 + nal_size;
+      }
+    }
+  }
+
+  /* SPS */
+  if (num_sps > 0) {
+    /* array_completeness | reserved_zero bit | nal_unit_type */
+    data[0] = 0x00 | 0x21;
+    data++;
+
+    GST_WRITE_UINT16_BE (data, num_sps);
+    data += 2;
+
+    for (i = 0; i < num_sps; i++) {
+      if ((nal = h265parse->sps_nals[i])) {
+        gsize nal_size = gst_buffer_get_size (nal);
+        GST_WRITE_UINT16_BE (data, nal_size);
+        gst_buffer_extract (nal, 0, data + 2, nal_size);
+        data += 2 + nal_size;
+      }
+    }
+  }
+
+  /* PPS */
+  if (num_pps > 0) {
+    /* array_completeness | reserved_zero bit | nal_unit_type */
+    data[0] = 0x00 | 0x22;
+    data++;
+
+    GST_WRITE_UINT16_BE (data, num_pps);
+    data += 2;
+
+    for (i = 0; i < num_pps; i++) {
+      if ((nal = h265parse->pps_nals[i])) {
+        gsize nal_size = gst_buffer_get_size (nal);
+        GST_WRITE_UINT16_BE (data, nal_size);
+        gst_buffer_extract (nal, 0, data + 2, nal_size);
+        data += 2 + nal_size;
+      }
+    }
+  }
+  gst_buffer_unmap (buf, &map);
+
+  return buf;
+}
+
+static void
+gst_h265_parse_get_par (GstH265Parse * h265parse, gint * num, gint * den)
+{
+  if (h265parse->upstream_par_n != -1 && h265parse->upstream_par_d != -1) {
+    *num = h265parse->upstream_par_n;
+    *den = h265parse->upstream_par_d;
+  } else {
+    *num = h265parse->parsed_par_n;
+    *den = h265parse->parsed_par_d;
+  }
+}
+
+static const gchar *
+digit_to_string (guint digit)
+{
+  static const char itoa[][2] = {
+    "0", "1", "2", "3", "4", "5", "6", "7", "8", "9"
+  };
+
+  if (G_LIKELY (digit < 10))
+    return itoa[digit];
+  else
+    return NULL;
+}
+
+static const gchar *
+get_profile_string (guint8 profile_idc)
+{
+  const gchar *profile = NULL;
+
+  if (profile_idc == 1)
+    profile = "main";
+  else if (profile_idc == 2)
+    profile = "main-10";
+  else if (profile_idc == 3)
+    profile = "main-still-picture";
+
+  return profile;
+}
+
+static const gchar *
+get_tier_string (guint8 tier_flag)
+{
+  const gchar *tier = NULL;
+
+  if (tier_flag)
+    tier = "high";
+  else
+    tier = "main";
+
+  return tier;
+}
+
+static const gchar *
+get_level_string (guint8 level_idc)
+{
+  if (level_idc % 30 == 0)
+    return digit_to_string (level_idc / 30);
+  else {
+    switch (level_idc) {
+      case 63:
+        return "2.1";
+        break;
+      case 93:
+        return "3.1";
+        break;
+      case 123:
+        return "4.1";
+        break;
+      case 153:
+        return "5.1";
+        break;
+      case 156:
+        return "5.2";
+        break;
+      case 183:
+        return "6.1";
+        break;
+      case 186:
+        return "6.2";
+        break;
+      default:
+        return NULL;
+    }
+  }
+}
+
+static void
+gst_h265_parse_update_src_caps (GstH265Parse * h265parse, GstCaps * caps)
+{
+  GstH265SPS *sps;
+  GstCaps *sink_caps, *src_caps;
+  gboolean modified = FALSE;
+  GstBuffer *buf = NULL;
+  GstStructure *s = NULL;
+
+  if (G_UNLIKELY (!gst_pad_has_current_caps (GST_BASE_PARSE_SRC_PAD
+              (h265parse))))
+    modified = TRUE;
+  else if (G_UNLIKELY (!h265parse->update_caps))
+    return;
+
+  /* if this is being called from the first _setcaps call, caps on the sinkpad
+   * aren't set yet and so they need to be passed as an argument */
+  if (caps)
+    sink_caps = gst_caps_ref (caps);
+  else
+    sink_caps = gst_pad_get_current_caps (GST_BASE_PARSE_SINK_PAD (h265parse));
+
+  /* carry over input caps as much as possible; override with our own stuff */
+  if (!sink_caps)
+    sink_caps = gst_caps_new_empty_simple ("video/x-h265");
+  else
+    s = gst_caps_get_structure (sink_caps, 0);
+
+  sps = h265parse->nalparser->last_sps;
+  GST_DEBUG_OBJECT (h265parse, "sps: %p", sps);
+
+  /* only codec-data for nice-and-clean au aligned packetized hevc format */
+  if ((h265parse->format == GST_H265_PARSE_FORMAT_HVC1
+          || h265parse->format == GST_H265_PARSE_FORMAT_HEV1)
+      && h265parse->align == GST_H265_PARSE_ALIGN_AU) {
+    buf = gst_h265_parse_make_codec_data (h265parse);
+    if (buf && h265parse->codec_data) {
+      GstMapInfo map;
+
+      gst_buffer_map (buf, &map, GST_MAP_READ);
+      if (map.size != gst_buffer_get_size (h265parse->codec_data) ||
+          gst_buffer_memcmp (h265parse->codec_data, 0, map.data, map.size))
+        modified = TRUE;
+
+      gst_buffer_unmap (buf, &map);
+    } else {
+      if (!buf && h265parse->codec_data_in)
+        buf = gst_buffer_ref (h265parse->codec_data_in);
+      modified = TRUE;
+    }
+  }
+
+  caps = NULL;
+  if (G_UNLIKELY (!sps)) {
+    caps = gst_caps_copy (sink_caps);
+  } else {
+    gint crop_width, crop_height;
+
+    if (sps->conformance_window_flag) {
+      crop_width = sps->crop_rect_width;
+      crop_height = sps->crop_rect_height;
+    } else {
+      crop_width = sps->width;
+      crop_height = sps->height;
+    }
+
+    if (G_UNLIKELY (h265parse->width != crop_width ||
+            h265parse->height != crop_height)) {
+      GST_INFO_OBJECT (h265parse, "resolution changed %dx%d",
+          crop_width, crop_height);
+      h265parse->width = crop_width;
+      h265parse->height = crop_height;
+      modified = TRUE;
+    }
+
+    /* 0/1 is set as the default in the codec parser */
+    if (sps->vui_params.timing_info_present_flag &&
+        !(sps->fps_num == 0 && sps->fps_den == 1)) {
+      if (G_UNLIKELY (h265parse->fps_num != sps->fps_num
+              || h265parse->fps_den != sps->fps_den)) {
+        GST_INFO_OBJECT (h265parse, "framerate changed %d/%d",
+            sps->fps_num, sps->fps_den);
+        h265parse->fps_num = sps->fps_num;
+        h265parse->fps_den = sps->fps_den;
+        modified = TRUE;
+      }
+    }
+
+    if (sps->vui_params.aspect_ratio_info_present_flag) {
+      if (G_UNLIKELY ((h265parse->parsed_par_n != sps->vui_params.par_n)
+              && (h265parse->parsed_par_d != sps->vui_params.par_d))) {
+        h265parse->parsed_par_n = sps->vui_params.par_n;
+        h265parse->parsed_par_d = sps->vui_params.par_d;
+        GST_INFO_OBJECT (h265parse, "pixel aspect ratio has been changed %d/%d",
+            h265parse->parsed_par_n, h265parse->parsed_par_d);
+        modified = TRUE;
+      }
+
+    }
+
+    if (G_UNLIKELY (modified || h265parse->update_caps)) {
+      gint fps_num = h265parse->fps_num;
+      gint fps_den = h265parse->fps_den;
+      gint width, height;
+      GstClockTime latency;
+
+      caps = gst_caps_copy (sink_caps);
+
+      /* sps should give this but upstream overrides */
+      if (s && gst_structure_has_field (s, "width"))
+        gst_structure_get_int (s, "width", &width);
+      else
+        width = h265parse->width;
+
+      if (s && gst_structure_has_field (s, "height"))
+        gst_structure_get_int (s, "height", &height);
+      else
+        height = h265parse->height;
+
+      gst_caps_set_simple (caps, "width", G_TYPE_INT, width,
+          "height", G_TYPE_INT, height, NULL);
+
+      /* upstream overrides */
+      if (s && gst_structure_has_field (s, "framerate"))
+        gst_structure_get_fraction (s, "framerate", &fps_num, &fps_den);
+
+      /* but not necessarily or reliably this */
+      if (fps_num > 0 && fps_den > 0) {
+        GST_INFO_OBJECT (h265parse, "setting framerate in caps");
+        gst_caps_set_simple (caps, "framerate",
+            GST_TYPE_FRACTION, fps_num, fps_den, NULL);
+        gst_base_parse_set_frame_rate (GST_BASE_PARSE (h265parse),
+            fps_num, fps_den, 0, 0);
+        latency = gst_util_uint64_scale (GST_SECOND, fps_den, fps_num);
+        gst_base_parse_set_latency (GST_BASE_PARSE (h265parse), latency,
+            latency);
+      }
+    }
+  }
+
+  if (caps) {
+    gint par_n, par_d;
+
+    gst_caps_set_simple (caps, "parsed", G_TYPE_BOOLEAN, TRUE,
+        "stream-format", G_TYPE_STRING,
+        gst_h265_parse_get_string (h265parse, TRUE, h265parse->format),
+        "alignment", G_TYPE_STRING,
+        gst_h265_parse_get_string (h265parse, FALSE, h265parse->align), NULL);
+
+    gst_h265_parse_get_par (h265parse, &par_n, &par_d);
+    if (par_n != 0 && par_d != 0 &&
+        (!s || !gst_structure_has_field (s, "pixel-aspect-ratio"))) {
+      GST_INFO_OBJECT (h265parse, "PAR %d/%d", par_n, par_d);
+      gst_caps_set_simple (caps, "pixel-aspect-ratio", GST_TYPE_FRACTION,
+          par_n, par_d, NULL);
+    }
+
+    /* set profile and level in caps */
+    if (sps) {
+      const gchar *profile, *tier, *level;
+
+      profile = get_profile_string (sps->profile_tier_level.profile_idc);
+      if (profile != NULL)
+        gst_caps_set_simple (caps, "profile", G_TYPE_STRING, profile, NULL);
+
+      tier = get_tier_string (sps->profile_tier_level.tier_flag);
+      if (tier != NULL)
+        gst_caps_set_simple (caps, "tier", G_TYPE_STRING, tier, NULL);
+
+      level = get_level_string (sps->profile_tier_level.level_idc);
+      if (level != NULL)
+        gst_caps_set_simple (caps, "level", G_TYPE_STRING, level, NULL);
+    }
+
+    src_caps = gst_pad_get_current_caps (GST_BASE_PARSE_SRC_PAD (h265parse));
+
+    if (src_caps
+        && gst_structure_has_field (gst_caps_get_structure (src_caps, 0),
+            "codec_data")) {
+      /* use codec data from old caps for comparison; we don't want to resend caps
+         if everything is same except codec data; */
+      gst_caps_set_value (caps, "codec_data",
+          gst_structure_get_value (gst_caps_get_structure (src_caps, 0),
+              "codec_data"));
+    }
+    if (!(src_caps && gst_caps_is_strictly_equal (src_caps, caps))) {
+      /* update codec data to new value */
+      if (buf) {
+        gst_caps_set_simple (caps, "codec_data", GST_TYPE_BUFFER, buf, NULL);
+        gst_buffer_replace (&h265parse->codec_data, buf);
+        gst_buffer_unref (buf);
+        buf = NULL;
+      } else {
+        GstStructure *s;
+        /* remove any left-over codec-data hanging around */
+        s = gst_caps_get_structure (caps, 0);
+        gst_structure_remove_field (s, "codec_data");
+        gst_buffer_replace (&h265parse->codec_data, NULL);
+      }
+
+      gst_pad_set_caps (GST_BASE_PARSE_SRC_PAD (h265parse), caps);
+    }
+
+    if (src_caps)
+      gst_caps_unref (src_caps);
+    gst_caps_unref (caps);
+  }
+
+  gst_caps_unref (sink_caps);
+  if (buf)
+    gst_buffer_unref (buf);
+
+}
+
+static GstFlowReturn
+gst_h265_parse_parse_frame (GstBaseParse * parse, GstBaseParseFrame * frame)
+{
+  GstH265Parse *h265parse;
+  GstBuffer *buffer;
+  guint av;
+
+  h265parse = GST_H265_PARSE (parse);
+  buffer = frame->buffer;
+
+  gst_h265_parse_update_src_caps (h265parse, NULL);
+
+  /* Fixme: Implement timestamp interpolation based on SEI Messagses */
+  GST_FIXME_OBJECT (h265parse,
+      "Implement timestamp/duration interpolation based on SEI message");
+
+  if (h265parse->keyframe)
+    GST_BUFFER_FLAG_UNSET (buffer, GST_BUFFER_FLAG_DELTA_UNIT);
+  else
+    GST_BUFFER_FLAG_SET (buffer, GST_BUFFER_FLAG_DELTA_UNIT);
+
+  if (h265parse->header)
+    GST_BUFFER_FLAG_SET (buffer, GST_BUFFER_FLAG_HEADER);
+  else
+    GST_BUFFER_FLAG_UNSET (buffer, GST_BUFFER_FLAG_HEADER);
+
+  /* replace with transformed HEVC output if applicable */
+  av = gst_adapter_available (h265parse->frame_out);
+  if (av) {
+    GstBuffer *buf;
+
+    buf = gst_adapter_take_buffer (h265parse->frame_out, av);
+    gst_buffer_copy_into (buf, buffer, GST_BUFFER_COPY_METADATA, 0, -1);
+    gst_buffer_replace (&frame->out_buffer, buf);
+    gst_buffer_unref (buf);
+  }
+
+  return GST_FLOW_OK;
+}
+
+/* sends a codec NAL downstream, decorating and transforming as needed.
+ * No ownership is taken of @nal */
+static GstFlowReturn
+gst_h265_parse_push_codec_buffer (GstH265Parse * h265parse, GstBuffer * nal,
+    GstClockTime ts)
+{
+  GstMapInfo map;
+
+  gst_buffer_map (nal, &map, GST_MAP_READ);
+  nal = gst_h265_parse_wrap_nal (h265parse, h265parse->format,
+      map.data, map.size);
+  gst_buffer_unmap (nal, &map);
+
+  GST_BUFFER_TIMESTAMP (nal) = ts;
+  GST_BUFFER_DURATION (nal) = 0;
+
+  return gst_pad_push (GST_BASE_PARSE_SRC_PAD (h265parse), nal);
+}
+
+static GstEvent *
+check_pending_key_unit_event (GstEvent * pending_event, GstSegment * segment,
+    GstClockTime timestamp, guint flags, GstClockTime pending_key_unit_ts)
+{
+  GstClockTime running_time, stream_time;
+  gboolean all_headers;
+  guint count;
+  GstEvent *event = NULL;
+
+  g_return_val_if_fail (segment != NULL, NULL);
+
+  if (pending_event == NULL)
+    goto out;
+
+  if (GST_CLOCK_TIME_IS_VALID (pending_key_unit_ts) &&
+      timestamp == GST_CLOCK_TIME_NONE)
+    goto out;
+
+  running_time = gst_segment_to_running_time (segment,
+      GST_FORMAT_TIME, timestamp);
+
+  GST_INFO ("now %" GST_TIME_FORMAT " wanted %" GST_TIME_FORMAT,
+      GST_TIME_ARGS (running_time), GST_TIME_ARGS (pending_key_unit_ts));
+  if (GST_CLOCK_TIME_IS_VALID (pending_key_unit_ts) &&
+      running_time < pending_key_unit_ts)
+    goto out;
+
+  if (flags & GST_BUFFER_FLAG_DELTA_UNIT) {
+    GST_DEBUG ("pending force key unit, waiting for keyframe");
+    goto out;
+  }
+
+  stream_time = gst_segment_to_stream_time (segment,
+      GST_FORMAT_TIME, timestamp);
+
+  gst_video_event_parse_upstream_force_key_unit (pending_event,
+      NULL, &all_headers, &count);
+
+  event =
+      gst_video_event_new_downstream_force_key_unit (timestamp, stream_time,
+      running_time, all_headers, count);
+  gst_event_set_seqnum (event, gst_event_get_seqnum (pending_event));
+
+out:
+  return event;
+}
+
+static void
+gst_h265_parse_prepare_key_unit (GstH265Parse * parse, GstEvent * event)
+{
+  GstClockTime running_time;
+  guint count;
+#ifndef GST_DISABLE_GST_DEBUG
+  gboolean have_vps, have_sps, have_pps;
+  gint i;
+#endif
+
+  parse->pending_key_unit_ts = GST_CLOCK_TIME_NONE;
+  gst_event_replace (&parse->force_key_unit_event, NULL);
+
+  gst_video_event_parse_downstream_force_key_unit (event,
+      NULL, NULL, &running_time, NULL, &count);
+
+  GST_INFO_OBJECT (parse, "pushing downstream force-key-unit event %d "
+      "%" GST_TIME_FORMAT " count %d", gst_event_get_seqnum (event),
+      GST_TIME_ARGS (running_time), count);
+  gst_pad_push_event (GST_BASE_PARSE_SRC_PAD (parse), event);
+
+#ifndef GST_DISABLE_GST_DEBUG
+  have_vps = have_sps = have_pps = FALSE;
+  for (i = 0; i < GST_H265_MAX_VPS_COUNT; i++) {
+    if (parse->vps_nals[i] != NULL) {
+      have_vps = TRUE;
+      break;
+    }
+  }
+  for (i = 0; i < GST_H265_MAX_SPS_COUNT; i++) {
+    if (parse->sps_nals[i] != NULL) {
+      have_sps = TRUE;
+      break;
+    }
+  }
+  for (i = 0; i < GST_H265_MAX_PPS_COUNT; i++) {
+    if (parse->pps_nals[i] != NULL) {
+      have_pps = TRUE;
+      break;
+    }
+  }
+
+  GST_INFO_OBJECT (parse,
+      "preparing key unit, have vps %d have sps %d have pps %d", have_vps,
+      have_sps, have_pps);
+#endif
+
+  /* set push_codec to TRUE so that pre_push_frame sends VPS/SPS/PPS again */
+  parse->push_codec = TRUE;
+}
+
+static GstFlowReturn
+gst_h265_parse_pre_push_frame (GstBaseParse * parse, GstBaseParseFrame * frame)
+{
+  GstH265Parse *h265parse;
+  GstBuffer *buffer;
+  GstEvent *event;
+
+  h265parse = GST_H265_PARSE (parse);
+
+  if (!h265parse->sent_codec_tag) {
+    GstTagList *taglist;
+    GstCaps *caps;
+
+    taglist = gst_tag_list_new_empty ();
+
+    /* codec tag */
+    caps = gst_pad_get_current_caps (GST_BASE_PARSE_SRC_PAD (parse));
+    gst_pb_utils_add_codec_description_to_tag_list (taglist,
+        GST_TAG_VIDEO_CODEC, caps);
+    gst_caps_unref (caps);
+
+    gst_pad_push_event (GST_BASE_PARSE_SRC_PAD (h265parse),
+        gst_event_new_tag (taglist));
+
+    /* also signals the end of first-frame processing */
+    h265parse->sent_codec_tag = TRUE;
+  }
+
+  buffer = frame->buffer;
+
+  if ((event = check_pending_key_unit_event (h265parse->force_key_unit_event,
+              &parse->segment, GST_BUFFER_TIMESTAMP (buffer),
+              GST_BUFFER_FLAGS (buffer), h265parse->pending_key_unit_ts))) {
+    gst_h265_parse_prepare_key_unit (h265parse, event);
+  }
+
+  /* periodic VPS/SPS/PPS sending */
+  if (h265parse->interval > 0 || h265parse->push_codec) {
+    GstClockTime timestamp = GST_BUFFER_TIMESTAMP (buffer);
+    guint64 diff;
+
+    /* init */
+    if (!GST_CLOCK_TIME_IS_VALID (h265parse->last_report)) {
+      h265parse->last_report = timestamp;
+    }
+
+    if (h265parse->idr_pos >= 0) {
+      GST_LOG_OBJECT (h265parse, "IDR nal at offset %d", h265parse->idr_pos);
+
+      if (timestamp > h265parse->last_report)
+        diff = timestamp - h265parse->last_report;
+      else
+        diff = 0;
+
+      GST_LOG_OBJECT (h265parse,
+          "now %" GST_TIME_FORMAT ", last VPS/SPS/PPS %" GST_TIME_FORMAT,
+          GST_TIME_ARGS (timestamp), GST_TIME_ARGS (h265parse->last_report));
+
+      GST_DEBUG_OBJECT (h265parse,
+          "interval since last VPS/SPS/PPS %" GST_TIME_FORMAT,
+          GST_TIME_ARGS (diff));
+
+      if (GST_TIME_AS_SECONDS (diff) >= h265parse->interval ||
+          h265parse->push_codec) {
+        GstBuffer *codec_nal;
+        gint i;
+        GstClockTime new_ts;
+
+        /* avoid overwriting a perfectly fine timestamp */
+        new_ts = GST_CLOCK_TIME_IS_VALID (timestamp) ? timestamp :
+            h265parse->last_report;
+
+        if (h265parse->align == GST_H265_PARSE_ALIGN_NAL) {
+          /* send separate config NAL buffers */
+          GST_DEBUG_OBJECT (h265parse, "- sending VPS/SPS/PPS");
+          for (i = 0; i < GST_H265_MAX_VPS_COUNT; i++) {
+            if ((codec_nal = h265parse->vps_nals[i])) {
+              GST_DEBUG_OBJECT (h265parse, "sending VPS nal");
+              gst_h265_parse_push_codec_buffer (h265parse, codec_nal,
+                  timestamp);
+              h265parse->last_report = new_ts;
+            }
+          }
+          for (i = 0; i < GST_H265_MAX_SPS_COUNT; i++) {
+            if ((codec_nal = h265parse->sps_nals[i])) {
+              GST_DEBUG_OBJECT (h265parse, "sending SPS nal");
+              gst_h265_parse_push_codec_buffer (h265parse, codec_nal,
+                  timestamp);
+              h265parse->last_report = new_ts;
+            }
+          }
+          for (i = 0; i < GST_H265_MAX_PPS_COUNT; i++) {
+            if ((codec_nal = h265parse->pps_nals[i])) {
+              GST_DEBUG_OBJECT (h265parse, "sending PPS nal");
+              gst_h265_parse_push_codec_buffer (h265parse, codec_nal,
+                  timestamp);
+              h265parse->last_report = new_ts;
+            }
+          }
+        } else {
+          /* insert config NALs into AU */
+          GstByteWriter bw;
+          GstBuffer *new_buf;
+          const gboolean bs = h265parse->format == GST_H265_PARSE_FORMAT_BYTE;
+          const gint nls = 4 - h265parse->nal_length_size;
+          gboolean ok;
+
+          gst_byte_writer_init_with_size (&bw, gst_buffer_get_size (buffer),
+              FALSE);
+          ok = gst_byte_writer_put_buffer (&bw, buffer, 0, h265parse->idr_pos);
+          GST_DEBUG_OBJECT (h265parse, "- inserting VPS/SPS/PPS");
+          for (i = 0; i < GST_H265_MAX_VPS_COUNT; i++) {
+            if ((codec_nal = h265parse->vps_nals[i])) {
+              gsize nal_size = gst_buffer_get_size (codec_nal);
+              GST_DEBUG_OBJECT (h265parse, "inserting VPS nal");
+              if (bs) {
+                ok &= gst_byte_writer_put_uint32_be (&bw, 1);
+              } else {
+                ok &= gst_byte_writer_put_uint32_be (&bw,
+                    (nal_size << (nls * 8)));
+                ok &= gst_byte_writer_set_pos (&bw,
+                    gst_byte_writer_get_pos (&bw) - nls);
+              }
+
+              ok &= gst_byte_writer_put_buffer (&bw, codec_nal, 0, nal_size);
+              h265parse->last_report = new_ts;
+            }
+          }
+          for (i = 0; i < GST_H265_MAX_SPS_COUNT; i++) {
+            if ((codec_nal = h265parse->sps_nals[i])) {
+              gsize nal_size = gst_buffer_get_size (codec_nal);
+              GST_DEBUG_OBJECT (h265parse, "inserting SPS nal");
+              if (bs) {
+                ok &= gst_byte_writer_put_uint32_be (&bw, 1);
+              } else {
+                ok &= gst_byte_writer_put_uint32_be (&bw,
+                    (nal_size << (nls * 8)));
+                ok &= gst_byte_writer_set_pos (&bw,
+                    gst_byte_writer_get_pos (&bw) - nls);
+              }
+
+              ok &= gst_byte_writer_put_buffer (&bw, codec_nal, 0, nal_size);
+              h265parse->last_report = new_ts;
+            }
+          }
+          for (i = 0; i < GST_H265_MAX_PPS_COUNT; i++) {
+            if ((codec_nal = h265parse->pps_nals[i])) {
+              gsize nal_size = gst_buffer_get_size (codec_nal);
+              GST_DEBUG_OBJECT (h265parse, "inserting PPS nal");
+              if (bs) {
+                ok &= gst_byte_writer_put_uint32_be (&bw, 1);
+              } else {
+                ok &= gst_byte_writer_put_uint32_be (&bw,
+                    (nal_size << (nls * 8)));
+                ok &= gst_byte_writer_set_pos (&bw,
+                    gst_byte_writer_get_pos (&bw) - nls);
+              }
+              ok &= gst_byte_writer_put_buffer (&bw, codec_nal, 0, nal_size);
+              h265parse->last_report = new_ts;
+            }
+          }
+          ok &=
+              gst_byte_writer_put_buffer (&bw, buffer, h265parse->idr_pos, -1);
+          /* collect result and push */
+          new_buf = gst_byte_writer_reset_and_get_buffer (&bw);
+          gst_buffer_copy_into (new_buf, buffer, GST_BUFFER_COPY_METADATA, 0,
+              -1);
+          /* should already be keyframe/IDR, but it may not have been,
+           * so mark it as such to avoid being discarded by picky decoder */
+          GST_BUFFER_FLAG_UNSET (new_buf, GST_BUFFER_FLAG_DELTA_UNIT);
+          gst_buffer_replace (&frame->out_buffer, new_buf);
+          gst_buffer_unref (new_buf);
+          /* some result checking seems to make some compilers happy */
+          if (G_UNLIKELY (!ok)) {
+            GST_ERROR_OBJECT (h265parse, "failed to insert SPS/PPS");
+          }
+        }
+      }
+      /* we pushed whatever we had */
+      h265parse->push_codec = FALSE;
+      h265parse->have_vps = FALSE;
+      h265parse->have_sps = FALSE;
+      h265parse->have_pps = FALSE;
+    }
+  }
+
+  gst_h265_parse_reset_frame (h265parse);
+
+  return GST_FLOW_OK;
+}
+
+static gboolean
+gst_h265_parse_set_caps (GstBaseParse * parse, GstCaps * caps)
+{
+  GstH265Parse *h265parse;
+  GstStructure *str;
+  const GValue *value;
+  GstBuffer *codec_data = NULL;
+  gsize off, size;
+  guint format, align;
+  guint num_nals, i, j;
+  GstH265NalUnit nalu;
+  GstH265ParserResult parseres;
+
+  h265parse = GST_H265_PARSE (parse);
+
+  /* reset */
+  h265parse->push_codec = FALSE;
+
+  str = gst_caps_get_structure (caps, 0);
+
+  /* accept upstream info if provided */
+  gst_structure_get_int (str, "width", &h265parse->width);
+  gst_structure_get_int (str, "height", &h265parse->height);
+  gst_structure_get_fraction (str, "framerate", &h265parse->fps_num,
+      &h265parse->fps_den);
+  gst_structure_get_fraction (str, "pixel-aspect-ratio",
+      &h265parse->upstream_par_n, &h265parse->upstream_par_d);
+
+  /* get upstream format and align from caps */
+  gst_h265_parse_format_from_caps (caps, &format, &align);
+
+  /* packetized video has a codec_data */
+  if (format != GST_H265_PARSE_FORMAT_BYTE &&
+      (value = gst_structure_get_value (str, "codec_data"))) {
+    GstMapInfo map;
+    guint8 *data;
+
+    GST_DEBUG_OBJECT (h265parse, "have packetized h265");
+    /* make note for optional split processing */
+    h265parse->packetized = TRUE;
+
+    codec_data = gst_value_get_buffer (value);
+    if (!codec_data)
+      goto wrong_type;
+    gst_buffer_map (codec_data, &map, GST_MAP_READ);
+    data = map.data;
+    size = map.size;
+
+    /* parse the hvcC data */
+    if (size < 23) {
+      gst_buffer_unmap (codec_data, &map);
+      goto hvcc_too_small;
+    }
+    /* parse the version, this must be one but
+     * is zero until the spec is finalized */
+    if (data[0] != 0 && data[0] != 1) {
+      gst_buffer_unmap (codec_data, &map);
+      goto wrong_version;
+    }
+
+    h265parse->nal_length_size = (data[21] & 0x03) + 1;
+    GST_DEBUG_OBJECT (h265parse, "nal length size %u",
+        h265parse->nal_length_size);
+
+    off = 23;
+    for (i = 0; i < data[22]; i++) {
+      num_nals = GST_READ_UINT16_BE (data + off + 1);
+      for (j = 0; j < num_nals; j++) {
+        parseres = gst_h265_parser_identify_nalu_hevc (h265parse->nalparser,
+            data, off + 3, size, 2, &nalu);
+
+        if (parseres != GST_H265_PARSER_OK) {
+          gst_buffer_unmap (codec_data, &map);
+          goto hvcc_too_small;
+        }
+
+        gst_h265_parse_process_nal (h265parse, &nalu);
+        off = nalu.offset + nalu.size;
+      }
+    }
+
+  } else {
+    GST_DEBUG_OBJECT (h265parse, "have bytestream h265");
+    /* nothing to pre-process */
+    h265parse->packetized = FALSE;
+    /* we have 4 sync bytes */
+    h265parse->nal_length_size = 4;
+
+    if (format == GST_H265_PARSE_FORMAT_NONE) {
+      format = GST_H265_PARSE_FORMAT_BYTE;
+      align = GST_H265_PARSE_ALIGN_AU;
+    }
+  }
+
+  {
+    GstCaps *in_caps;
+
+    /* prefer input type determined above */
+    in_caps = gst_caps_new_simple ("video/x-h265",
+        "parsed", G_TYPE_BOOLEAN, TRUE,
+        "stream-format", G_TYPE_STRING,
+        gst_h265_parse_get_string (h265parse, TRUE, format),
+        "alignment", G_TYPE_STRING,
+        gst_h265_parse_get_string (h265parse, FALSE, align), NULL);
+    /* negotiate with downstream, sets ->format and ->align */
+    gst_h265_parse_negotiate (h265parse, format, in_caps);
+    gst_caps_unref (in_caps);
+  }
+
+  if (format == h265parse->format && align == h265parse->align) {
+    /* do not set CAPS and passthrough mode if VPS/SPS/PPS have not been parsed */
+    if (h265parse->have_vps && h265parse->have_sps && h265parse->have_pps) {
+      gst_base_parse_set_passthrough (parse, TRUE);
+
+      /* we did parse codec-data and might supplement src caps */
+      gst_h265_parse_update_src_caps (h265parse, caps);
+    }
+  } else if (format == GST_H265_PARSE_FORMAT_HVC1
+      || format == GST_H265_PARSE_FORMAT_HEV1) {
+    /* if input != output, and input is hevc, must split before anything else */
+    /* arrange to insert codec-data in-stream if needed.
+     * src caps are only arranged for later on */
+    h265parse->push_codec = TRUE;
+    h265parse->have_vps = FALSE;
+    h265parse->have_sps = FALSE;
+    h265parse->have_pps = FALSE;
+    if (h265parse->align == GST_H265_PARSE_ALIGN_NAL)
+      h265parse->split_packetized = TRUE;
+    h265parse->packetized = TRUE;
+  }
+
+  return TRUE;
+
+  /* ERRORS */
+hvcc_too_small:
+  {
+    GST_DEBUG_OBJECT (h265parse, "hvcC size %" G_GSIZE_FORMAT " < 23", size);
+    goto refuse_caps;
+  }
+wrong_version:
+  {
+    GST_DEBUG_OBJECT (h265parse, "wrong hvcC version");
+    goto refuse_caps;
+  }
+wrong_type:
+  {
+    GST_DEBUG_OBJECT (h265parse, "wrong codec-data type");
+    goto refuse_caps;
+  }
+refuse_caps:
+  {
+    GST_WARNING_OBJECT (h265parse, "refused caps %" GST_PTR_FORMAT, caps);
+    return FALSE;
+  }
+}
+
+static void
+remove_fields (GstCaps * caps)
+{
+  guint i, n;
+
+  n = gst_caps_get_size (caps);
+  for (i = 0; i < n; i++) {
+    GstStructure *s = gst_caps_get_structure (caps, i);
+
+    gst_structure_remove_field (s, "alignment");
+    gst_structure_remove_field (s, "stream-format");
+    gst_structure_remove_field (s, "parsed");
+  }
+}
+
+static GstCaps *
+gst_h265_parse_get_caps (GstBaseParse * parse, GstCaps * filter)
+{
+  GstCaps *peercaps, *templ;
+  GstCaps *res;
+
+  templ = gst_pad_get_pad_template_caps (GST_BASE_PARSE_SINK_PAD (parse));
+  if (filter) {
+    GstCaps *fcopy = gst_caps_copy (filter);
+    /* Remove the fields we convert */
+    remove_fields (fcopy);
+    peercaps = gst_pad_peer_query_caps (GST_BASE_PARSE_SRC_PAD (parse), fcopy);
+    gst_caps_unref (fcopy);
+  } else
+    peercaps = gst_pad_peer_query_caps (GST_BASE_PARSE_SRC_PAD (parse), NULL);
+
+  if (peercaps) {
+    peercaps = gst_caps_make_writable (peercaps);
+    remove_fields (peercaps);
+
+    res = gst_caps_intersect_full (peercaps, templ, GST_CAPS_INTERSECT_FIRST);
+    gst_caps_unref (peercaps);
+    gst_caps_unref (templ);
+  } else {
+    res = templ;
+  }
+
+  if (filter) {
+    GstCaps *tmp = gst_caps_intersect_full (res, filter,
+        GST_CAPS_INTERSECT_FIRST);
+    gst_caps_unref (res);
+    res = tmp;
+  }
+
+  return res;
+}
+
+static gboolean
+gst_h265_parse_event (GstBaseParse * parse, GstEvent * event)
+{
+  gboolean res;
+  GstH265Parse *h265parse = GST_H265_PARSE (parse);
+
+  switch (GST_EVENT_TYPE (event)) {
+    case GST_EVENT_CUSTOM_DOWNSTREAM:
+    {
+      GstClockTime timestamp, stream_time, running_time;
+      gboolean all_headers;
+      guint count;
+
+      if (gst_video_event_is_force_key_unit (event)) {
+        gst_video_event_parse_downstream_force_key_unit (event,
+            &timestamp, &stream_time, &running_time, &all_headers, &count);
+
+        GST_INFO_OBJECT (h265parse, "received downstream force key unit event, "
+            "seqnum %d running_time %" GST_TIME_FORMAT
+            " all_headers %d count %d", gst_event_get_seqnum (event),
+            GST_TIME_ARGS (running_time), all_headers, count);
+        if (h265parse->force_key_unit_event) {
+          GST_INFO_OBJECT (h265parse, "ignoring force key unit event "
+              "as one is already queued");
+        } else {
+          h265parse->pending_key_unit_ts = running_time;
+          gst_event_replace (&h265parse->force_key_unit_event, event);
+        }
+        gst_event_unref (event);
+        res = TRUE;
+      } else {
+        res = GST_BASE_PARSE_CLASS (parent_class)->sink_event (parse, event);
+        break;
+      }
+      break;
+    }
+    case GST_EVENT_FLUSH_STOP:
+
+      res = GST_BASE_PARSE_CLASS (parent_class)->sink_event (parse, event);
+      break;
+    case GST_EVENT_SEGMENT:
+    {
+      res = GST_BASE_PARSE_CLASS (parent_class)->sink_event (parse, event);
+      break;
+    }
+    default:
+      res = GST_BASE_PARSE_CLASS (parent_class)->sink_event (parse, event);
+      break;
+  }
+  return res;
+}
+
+static gboolean
+gst_h265_parse_src_event (GstBaseParse * parse, GstEvent * event)
+{
+  gboolean res;
+  GstH265Parse *h265parse = GST_H265_PARSE (parse);
+
+  switch (GST_EVENT_TYPE (event)) {
+    case GST_EVENT_CUSTOM_UPSTREAM:
+    {
+      GstClockTime running_time;
+      gboolean all_headers;
+      guint count;
+
+      if (gst_video_event_is_force_key_unit (event)) {
+        gst_video_event_parse_upstream_force_key_unit (event,
+            &running_time, &all_headers, &count);
+
+        GST_INFO_OBJECT (h265parse, "received upstream force-key-unit event, "
+            "seqnum %d running_time %" GST_TIME_FORMAT
+            " all_headers %d count %d", gst_event_get_seqnum (event),
+            GST_TIME_ARGS (running_time), all_headers, count);
+
+        if (all_headers) {
+          h265parse->pending_key_unit_ts = running_time;
+          gst_event_replace (&h265parse->force_key_unit_event, event);
+        }
+      }
+      res = GST_BASE_PARSE_CLASS (parent_class)->src_event (parse, event);
+      break;
+    }
+    default:
+      res = GST_BASE_PARSE_CLASS (parent_class)->src_event (parse, event);
+      break;
+  }
+
+  return res;
+}
+
+static void
+gst_h265_parse_set_property (GObject * object, guint prop_id,
+    const GValue * value, GParamSpec * pspec)
+{
+  GstH265Parse *parse;
+  parse = GST_H265_PARSE (object);
+
+  switch (prop_id) {
+    case PROP_CONFIG_INTERVAL:
+      parse->interval = g_value_get_uint (value);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+static void
+gst_h265_parse_get_property (GObject * object, guint prop_id, GValue * value,
+    GParamSpec * pspec)
+{
+  GstH265Parse *parse;
+  parse = GST_H265_PARSE (object);
+
+  switch (prop_id) {
+    case PROP_CONFIG_INTERVAL:
+      g_value_set_uint (value, parse->interval);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
diff -Nru gstreamer-vaapi-0.5.10/ext/codecparsers/gst/videoparsers/gsth265parse.h gstreamer-vaapi-0.6.0/ext/codecparsers/gst/videoparsers/gsth265parse.h
--- gstreamer-vaapi-0.5.10/ext/codecparsers/gst/videoparsers/gsth265parse.h	1970-01-01 00:00:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/ext/codecparsers/gst/videoparsers/gsth265parse.h	2015-07-15 12:50:06.000000000 +0000
@@ -0,0 +1,105 @@
+/* GStreamer H.265 Parser
+ * Copyright (C) 2013 Intel Corporation
+ *   Contact: Sreerenj Balachandran <sreerenj.balachandran@intel.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef __GST_H265_PARSE_H__
+#define __GST_H265_PARSE_H__
+
+#include <gst/gst.h>
+#include <gst/base/gstbaseparse.h>
+#include <gst/codecparsers/gsth265parser.h>
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_H265_PARSE \
+  (gst_h265_parse_get_type())
+#define GST_H265_PARSE(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_H265_PARSE,GstH265Parse))
+#define GST_H265_PARSE_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_H265_PARSE,GstH265ParseClass))
+#define GST_IS_H265_PARSE(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_H265_PARSE))
+#define GST_IS_H265_PARSE_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_H265_PARSE))
+
+GType gst_h265_parse_get_type (void);
+
+typedef struct _GstH265Parse GstH265Parse;
+typedef struct _GstH265ParseClass GstH265ParseClass;
+
+struct _GstH265Parse
+{
+  GstBaseParse baseparse;
+
+  /* stream */
+  gint width, height;
+  gint fps_num, fps_den;
+  gint upstream_par_n, upstream_par_d;
+  gint parsed_par_n, parsed_par_d;
+  /* current codec_data in output caps, if any */
+  GstBuffer *codec_data;
+  /* input codec_data, if any */
+  GstBuffer *codec_data_in;
+  guint nal_length_size;
+  gboolean packetized;
+  gboolean split_packetized;
+  gboolean transform;
+
+  /* state */
+  GstH265Parser *nalparser;
+  guint align;
+  guint format;
+  gint current_off;
+
+  GstClockTime last_report;
+  gboolean push_codec;
+  gboolean have_vps;
+  gboolean have_sps;
+  gboolean have_pps;
+
+  /* collected SPS and PPS NALUs */
+  GstBuffer *vps_nals[GST_H265_MAX_VPS_COUNT];
+  GstBuffer *sps_nals[GST_H265_MAX_SPS_COUNT];
+  GstBuffer *pps_nals[GST_H265_MAX_PPS_COUNT];
+
+  /* frame parsing */
+  gint idr_pos, sei_pos;
+  gboolean update_caps;
+  GstAdapter *frame_out;
+  gboolean keyframe;
+  gboolean header;
+  /* AU state */
+  gboolean picture_start;
+
+  /* props */
+  guint interval;
+
+  gboolean sent_codec_tag;
+
+  GstClockTime pending_key_unit_ts;
+  GstEvent *force_key_unit_event;
+};
+
+struct _GstH265ParseClass
+{
+  GstBaseParseClass parent_class;
+};
+
+G_END_DECLS
+#endif
diff -Nru gstreamer-vaapi-0.5.10/ext/codecparsers/gst-libs/gst/codecparsers/dboolhuff.c gstreamer-vaapi-0.6.0/ext/codecparsers/gst-libs/gst/codecparsers/dboolhuff.c
--- gstreamer-vaapi-0.5.10/ext/codecparsers/gst-libs/gst/codecparsers/dboolhuff.c	2015-02-03 08:38:55.000000000 +0000
+++ gstreamer-vaapi-0.6.0/ext/codecparsers/gst-libs/gst/codecparsers/dboolhuff.c	2015-07-15 12:50:06.000000000 +0000
@@ -11,65 +11,63 @@
 
 #include "dboolhuff.h"
 
-int vp8dx_start_decode(BOOL_DECODER *br,
-                       const unsigned char *source,
-                       unsigned int source_sz,
-                       vp8_decrypt_cb *decrypt_cb,
-                       void *decrypt_state)
+int
+vp8dx_start_decode (BOOL_DECODER * br,
+    const unsigned char *source,
+    unsigned int source_sz, vp8_decrypt_cb * decrypt_cb, void *decrypt_state)
 {
-    br->user_buffer_end = source+source_sz;
-    br->user_buffer     = source;
-    br->value    = 0;
-    br->count    = -8;
-    br->range    = 255;
-    br->decrypt_cb = decrypt_cb;
-    br->decrypt_state = decrypt_state;
+  br->user_buffer_end = source + source_sz;
+  br->user_buffer = source;
+  br->value = 0;
+  br->count = -8;
+  br->range = 255;
+  br->decrypt_cb = decrypt_cb;
+  br->decrypt_state = decrypt_state;
 
-    if (source_sz && !source)
-        return 1;
+  if (source_sz && !source)
+    return 1;
 
-    /* Populate the buffer */
-    vp8dx_bool_decoder_fill(br);
+  /* Populate the buffer */
+  vp8dx_bool_decoder_fill (br);
 
-    return 0;
+  return 0;
 }
 
-void vp8dx_bool_decoder_fill(BOOL_DECODER *br)
+void
+vp8dx_bool_decoder_fill (BOOL_DECODER * br)
 {
-    const unsigned char *bufptr = br->user_buffer;
-    VP8_BD_VALUE value = br->value;
-    int count = br->count;
-    int shift = VP8_BD_VALUE_SIZE - 8 - (count + 8);
-    size_t bytes_left = br->user_buffer_end - bufptr;
-    size_t bits_left = bytes_left * CHAR_BIT;
-    int x = (int)(shift + CHAR_BIT - bits_left);
-    int loop_end = 0;
-    unsigned char decrypted[sizeof(VP8_BD_VALUE) + 1];
-
-    if (br->decrypt_cb) {
-        size_t n = bytes_left > sizeof(decrypted) ? sizeof(decrypted) : bytes_left;
-        br->decrypt_cb(br->decrypt_state, bufptr, decrypted, (int)n);
-        bufptr = decrypted;
+  const unsigned char *bufptr = br->user_buffer;
+  VP8_BD_VALUE value = br->value;
+  int count = br->count;
+  int shift = VP8_BD_VALUE_SIZE - 8 - (count + 8);
+  size_t bytes_left = br->user_buffer_end - bufptr;
+  size_t bits_left = bytes_left * CHAR_BIT;
+  int x = (int) (shift + CHAR_BIT - bits_left);
+  int loop_end = 0;
+  unsigned char decrypted[sizeof (VP8_BD_VALUE) + 1];
+
+  if (br->decrypt_cb) {
+    size_t n =
+        bytes_left > sizeof (decrypted) ? sizeof (decrypted) : bytes_left;
+    br->decrypt_cb (br->decrypt_state, bufptr, decrypted, (int) n);
+    bufptr = decrypted;
+  }
+
+  if (x >= 0) {
+    count += VP8_LOTS_OF_BITS;
+    loop_end = x;
+  }
+
+  if (x < 0 || bits_left) {
+    while (shift >= loop_end) {
+      count += CHAR_BIT;
+      value |= (VP8_BD_VALUE) * bufptr << shift;
+      ++bufptr;
+      ++br->user_buffer;
+      shift -= CHAR_BIT;
     }
+  }
 
-    if(x >= 0)
-    {
-        count += VP8_LOTS_OF_BITS;
-        loop_end = x;
-    }
-
-    if (x < 0 || bits_left)
-    {
-        while(shift >= loop_end)
-        {
-            count += CHAR_BIT;
-            value |= (VP8_BD_VALUE)*bufptr << shift;
-            ++bufptr;
-            ++br->user_buffer;
-            shift -= CHAR_BIT;
-        }
-    }
-
-    br->value = value;
-    br->count = count;
+  br->value = value;
+  br->count = count;
 }
diff -Nru gstreamer-vaapi-0.5.10/ext/codecparsers/gst-libs/gst/codecparsers/gsth264parser.c gstreamer-vaapi-0.6.0/ext/codecparsers/gst-libs/gst/codecparsers/gsth264parser.c
--- gstreamer-vaapi-0.5.10/ext/codecparsers/gst-libs/gst/codecparsers/gsth264parser.c	2015-02-03 08:38:55.000000000 +0000
+++ gstreamer-vaapi-0.6.0/ext/codecparsers/gst-libs/gst/codecparsers/gsth264parser.c	2015-07-15 12:50:06.000000000 +0000
@@ -151,7 +151,7 @@
 } PAR;
 
 /* Table E-1 - Meaning of sample aspect ratio indicator (1..16) */
-static PAR aspect_ratios[17] = {
+static const PAR aspect_ratios[17] = {
   {0, 0},
   {1, 1},
   {12, 11},
@@ -397,7 +397,7 @@
 
   GST_DEBUG ("parsing \"HRD Parameters\"");
 
-  READ_UE_ALLOWED (nr, hrd->cpb_cnt_minus1, 0, 31);
+  READ_UE_MAX (nr, hrd->cpb_cnt_minus1, 31);
   READ_UINT8 (nr, hrd->bit_rate_scale, 4);
   READ_UINT8 (nr, hrd->cpb_size_scale, 4);
 
@@ -473,8 +473,8 @@
 
   READ_UINT8 (nr, vui->chroma_loc_info_present_flag, 1);
   if (vui->chroma_loc_info_present_flag) {
-    READ_UE_ALLOWED (nr, vui->chroma_sample_loc_type_top_field, 0, 5);
-    READ_UE_ALLOWED (nr, vui->chroma_sample_loc_type_bottom_field, 0, 5);
+    READ_UE_MAX (nr, vui->chroma_sample_loc_type_top_field, 5);
+    READ_UE_MAX (nr, vui->chroma_sample_loc_type_bottom_field, 5);
   }
 
   READ_UINT8 (nr, vui->timing_info_present_flag, 1);
@@ -513,9 +513,9 @@
   if (vui->bitstream_restriction_flag) {
     READ_UINT8 (nr, vui->motion_vectors_over_pic_boundaries_flag, 1);
     READ_UE (nr, vui->max_bytes_per_pic_denom);
-    READ_UE_ALLOWED (nr, vui->max_bits_per_mb_denom, 0, 16);
-    READ_UE_ALLOWED (nr, vui->log2_max_mv_length_horizontal, 0, 16);
-    READ_UE_ALLOWED (nr, vui->log2_max_mv_length_vertical, 0, 16);
+    READ_UE_MAX (nr, vui->max_bits_per_mb_denom, 16);
+    READ_UE_MAX (nr, vui->log2_max_mv_length_horizontal, 16);
+    READ_UE_MAX (nr, vui->log2_max_mv_length_vertical, 16);
     READ_UE (nr, vui->num_reorder_frames);
     READ_UE (nr, vui->max_dec_frame_buffering);
   }
@@ -669,7 +669,7 @@
       READ_UE (nr, modification_of_pic_nums_idc);
       if (modification_of_pic_nums_idc == 0 ||
           modification_of_pic_nums_idc == 1) {
-        READ_UE_ALLOWED (nr, entries[i].value.abs_diff_pic_num_minus1, 0,
+        READ_UE_MAX (nr, entries[i].value.abs_diff_pic_num_minus1,
             slice->max_pic_num - 1);
       } else if (modification_of_pic_nums_idc == 2) {
         READ_UE (nr, entries[i].value.long_term_pic_num);
@@ -775,7 +775,7 @@
 
   p = &slice->pred_weight_table;
 
-  READ_UE_ALLOWED (nr, p->luma_log2_weight_denom, 0, 7);
+  READ_UE_MAX (nr, p->luma_log2_weight_denom, 7);
   /* set default values */
   default_luma_weight = 1 << p->luma_log2_weight_denom;
   for (i = 0; i < G_N_ELEMENTS (p->luma_weight_l0); i++)
@@ -788,7 +788,7 @@
   }
 
   if (chroma_array_type != 0) {
-    READ_UE_ALLOWED (nr, p->chroma_log2_weight_denom, 0, 7);
+    READ_UE_MAX (nr, p->chroma_log2_weight_denom, 7);
     /* set default values */
     default_chroma_weight = 1 << p->chroma_log2_weight_denom;
     for (i = 0; i < G_N_ELEMENTS (p->chroma_weight_l0); i++) {
@@ -867,7 +867,7 @@
 
   GST_DEBUG ("parsing \"Buffering period\"");
 
-  READ_UE_ALLOWED (nr, sps_id, 0, GST_H264_MAX_SPS_COUNT - 1);
+  READ_UE_MAX (nr, sps_id, GST_H264_MAX_SPS_COUNT - 1);
   sps = gst_h264_parser_get_sps (nalparser, sps_id);
   if (!sps) {
     GST_WARNING ("couldn't find associated sequence parameter set with id: %d",
@@ -1049,7 +1049,7 @@
     goto error;
   }
 
-  READ_UE_ALLOWED (nr, rp->recovery_frame_cnt, 0, sps->max_frame_num - 1);
+  READ_UE_MAX (nr, rp->recovery_frame_cnt, sps->max_frame_num - 1);
   READ_UINT8 (nr, rp->exact_match_flag, 1);
   READ_UINT8 (nr, rp->broken_link_flag, 1);
   READ_UINT8 (nr, rp->changing_slice_group_idc, 2);
@@ -1123,8 +1123,7 @@
     if (!nal_reader_skip (nr, 8))
       goto error;
 
-    READ_UE_ALLOWED (nr, frame_packing->frame_packing_repetition_period, 0,
-        16384);
+    READ_UE_MAX (nr, frame_packing->frame_packing_repetition_period, 16384);
   }
 
   READ_UINT8 (nr, frame_packing_extension_flag, 1);
@@ -1544,19 +1543,19 @@
 
   READ_UINT8 (nr, sps->level_idc, 8);
 
-  READ_UE_ALLOWED (nr, sps->id, 0, GST_H264_MAX_SPS_COUNT - 1);
+  READ_UE_MAX (nr, sps->id, GST_H264_MAX_SPS_COUNT - 1);
 
   if (sps->profile_idc == 100 || sps->profile_idc == 110 ||
       sps->profile_idc == 122 || sps->profile_idc == 244 ||
       sps->profile_idc == 44 || sps->profile_idc == 83 ||
       sps->profile_idc == 86 || sps->profile_idc == 118 ||
       sps->profile_idc == 128) {
-    READ_UE_ALLOWED (nr, sps->chroma_format_idc, 0, 3);
+    READ_UE_MAX (nr, sps->chroma_format_idc, 3);
     if (sps->chroma_format_idc == 3)
       READ_UINT8 (nr, sps->separate_colour_plane_flag, 1);
 
-    READ_UE_ALLOWED (nr, sps->bit_depth_luma_minus8, 0, 6);
-    READ_UE_ALLOWED (nr, sps->bit_depth_chroma_minus8, 0, 6);
+    READ_UE_MAX (nr, sps->bit_depth_luma_minus8, 6);
+    READ_UE_MAX (nr, sps->bit_depth_chroma_minus8, 6);
     READ_UINT8 (nr, sps->qpprime_y_zero_transform_bypass_flag, 1);
 
     READ_UINT8 (nr, sps->scaling_matrix_present_flag, 1);
@@ -1572,20 +1571,20 @@
     }
   }
 
-  READ_UE_ALLOWED (nr, sps->log2_max_frame_num_minus4, 0, 12);
+  READ_UE_MAX (nr, sps->log2_max_frame_num_minus4, 12);
 
   sps->max_frame_num = 1 << (sps->log2_max_frame_num_minus4 + 4);
 
-  READ_UE_ALLOWED (nr, sps->pic_order_cnt_type, 0, 2);
+  READ_UE_MAX (nr, sps->pic_order_cnt_type, 2);
   if (sps->pic_order_cnt_type == 0) {
-    READ_UE_ALLOWED (nr, sps->log2_max_pic_order_cnt_lsb_minus4, 0, 12);
+    READ_UE_MAX (nr, sps->log2_max_pic_order_cnt_lsb_minus4, 12);
   } else if (sps->pic_order_cnt_type == 1) {
     guint i;
 
     READ_UINT8 (nr, sps->delta_pic_order_always_zero_flag, 1);
     READ_SE (nr, sps->offset_for_non_ref_pic);
     READ_SE (nr, sps->offset_for_top_to_bottom_field);
-    READ_UE_ALLOWED (nr, sps->num_ref_frames_in_pic_order_cnt_cycle, 0, 255);
+    READ_UE_MAX (nr, sps->num_ref_frames_in_pic_order_cnt_cycle, 255);
 
     for (i = 0; i < sps->num_ref_frames_in_pic_order_cnt_cycle; i++)
       READ_SE (nr, sps->offset_for_ref_frame[i]);
@@ -1695,48 +1694,44 @@
 
   sps->extension_type = GST_H264_NAL_EXTENSION_MVC;
 
-  READ_UE_ALLOWED (nr, mvc->num_views_minus1, 0, GST_H264_MAX_VIEW_COUNT - 1);
+  READ_UE_MAX (nr, mvc->num_views_minus1, GST_H264_MAX_VIEW_COUNT - 1);
 
   mvc->view = g_new0 (GstH264SPSExtMVCView, mvc->num_views_minus1 + 1);
   if (!mvc->view)
     goto error_allocation_failed;
 
   for (i = 0; i <= mvc->num_views_minus1; i++)
-    READ_UE_ALLOWED (nr, mvc->view[i].view_id, 0, GST_H264_MAX_VIEW_ID);
+    READ_UE_MAX (nr, mvc->view[i].view_id, GST_H264_MAX_VIEW_ID);
 
   for (i = 1; i <= mvc->num_views_minus1; i++) {
     /* for RefPicList0 */
-    READ_UE_ALLOWED (nr, mvc->view[i].num_anchor_refs_l0, 0, 15);
+    READ_UE_MAX (nr, mvc->view[i].num_anchor_refs_l0, 15);
     for (j = 0; j < mvc->view[i].num_anchor_refs_l0; j++) {
-      READ_UE_ALLOWED (nr, mvc->view[i].anchor_ref_l0[j], 0,
-          GST_H264_MAX_VIEW_ID);
+      READ_UE_MAX (nr, mvc->view[i].anchor_ref_l0[j], GST_H264_MAX_VIEW_ID);
     }
 
     /* for RefPicList1 */
-    READ_UE_ALLOWED (nr, mvc->view[i].num_anchor_refs_l1, 0, 15);
+    READ_UE_MAX (nr, mvc->view[i].num_anchor_refs_l1, 15);
     for (j = 0; j < mvc->view[i].num_anchor_refs_l1; j++) {
-      READ_UE_ALLOWED (nr, mvc->view[i].anchor_ref_l1[j], 0,
-          GST_H264_MAX_VIEW_ID);
+      READ_UE_MAX (nr, mvc->view[i].anchor_ref_l1[j], GST_H264_MAX_VIEW_ID);
     }
   }
 
   for (i = 1; i <= mvc->num_views_minus1; i++) {
     /* for RefPicList0 */
-    READ_UE_ALLOWED (nr, mvc->view[i].num_non_anchor_refs_l0, 0, 15);
+    READ_UE_MAX (nr, mvc->view[i].num_non_anchor_refs_l0, 15);
     for (j = 0; j < mvc->view[i].num_non_anchor_refs_l0; j++) {
-      READ_UE_ALLOWED (nr, mvc->view[i].non_anchor_ref_l0[j], 0,
-          GST_H264_MAX_VIEW_ID);
+      READ_UE_MAX (nr, mvc->view[i].non_anchor_ref_l0[j], GST_H264_MAX_VIEW_ID);
     }
 
     /* for RefPicList1 */
-    READ_UE_ALLOWED (nr, mvc->view[i].num_non_anchor_refs_l1, 0, 15);
+    READ_UE_MAX (nr, mvc->view[i].num_non_anchor_refs_l1, 15);
     for (j = 0; j < mvc->view[i].num_non_anchor_refs_l1; j++) {
-      READ_UE_ALLOWED (nr, mvc->view[i].non_anchor_ref_l1[j], 0,
-          GST_H264_MAX_VIEW_ID);
+      READ_UE_MAX (nr, mvc->view[i].non_anchor_ref_l1[j], GST_H264_MAX_VIEW_ID);
     }
   }
 
-  READ_UE_ALLOWED (nr, mvc->num_level_values_signalled_minus1, 0, 63);
+  READ_UE_MAX (nr, mvc->num_level_values_signalled_minus1, 63);
 
   mvc->level_value =
       g_new0 (GstH264SPSExtMVCLevelValue,
@@ -1749,7 +1744,7 @@
 
     READ_UINT8 (nr, level_value->level_idc, 8);
 
-    READ_UE_ALLOWED (nr, level_value->num_applicable_ops_minus1, 0, 1023);
+    READ_UE_MAX (nr, level_value->num_applicable_ops_minus1, 1023);
     level_value->applicable_op =
         g_new0 (GstH264SPSExtMVCLevelValueOp,
         level_value->num_applicable_ops_minus1 + 1);
@@ -1761,14 +1756,14 @@
 
       READ_UINT8 (nr, op->temporal_id, 3);
 
-      READ_UE_ALLOWED (nr, op->num_target_views_minus1, 0, 1023);
+      READ_UE_MAX (nr, op->num_target_views_minus1, 1023);
       op->target_view_id = g_new (guint16, op->num_target_views_minus1 + 1);
       if (!op->target_view_id)
         goto error_allocation_failed;
 
       for (k = 0; k <= op->num_target_views_minus1; k++)
-        READ_UE_ALLOWED (nr, op->target_view_id[k], 0, GST_H264_MAX_VIEW_ID);
-      READ_UE_ALLOWED (nr, op->num_views_minus1, 0, 1023);
+        READ_UE_MAX (nr, op->target_view_id[k], GST_H264_MAX_VIEW_ID);
+      READ_UE_MAX (nr, op->num_views_minus1, 1023);
     }
   }
   return TRUE;
@@ -1938,8 +1933,8 @@
   nal_reader_init (&nr, nalu->data + nalu->offset + nalu->header_bytes,
       nalu->size - nalu->header_bytes);
 
-  READ_UE_ALLOWED (&nr, pps->id, 0, GST_H264_MAX_PPS_COUNT - 1);
-  READ_UE_ALLOWED (&nr, sps_id, 0, GST_H264_MAX_SPS_COUNT - 1);
+  READ_UE_MAX (&nr, pps->id, GST_H264_MAX_PPS_COUNT - 1);
+  READ_UE_MAX (&nr, sps_id, GST_H264_MAX_SPS_COUNT - 1);
 
   sps = gst_h264_parser_get_sps (nalparser, sps_id);
   if (!sps) {
@@ -1960,9 +1955,9 @@
 
   READ_UINT8 (&nr, pps->entropy_coding_mode_flag, 1);
   READ_UINT8 (&nr, pps->pic_order_present_flag, 1);
-  READ_UE_ALLOWED (&nr, pps->num_slice_groups_minus1, 0, 7);
+  READ_UE_MAX (&nr, pps->num_slice_groups_minus1, 7);
   if (pps->num_slice_groups_minus1 > 0) {
-    READ_UE_ALLOWED (&nr, pps->slice_group_map_type, 0, 6);
+    READ_UE_MAX (&nr, pps->slice_group_map_type, 6);
 
     if (pps->slice_group_map_type == 0) {
       gint i;
@@ -1993,8 +1988,8 @@
     }
   }
 
-  READ_UE_ALLOWED (&nr, pps->num_ref_idx_l0_active_minus1, 0, 31);
-  READ_UE_ALLOWED (&nr, pps->num_ref_idx_l1_active_minus1, 0, 31);
+  READ_UE_MAX (&nr, pps->num_ref_idx_l0_active_minus1, 31);
+  READ_UE_MAX (&nr, pps->num_ref_idx_l1_active_minus1, 31);
   READ_UINT8 (&nr, pps->weighted_pred_flag, 1);
   READ_UINT8 (&nr, pps->weighted_bipred_idc, 2);
   READ_SE_ALLOWED (&nr, pps->pic_init_qp_minus26, -(26 + qp_bd_offset), 25);
@@ -2129,7 +2124,7 @@
 
   GST_DEBUG ("parsing \"Slice header\", slice type %u", slice->type);
 
-  READ_UE_ALLOWED (&nr, pps_id, 0, GST_H264_MAX_PPS_COUNT - 1);
+  READ_UE_MAX (&nr, pps_id, GST_H264_MAX_PPS_COUNT - 1);
   pps = gst_h264_parser_get_pps (nalparser, pps_id);
 
   if (!pps) {
@@ -2185,7 +2180,7 @@
     slice->max_pic_num = sps->max_frame_num;
 
   if (nalu->idr_pic_flag)
-    READ_UE_ALLOWED (&nr, slice->idr_pic_id, 0, G_MAXUINT16);
+    READ_UE_MAX (&nr, slice->idr_pic_id, G_MAXUINT16);
 
   if (sps->pic_order_cnt_type == 0) {
     READ_UINT16 (&nr, slice->pic_order_cnt_lsb,
@@ -2202,7 +2197,7 @@
   }
 
   if (pps->redundant_pic_cnt_present_flag)
-    READ_UE_ALLOWED (&nr, slice->redundant_pic_cnt, 0, G_MAXINT8);
+    READ_UE_MAX (&nr, slice->redundant_pic_cnt, G_MAXINT8);
 
   if (GST_H264_IS_B_SLICE (slice))
     READ_UINT8 (&nr, slice->direct_spatial_mv_pred_flag, 1);
@@ -2213,10 +2208,10 @@
 
     READ_UINT8 (&nr, num_ref_idx_active_override_flag, 1);
     if (num_ref_idx_active_override_flag) {
-      READ_UE_ALLOWED (&nr, slice->num_ref_idx_l0_active_minus1, 0, 31);
+      READ_UE_MAX (&nr, slice->num_ref_idx_l0_active_minus1, 31);
 
       if (GST_H264_IS_B_SLICE (slice))
-        READ_UE_ALLOWED (&nr, slice->num_ref_idx_l1_active_minus1, 0, 31);
+        READ_UE_MAX (&nr, slice->num_ref_idx_l1_active_minus1, 31);
     }
   }
 
@@ -2239,7 +2234,7 @@
 
   if (pps->entropy_coding_mode_flag && !GST_H264_IS_I_SLICE (slice) &&
       !GST_H264_IS_SI_SLICE (slice))
-    READ_UE_ALLOWED (&nr, slice->cabac_init_idc, 0, 2);
+    READ_UE_MAX (&nr, slice->cabac_init_idc, 2);
 
   READ_SE_ALLOWED (&nr, slice->slice_qp_delta, -87, 77);
 
@@ -2252,7 +2247,7 @@
   }
 
   if (pps->deblocking_filter_control_present_flag) {
-    READ_UE_ALLOWED (&nr, slice->disable_deblocking_filter_idc, 0, 2);
+    READ_UE_MAX (&nr, slice->disable_deblocking_filter_idc, 2);
     if (slice->disable_deblocking_filter_idc != 1) {
       READ_SE_ALLOWED (&nr, slice->slice_alpha_c0_offset_div2, -6, 6);
       READ_SE_ALLOWED (&nr, slice->slice_beta_offset_div2, -6, 6);
diff -Nru gstreamer-vaapi-0.5.10/ext/codecparsers/gst-libs/gst/codecparsers/gsth265parser.c gstreamer-vaapi-0.6.0/ext/codecparsers/gst-libs/gst/codecparsers/gsth265parser.c
--- gstreamer-vaapi-0.5.10/ext/codecparsers/gst-libs/gst/codecparsers/gsth265parser.c	1970-01-01 00:00:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/ext/codecparsers/gst-libs/gst/codecparsers/gsth265parser.c	2015-07-15 12:50:06.000000000 +0000
@@ -0,0 +1,2594 @@
+/* Gstreamer H.265 bitstream parser
+ * Copyright (C) 2012 Intel Corporation
+ * Copyright (C) 2013 Sreerenj Balachandran <sreerenj.balachandran@intel.com>
+ *
+ *  Contact: Sreerenj Balachandran <sreerenj.balachandran@intel.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+/**
+ * SECTION:gsth265parser
+ * @short_description: Convenience library for h265 video bitstream parsing.
+ *
+ * It offers you bitstream parsing in HEVC mode and non-HEVC mode. To identify
+ * Nals in a bitstream and parse its headers, you should call:
+ * <itemizedlist>
+ *   <listitem>
+ *      gst_h265_parser_identify_nalu() to identify the following nalu in
+ *        non-HEVC bitstreams
+ *   </listitem>
+ *   <listitem>
+ *      gst_h265_parser_identify_nalu_hevc() to identify the nalu in
+ *        HEVC bitstreams
+ *   </listitem>
+ * </itemizedlist>
+ *
+ * Then, depending on the #GstH265NalUnitType of the newly parsed #GstH265NalUnit,
+ * you should call the differents functions to parse the structure:
+ * <itemizedlist>
+ *   <listitem>
+ *      From #GST_H265_NAL_SLICE_TRAIL_N to #GST_H265_NAL_SLICE_CRA_NUT: gst_h265_parser_parse_slice_hdr()
+ *   </listitem>
+ *   <listitem>
+ *      #GST_H265_NAL_SEI: gst_h265_parser_parse_sei()
+ *   </listitem>
+ *   <listitem>
+ *      #GST_H265_NAL_VPS: gst_h265_parser_parse_vps()
+ *   </listitem>
+ *   <listitem>
+ *      #GST_H265_NAL_SPS: gst_h265_parser_parse_sps()
+ *   </listitem>
+ *   <listitem>
+ *      #GST_H265_NAL_PPS: #gst_h265_parser_parse_pps()
+ *   </listitem>
+ *   <listitem>
+ *      Any other: gst_h265_parser_parse_nal()
+ *   </listitem>
+ * </itemizedlist>
+ *
+ * Note: You should always call gst_h265_parser_parse_nal() if you don't
+ * actually need #GstH265NalUnitType to be parsed for your personal use, in
+ * order to guarantee that the #GstH265Parser is always up to date.
+ *
+ * For more details about the structures, look at the ITU-T H.265
+ * specifications, you can download them from:
+ *
+ * <itemizedlist>
+ *   <listitem>
+ *     ITU-T H.265: http://www.itu.int/rec/T-REC-H.265
+ *   </listitem>
+ * </itemizedlist>
+ */
+
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
+#include "nalutils.h"
+#include "gsth265parser.h"
+
+#include <gst/base/gstbytereader.h>
+#include <gst/base/gstbitreader.h>
+#include <string.h>
+#include <math.h>
+
+GST_DEBUG_CATEGORY (h265_parser_debug);
+#define GST_CAT_DEFAULT h265_parser_debug
+
+static gboolean initialized = FALSE;
+#define INITIALIZE_DEBUG_CATEGORY \
+  if (!initialized) { \
+    GST_DEBUG_CATEGORY_INIT (h265_parser_debug, "codecparsers_h265", 0, \
+        "h265 parser library"); \
+    initialized = TRUE; \
+  }
+
+/**** Default scaling_lists according to Table 7-5 and 7-6 *****/
+
+/* Table 7-5 */
+static const guint8 default_scaling_list0[16] = {
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+  16, 16, 16, 16
+};
+
+/*  Combined the values in Table  7-6 to make the calculation easier
+ *  Default scaling list of 8x8 and 16x16 matrices for matrixId = 0, 1 and 2
+ *  Default scaling list of 32x32 matrix for matrixId = 0
+ */
+static const guint8 default_scaling_list1[64] = {
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 17, 16,
+  17, 16, 17, 18, 17, 18, 18, 17, 18, 21, 19, 20,
+  21, 20, 19, 21, 24, 22, 22, 24, 24, 22, 22, 24,
+  25, 25, 27, 30, 27, 25, 25, 29, 31, 35, 35, 31,
+  29, 36, 41, 44, 41, 36, 47, 54, 54, 47, 65, 70,
+  65, 88, 88, 115
+};
+
+/*  Combined the values in Table 7-6 to make the calculation easier
+ *  Default scaling list of 8x8 and 16x16 matrices for matrixId = 3, 4 and 5
+ *  Default scaling list of 32x32 matrix for matrixId = 1
+ */
+static const guint8 default_scaling_list2[64] = {
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 17,
+  17, 17, 17, 17, 18, 18, 18, 18, 18, 20, 20, 20,
+  20, 20, 20, 20, 24, 24, 24, 24, 24, 24, 24, 24,
+  25, 25, 25, 25, 25, 25, 25, 28, 28, 28, 28, 28,
+  28, 33, 33, 33, 33, 33, 41, 41, 41, 41, 54, 54,
+  54, 71, 71, 91
+};
+
+static const guint8 zigzag_4x4[16] = {
+  0, 1, 4, 8,
+  5, 2, 3, 6,
+  9, 12, 13, 10,
+  7, 11, 14, 15,
+};
+
+static const guint8 zigzag_8x8[64] = {
+  0, 1, 8, 16, 9, 2, 3, 10,
+  17, 24, 32, 25, 18, 11, 4, 5,
+  12, 19, 26, 33, 40, 48, 41, 34,
+  27, 20, 13, 6, 7, 14, 21, 28,
+  35, 42, 49, 56, 57, 50, 43, 36,
+  29, 22, 15, 23, 30, 37, 44, 51,
+  58, 59, 52, 45, 38, 31, 39, 46,
+  53, 60, 61, 54, 47, 55, 62, 63
+};
+
+typedef struct
+{
+  guint par_n, par_d;
+} PAR;
+
+/* Table E-1 - Meaning of sample aspect ratio indicator (1..16) */
+static const PAR aspect_ratios[17] = {
+  {0, 0},
+  {1, 1},
+  {12, 11},
+  {10, 11},
+  {16, 11},
+  {40, 33},
+  {24, 11},
+  {20, 11},
+  {32, 11},
+  {80, 33},
+  {18, 11},
+  {15, 11},
+  {64, 33},
+  {160, 99},
+  {4, 3},
+  {3, 2},
+  {2, 1}
+};
+
+/*****  Utils ****/
+#define EXTENDED_SAR 255
+
+static GstH265VPS *
+gst_h265_parser_get_vps (GstH265Parser * parser, guint8 vps_id)
+{
+  GstH265VPS *vps;
+
+  vps = &parser->vps[vps_id];
+
+  if (vps->valid)
+    return vps;
+
+  return NULL;
+}
+
+static GstH265SPS *
+gst_h265_parser_get_sps (GstH265Parser * parser, guint8 sps_id)
+{
+  GstH265SPS *sps;
+
+  sps = &parser->sps[sps_id];
+
+  if (sps->valid)
+    return sps;
+
+  return NULL;
+}
+
+static GstH265PPS *
+gst_h265_parser_get_pps (GstH265Parser * parser, guint8 pps_id)
+{
+  GstH265PPS *pps;
+
+  pps = &parser->pps[pps_id];
+
+  if (pps->valid)
+    return pps;
+
+  return NULL;
+}
+
+static gboolean
+gst_h265_parse_nalu_header (GstH265NalUnit * nalu)
+{
+  guint8 *data = nalu->data + nalu->offset;
+  GstBitReader br;
+
+  if (nalu->size < 2)
+    return FALSE;
+
+  gst_bit_reader_init (&br, data, nalu->size - nalu->offset);
+
+  /* skip the forbidden_zero_bit */
+  gst_bit_reader_skip_unchecked (&br, 1);
+
+  nalu->type = gst_bit_reader_get_bits_uint8_unchecked (&br, 6);
+  nalu->layer_id = gst_bit_reader_get_bits_uint8_unchecked (&br, 6);
+  nalu->temporal_id_plus1 = gst_bit_reader_get_bits_uint8_unchecked (&br, 3);
+  nalu->header_bytes = 2;
+
+  return TRUE;
+}
+
+/****** Parsing functions *****/
+
+static gboolean
+gst_h265_parse_profile_tier_level (GstH265ProfileTierLevel * ptl,
+    NalReader * nr, guint8 maxNumSubLayersMinus1)
+{
+  guint i, j;
+  GST_DEBUG ("parsing \"ProfileTierLevel parameters\"");
+
+  /* set default values for fields that might not be present in the
+   * bitstream and have valid defaults */
+  for (i = 0; i < maxNumSubLayersMinus1; i++)
+    ptl->sub_layer_tier_flag[i] = 0;
+
+  READ_UINT8 (nr, ptl->profile_space, 2);
+  READ_UINT8 (nr, ptl->tier_flag, 1);
+  READ_UINT8 (nr, ptl->profile_idc, 5);
+
+  for (j = 0; j < 32; j++)
+    READ_UINT8 (nr, ptl->profile_compatibility_flag[j], 1);
+
+  READ_UINT8 (nr, ptl->progressive_source_flag, 1);
+  READ_UINT8 (nr, ptl->interlaced_source_flag, 1);
+  READ_UINT8 (nr, ptl->non_packed_constraint_flag, 1);
+  READ_UINT8 (nr, ptl->frame_only_constraint_flag, 1);
+
+  /* skip the reserved zero bits */
+  if (!nal_reader_skip (nr, 44))
+    goto error;
+
+  READ_UINT8 (nr, ptl->level_idc, 8);
+  for (j = 0; j < maxNumSubLayersMinus1; j++) {
+    READ_UINT8 (nr, ptl->sub_layer_profile_present_flag[j], 1);
+    READ_UINT8 (nr, ptl->sub_layer_level_present_flag[j], 1);
+  }
+
+  if (maxNumSubLayersMinus1 > 0) {
+    for (i = maxNumSubLayersMinus1; i < 8; i++)
+      if (!nal_reader_skip (nr, 2))
+        goto error;
+  }
+
+  for (i = 0; i < maxNumSubLayersMinus1; i++) {
+    if (ptl->sub_layer_profile_present_flag[i]) {
+      READ_UINT8 (nr, ptl->sub_layer_profile_space[i], 2);
+      READ_UINT8 (nr, ptl->sub_layer_tier_flag[i], 1);
+      READ_UINT8 (nr, ptl->sub_layer_profile_idc[i], 5);
+
+      for (j = 0; j < 32; j++)
+        READ_UINT8 (nr, ptl->sub_layer_profile_compatibility_flag[i][j], 1);
+
+      READ_UINT8 (nr, ptl->sub_layer_progressive_source_flag[i], 1);
+      READ_UINT8 (nr, ptl->sub_layer_interlaced_source_flag[i], 1);
+      READ_UINT8 (nr, ptl->sub_layer_non_packed_constraint_flag[i], 1);
+      READ_UINT8 (nr, ptl->sub_layer_frame_only_constraint_flag[i], 1);
+
+      if (!nal_reader_skip (nr, 44))
+        goto error;
+    }
+
+    if (ptl->sub_layer_level_present_flag[i])
+      READ_UINT8 (nr, ptl->sub_layer_level_idc[i], 8);
+  }
+
+  return TRUE;
+
+error:
+  GST_WARNING ("error parsing \"ProfileTierLevel Parameters\"");
+  return FALSE;
+}
+
+static gboolean
+gst_h265_parse_sub_layer_hrd_parameters (GstH265SubLayerHRDParams * sub_hrd,
+    NalReader * nr, guint8 CpbCnt, guint8 sub_pic_hrd_params_present_flag)
+{
+  guint i;
+
+  GST_DEBUG ("parsing \"SubLayer HRD Parameters\"");
+
+  /* set default values for fields that might not be present in the bitstream
+     and have valid defaults */
+  for (i = 0; i <= CpbCnt; i++)
+    sub_hrd->cbr_flag[i] = 0;
+
+  for (i = 0; i <= CpbCnt; i++) {
+    READ_UE_MAX (nr, sub_hrd->bit_rate_value_minus1[i], G_MAXUINT32 - 1);
+    READ_UE_MAX (nr, sub_hrd->cpb_size_value_minus1[i], G_MAXUINT32 - 1);
+
+    if (sub_pic_hrd_params_present_flag) {
+      READ_UE_MAX (nr, sub_hrd->cpb_size_du_value_minus1[i], G_MAXUINT32 - 1);
+      READ_UE_MAX (nr, sub_hrd->bit_rate_du_value_minus1[i], G_MAXUINT32 - 1);
+    }
+
+    READ_UINT8 (nr, sub_hrd->cbr_flag[i], 1);
+  }
+
+  return TRUE;
+
+error:
+  GST_WARNING ("error parsing \"SubLayerHRD Parameters \"");
+  return FALSE;
+}
+
+static gboolean
+gst_h265_parse_hrd_parameters (GstH265HRDParams * hrd, NalReader * nr,
+    guint8 commonInfPresentFlag, guint8 maxNumSubLayersMinus1)
+{
+  guint i;
+
+  GST_DEBUG ("parsing \"HRD Parameters\"");
+
+  /* set default values for fields that might not be present in the bitstream
+     and have valid defaults */
+  hrd->sub_pic_hrd_params_present_flag = 0;
+  hrd->sub_pic_cpb_params_in_pic_timing_sei_flag = 0;
+  hrd->initial_cpb_removal_delay_length_minus1 = 23;
+  hrd->au_cpb_removal_delay_length_minus1 = 23;
+  hrd->dpb_output_delay_length_minus1 = 23;
+  for (i = 0; i <= maxNumSubLayersMinus1; i++) {
+    hrd->fixed_pic_rate_general_flag[i] = 0;
+    hrd->low_delay_hrd_flag[i] = 0;
+    hrd->cpb_cnt_minus1[i] = 0;
+  }
+
+  if (commonInfPresentFlag) {
+    READ_UINT8 (nr, hrd->nal_hrd_parameters_present_flag, 1);
+    READ_UINT8 (nr, hrd->vcl_hrd_parameters_present_flag, 1);
+
+    if (hrd->nal_hrd_parameters_present_flag
+        || hrd->vcl_hrd_parameters_present_flag) {
+
+      READ_UINT8 (nr, hrd->sub_pic_hrd_params_present_flag, 1);
+
+      if (hrd->sub_pic_hrd_params_present_flag) {
+        READ_UINT8 (nr, hrd->tick_divisor_minus2, 8);
+        READ_UINT8 (nr, hrd->du_cpb_removal_delay_increment_length_minus1, 5);
+        READ_UINT8 (nr, hrd->sub_pic_cpb_params_in_pic_timing_sei_flag, 1);
+        READ_UINT8 (nr, hrd->dpb_output_delay_du_length_minus1, 5);
+      }
+
+      READ_UINT8 (nr, hrd->bit_rate_scale, 4);
+      READ_UINT8 (nr, hrd->cpb_size_scale, 4);
+
+      if (hrd->sub_pic_hrd_params_present_flag)
+        READ_UINT8 (nr, hrd->cpb_size_du_scale, 4);
+
+      READ_UINT8 (nr, hrd->initial_cpb_removal_delay_length_minus1, 5);
+      READ_UINT8 (nr, hrd->au_cpb_removal_delay_length_minus1, 5);
+      READ_UINT8 (nr, hrd->dpb_output_delay_length_minus1, 5);
+    }
+  }
+
+  for (i = 0; i <= maxNumSubLayersMinus1; i++) {
+    READ_UINT8 (nr, hrd->fixed_pic_rate_general_flag[i], 1);
+
+    if (!hrd->fixed_pic_rate_general_flag[i]) {
+      READ_UINT8 (nr, hrd->fixed_pic_rate_within_cvs_flag[i], 1);
+    } else
+      hrd->fixed_pic_rate_within_cvs_flag[i] = 1;
+
+    if (hrd->fixed_pic_rate_within_cvs_flag[i]) {
+      READ_UE_MAX (nr, hrd->elemental_duration_in_tc_minus1[i], 2047);
+    } else
+      READ_UINT8 (nr, hrd->low_delay_hrd_flag[i], 1);
+
+    if (!hrd->low_delay_hrd_flag[i])
+      READ_UE_MAX (nr, hrd->cpb_cnt_minus1[i], 31);
+
+    if (hrd->nal_hrd_parameters_present_flag)
+      if (!gst_h265_parse_sub_layer_hrd_parameters (&hrd->sublayer_hrd_params
+              [i], nr, hrd->cpb_cnt_minus1[i],
+              hrd->sub_pic_hrd_params_present_flag))
+        goto error;
+
+    if (hrd->vcl_hrd_parameters_present_flag)
+      if (!gst_h265_parse_sub_layer_hrd_parameters (&hrd->sublayer_hrd_params
+              [i], nr, hrd->cpb_cnt_minus1[i],
+              hrd->sub_pic_hrd_params_present_flag))
+        goto error;
+  }
+
+  return TRUE;
+
+error:
+  GST_WARNING ("error parsing \"HRD Parameters\"");
+  return FALSE;
+}
+
+static gboolean
+gst_h265_parse_vui_parameters (GstH265SPS * sps, NalReader * nr)
+{
+  GstH265VUIParams *vui = &sps->vui_params;
+
+  GST_DEBUG ("parsing \"VUI Parameters\"");
+
+  /* set default values for fields that might not be present in the bitstream
+     and have valid defaults */
+  vui->aspect_ratio_idc = 0;
+  vui->video_format = 5;
+  vui->video_full_range_flag = 0;
+  vui->colour_primaries = 2;
+  vui->transfer_characteristics = 2;
+  vui->matrix_coefficients = 2;
+  vui->chroma_sample_loc_type_top_field = 0;
+  vui->chroma_sample_loc_type_bottom_field = 0;
+  vui->neutral_chroma_indication_flag = 0;
+  vui->field_seq_flag = 0;
+  vui->def_disp_win_left_offset = 0;
+  vui->def_disp_win_right_offset = 0;
+  vui->def_disp_win_top_offset = 0;
+  vui->def_disp_win_bottom_offset = 0;
+  vui->tiles_fixed_structure_flag = 0;
+  vui->motion_vectors_over_pic_boundaries_flag = 1;
+  vui->min_spatial_segmentation_idc = 0;
+  vui->max_bytes_per_pic_denom = 2;
+  vui->max_bits_per_min_cu_denom = 1;
+  vui->log2_max_mv_length_horizontal = 15;
+  vui->log2_max_mv_length_vertical = 15;
+  vui->par_n = 0;
+  vui->par_d = 0;
+
+  if (sps && sps->profile_tier_level.progressive_source_flag
+      && sps->profile_tier_level.interlaced_source_flag)
+    vui->frame_field_info_present_flag = 1;
+  else
+    vui->frame_field_info_present_flag = 0;
+
+  READ_UINT8 (nr, vui->aspect_ratio_info_present_flag, 1);
+  if (vui->aspect_ratio_info_present_flag) {
+    READ_UINT8 (nr, vui->aspect_ratio_idc, 8);
+    if (vui->aspect_ratio_idc == EXTENDED_SAR) {
+      READ_UINT16 (nr, vui->sar_width, 16);
+      READ_UINT16 (nr, vui->sar_height, 16);
+      vui->par_n = vui->sar_width;
+      vui->par_d = vui->sar_height;
+    } else if (vui->aspect_ratio_idc <= 16) {
+      vui->par_n = aspect_ratios[vui->aspect_ratio_idc].par_n;
+      vui->par_d = aspect_ratios[vui->aspect_ratio_idc].par_d;
+    }
+  }
+
+  READ_UINT8 (nr, vui->overscan_info_present_flag, 1);
+  if (vui->overscan_info_present_flag)
+    READ_UINT8 (nr, vui->overscan_appropriate_flag, 1);
+
+  READ_UINT8 (nr, vui->video_signal_type_present_flag, 1);
+  if (vui->video_signal_type_present_flag) {
+
+    READ_UINT8 (nr, vui->video_format, 3);
+    READ_UINT8 (nr, vui->video_full_range_flag, 1);
+    READ_UINT8 (nr, vui->colour_description_present_flag, 1);
+    if (vui->colour_description_present_flag) {
+      READ_UINT8 (nr, vui->colour_primaries, 8);
+      READ_UINT8 (nr, vui->transfer_characteristics, 8);
+      READ_UINT8 (nr, vui->matrix_coefficients, 8);
+    }
+  }
+
+  READ_UINT8 (nr, vui->chroma_loc_info_present_flag, 1);
+  if (vui->chroma_loc_info_present_flag) {
+    READ_UE_MAX (nr, vui->chroma_sample_loc_type_top_field, 5);
+    READ_UE_MAX (nr, vui->chroma_sample_loc_type_bottom_field, 5);
+  }
+
+  READ_UINT8 (nr, vui->neutral_chroma_indication_flag, 1);
+  READ_UINT8 (nr, vui->field_seq_flag, 1);
+  READ_UINT8 (nr, vui->frame_field_info_present_flag, 1);
+
+  READ_UINT8 (nr, vui->default_display_window_flag, 1);
+  if (vui->default_display_window_flag) {
+    READ_UE (nr, vui->def_disp_win_left_offset);
+    READ_UE (nr, vui->def_disp_win_right_offset);
+    READ_UE (nr, vui->def_disp_win_top_offset);
+    READ_UE (nr, vui->def_disp_win_bottom_offset);
+  }
+
+  READ_UINT8 (nr, vui->timing_info_present_flag, 1);
+  if (vui->timing_info_present_flag) {
+    READ_UINT32 (nr, vui->num_units_in_tick, 32);
+    if (vui->num_units_in_tick == 0)
+      GST_WARNING ("num_units_in_tick = 0 detected in stream "
+          "(incompliant to H.265 E.2.1).");
+
+    READ_UINT32 (nr, vui->time_scale, 32);
+    if (vui->time_scale == 0)
+      GST_WARNING ("time_scale = 0 detected in stream "
+          "(incompliant to H.265 E.2.1).");
+
+    READ_UINT8 (nr, vui->poc_proportional_to_timing_flag, 1);
+    if (vui->poc_proportional_to_timing_flag)
+      READ_UE_MAX (nr, vui->num_ticks_poc_diff_one_minus1, G_MAXUINT32 - 1);
+
+    READ_UINT8 (nr, vui->hrd_parameters_present_flag, 1);
+    if (vui->hrd_parameters_present_flag)
+      if (!gst_h265_parse_hrd_parameters (&vui->hrd_params, nr, 1,
+              sps->max_sub_layers_minus1))
+        goto error;
+  }
+
+  READ_UINT8 (nr, vui->bitstream_restriction_flag, 1);
+  if (vui->bitstream_restriction_flag) {
+    READ_UINT8 (nr, vui->tiles_fixed_structure_flag, 1);
+    READ_UINT8 (nr, vui->motion_vectors_over_pic_boundaries_flag, 1);
+    READ_UINT8 (nr, vui->restricted_ref_pic_lists_flag, 1);
+    READ_UE_MAX (nr, vui->min_spatial_segmentation_idc, 4096);
+    READ_UE_MAX (nr, vui->max_bytes_per_pic_denom, 16);
+    READ_UE_MAX (nr, vui->max_bits_per_min_cu_denom, 16);
+    READ_UE_MAX (nr, vui->log2_max_mv_length_horizontal, 16);
+    READ_UE_MAX (nr, vui->log2_max_mv_length_vertical, 15);
+  }
+
+  return TRUE;
+
+error:
+  GST_WARNING ("error parsing \"VUI Parameters\"");
+  return FALSE;
+}
+
+static gboolean
+get_scaling_list_params (GstH265ScalingList * dest_scaling_list,
+    guint8 sizeId, guint8 matrixId, guint8 ** sl, guint8 * size,
+    gint16 ** scaling_list_dc_coef_minus8)
+{
+  switch (sizeId) {
+    case GST_H265_QUANT_MATIX_4X4:
+      *sl = dest_scaling_list->scaling_lists_4x4[matrixId];
+      if (size)
+        *size = 16;
+      break;
+    case GST_H265_QUANT_MATIX_8X8:
+      *sl = dest_scaling_list->scaling_lists_8x8[matrixId];
+      if (size)
+        *size = 64;
+      break;
+    case GST_H265_QUANT_MATIX_16X16:
+      *sl = dest_scaling_list->scaling_lists_16x16[matrixId];
+      if (size)
+        *size = 64;
+      if (scaling_list_dc_coef_minus8)
+        *scaling_list_dc_coef_minus8 =
+            dest_scaling_list->scaling_list_dc_coef_minus8_16x16;
+      break;
+    case GST_H265_QUANT_MATIX_32X32:
+      *sl = dest_scaling_list->scaling_lists_32x32[matrixId];
+      if (size)
+        *size = 64;
+      if (scaling_list_dc_coef_minus8)
+        *scaling_list_dc_coef_minus8 =
+            dest_scaling_list->scaling_list_dc_coef_minus8_32x32;
+      break;
+    default:
+      return FALSE;
+  }
+  return TRUE;
+}
+
+static gboolean
+get_default_scaling_lists (guint8 ** sl, guint8 sizeId, guint8 matrixId)
+{
+  switch (sizeId) {
+    case GST_H265_QUANT_MATIX_4X4:
+      memcpy (*sl, default_scaling_list0, 16);
+      break;
+
+    case GST_H265_QUANT_MATIX_8X8:
+    case GST_H265_QUANT_MATIX_16X16:
+      if (matrixId <= 2)
+        memcpy (*sl, default_scaling_list1, 64);
+      else
+        memcpy (*sl, default_scaling_list2, 64);
+      break;
+
+    case GST_H265_QUANT_MATIX_32X32:
+      if (matrixId == 0)
+        memcpy (*sl, default_scaling_list1, 64);
+      else
+        memcpy (*sl, default_scaling_list2, 64);
+      break;
+
+    default:
+      return FALSE;
+      break;
+  }
+  return TRUE;
+}
+
+static gboolean
+gst_h265_parser_parse_scaling_lists (NalReader * nr,
+    GstH265ScalingList * dest_scaling_list, gboolean use_default)
+{
+  guint8 sizeId;
+  guint8 matrixId;
+  guint8 scaling_list_pred_mode_flag = 0;
+  guint8 scaling_list_pred_matrix_id_delta = 0;
+  guint8 size, i;
+
+  GST_DEBUG ("parsing scaling lists");
+
+  for (sizeId = 0; sizeId < 4; sizeId++) {
+    for (matrixId = 0; matrixId < ((sizeId == 3) ? 2 : 6); matrixId++) {
+      gint16 *scaling_list_dc_coef_minus8 = NULL;
+      guint8 *sl;
+
+      if (!get_scaling_list_params (dest_scaling_list, sizeId, matrixId, &sl,
+              &size, &scaling_list_dc_coef_minus8))
+        goto error;
+
+      /* use_default_scaling_matrices forcefully which means,
+       * sps_scaling_list_enabled_flag=TRUE,
+       * sps_scaling_list_data_present_flag=FALSE,
+       * pps_scaling_list_data_present_falg=FALSE */
+      if (use_default) {
+        if (!get_default_scaling_lists (&sl, sizeId, matrixId))
+          goto error;
+
+        /* Inferring the value of scaling_list_dc_coef_minus8 */
+        if (sizeId > 1)
+          scaling_list_dc_coef_minus8[matrixId] = 8;
+
+      } else {
+        READ_UINT8 (nr, scaling_list_pred_mode_flag, 1);
+
+        if (!scaling_list_pred_mode_flag) {
+          guint8 refMatrixId;
+
+          READ_UE_MAX (nr, scaling_list_pred_matrix_id_delta, matrixId);
+
+          if (!scaling_list_pred_matrix_id_delta) {
+            if (!get_default_scaling_lists (&sl, sizeId, matrixId))
+              goto error;
+
+            /* Inferring the value of scaling_list_dc_coef_minus8 */
+            if (sizeId > 1)
+              scaling_list_dc_coef_minus8[matrixId] = 8;
+
+          } else {
+            guint8 *temp_sl;
+
+            refMatrixId = matrixId - scaling_list_pred_matrix_id_delta; /* 7-30 */
+
+            if (!get_scaling_list_params (dest_scaling_list, sizeId,
+                    refMatrixId, &temp_sl, NULL, NULL))
+              goto error;
+
+            for (i = 0; i < size; i++)
+              sl[i] = temp_sl[i];       /* 7-31 */
+
+
+            /* Inferring the value of scaling_list_dc_coef_minus8 */
+            if (sizeId > 1)
+              scaling_list_dc_coef_minus8[matrixId] =
+                  scaling_list_dc_coef_minus8[refMatrixId];
+          }
+        } else {
+          guint8 nextCoef = 8;
+          gint8 scaling_list_delta_coef;
+
+          if (sizeId > 1) {
+            READ_SE_ALLOWED (nr, scaling_list_dc_coef_minus8[matrixId], -7,
+                247);
+            nextCoef = scaling_list_dc_coef_minus8[matrixId] + 8;
+          }
+
+          for (i = 0; i < size; i++) {
+            READ_SE_ALLOWED (nr, scaling_list_delta_coef, -128, 127);
+            nextCoef = (nextCoef + scaling_list_delta_coef) & 0xff;
+            sl[i] = nextCoef;
+          }
+        }
+      }
+    }
+  }
+
+  return TRUE;
+
+error:
+  GST_WARNING ("error parsing scaling lists");
+  return FALSE;
+}
+
+static gboolean
+gst_h265_parser_parse_short_term_ref_pic_sets (GstH265ShortTermRefPicSet *
+    stRPS, NalReader * nr, guint8 stRpsIdx, GstH265SPS * sps)
+{
+  guint8 num_short_term_ref_pic_sets;
+  guint8 RefRpsIdx = 0;
+  gint16 deltaRps = 0;
+  guint8 use_delta_flag[16] = { 0 };
+  guint8 used_by_curr_pic_flag[16] = { 0 };
+  guint32 delta_poc_s0_minus1[16] = { 0 };
+  guint32 delta_poc_s1_minus1[16] = { 0 };
+  gint j, i = 0;
+  gint dPoc;
+
+  GST_DEBUG ("parsing \"ShortTermRefPicSetParameters\"");
+
+  /* set default values for fields that might not be present in the bitstream
+     and have valid defaults */
+  stRPS->inter_ref_pic_set_prediction_flag = 0;
+  stRPS->delta_idx_minus1 = 0;
+  for (j = 0; j < 16; j++)
+    use_delta_flag[j] = 1;
+
+  num_short_term_ref_pic_sets = sps->num_short_term_ref_pic_sets;
+
+  if (stRpsIdx != 0)
+    READ_UINT8 (nr, stRPS->inter_ref_pic_set_prediction_flag, 1);
+
+  if (stRPS->inter_ref_pic_set_prediction_flag) {
+    GstH265ShortTermRefPicSet *RefRPS;
+
+    if (stRpsIdx == num_short_term_ref_pic_sets)
+      READ_UE_MAX (nr, stRPS->delta_idx_minus1, stRpsIdx - 1);
+
+    READ_UINT8 (nr, stRPS->delta_rps_sign, 1);
+    READ_UE_MAX (nr, stRPS->abs_delta_rps_minus1, 32767);
+
+    RefRpsIdx = stRpsIdx - stRPS->delta_idx_minus1 - 1; /* 7-45 */
+    deltaRps = (1 - 2 * stRPS->delta_rps_sign) * (stRPS->abs_delta_rps_minus1 + 1);     /* 7-46 */
+
+    RefRPS = &sps->short_term_ref_pic_set[RefRpsIdx];
+
+    for (j = 0; j <= RefRPS->NumDeltaPocs; j++) {
+      READ_UINT8 (nr, used_by_curr_pic_flag[j], 1);
+      if (!used_by_curr_pic_flag[j])
+        READ_UINT8 (nr, use_delta_flag[j], 1);
+    }
+
+    /* 7-47: calcuate NumNegativePics, DeltaPocS0 and UsedByCurrPicS0 */
+    i = 0;
+    for (j = (RefRPS->NumPositivePics - 1); j >= 0; j--) {
+      dPoc = RefRPS->DeltaPocS1[j] + deltaRps;
+      if (dPoc < 0 && use_delta_flag[RefRPS->NumNegativePics + j]) {
+        stRPS->DeltaPocS0[i] = dPoc;
+        stRPS->UsedByCurrPicS0[i++] =
+            used_by_curr_pic_flag[RefRPS->NumNegativePics + j];
+      }
+    }
+    if (deltaRps < 0 && use_delta_flag[RefRPS->NumDeltaPocs]) {
+      stRPS->DeltaPocS0[i] = deltaRps;
+      stRPS->UsedByCurrPicS0[i++] = used_by_curr_pic_flag[RefRPS->NumDeltaPocs];
+    }
+    for (j = 0; j < RefRPS->NumNegativePics; j++) {
+      dPoc = RefRPS->DeltaPocS0[j] + deltaRps;
+      if (dPoc < 0 && use_delta_flag[j]) {
+        stRPS->DeltaPocS0[i] = dPoc;
+        stRPS->UsedByCurrPicS0[i++] = used_by_curr_pic_flag[j];
+      }
+    }
+    stRPS->NumNegativePics = i;
+
+    /* 7-48: calcuate NumPositivePics, DeltaPocS1 and UsedByCurrPicS1 */
+    i = 0;
+    for (j = (RefRPS->NumNegativePics - 1); j >= 0; j--) {
+      dPoc = RefRPS->DeltaPocS0[j] + deltaRps;
+      if (dPoc > 0 && use_delta_flag[j]) {
+        stRPS->DeltaPocS1[i] = dPoc;
+        stRPS->UsedByCurrPicS1[i++] = used_by_curr_pic_flag[j];
+      }
+    }
+    if (deltaRps > 0 && use_delta_flag[RefRPS->NumDeltaPocs]) {
+      stRPS->DeltaPocS1[i] = deltaRps;
+      stRPS->UsedByCurrPicS1[i++] = used_by_curr_pic_flag[RefRPS->NumDeltaPocs];
+    }
+    for (j = 0; j < RefRPS->NumPositivePics; j++) {
+      dPoc = RefRPS->DeltaPocS1[j] + deltaRps;
+      if (dPoc > 0 && use_delta_flag[RefRPS->NumNegativePics + j]) {
+        stRPS->DeltaPocS1[i] = dPoc;
+        stRPS->UsedByCurrPicS1[i++] =
+            used_by_curr_pic_flag[RefRPS->NumNegativePics + j];
+      }
+    }
+    stRPS->NumPositivePics = i;
+
+  } else {
+    /* 7-49 */
+    READ_UE_MAX (nr, stRPS->NumNegativePics,
+        sps->max_dec_pic_buffering_minus1[sps->max_sub_layers_minus1]);
+
+    /* 7-50 */
+    READ_UE_MAX (nr, stRPS->NumPositivePics,
+        (sps->max_dec_pic_buffering_minus1[sps->max_sub_layers_minus1] -
+            stRPS->NumNegativePics));
+
+    for (i = 0; i < stRPS->NumNegativePics; i++) {
+      READ_UE_MAX (nr, delta_poc_s0_minus1[i], 32767);
+      /* 7-51 */
+      READ_UINT8 (nr, stRPS->UsedByCurrPicS0[i], 1);
+
+      if (i == 0) {
+        /* 7-53 */
+        stRPS->DeltaPocS0[i] = -(delta_poc_s0_minus1[i] + 1);
+      } else {
+        /* 7-55 */
+        stRPS->DeltaPocS0[i] =
+            stRPS->DeltaPocS0[i - 1] - (delta_poc_s0_minus1[i] + 1);
+      }
+    }
+
+    for (j = 0; j < stRPS->NumPositivePics; j++) {
+      READ_UE_MAX (nr, delta_poc_s1_minus1[j], 32767);
+
+      /* 7-52 */
+      READ_UINT8 (nr, stRPS->UsedByCurrPicS1[j], 1);
+
+      if (j == 0) {
+        /* 7-54 */
+        stRPS->DeltaPocS1[j] = delta_poc_s1_minus1[j] + 1;
+      } else {
+        /* 7-56 */
+        stRPS->DeltaPocS1[j] =
+            stRPS->DeltaPocS1[j - 1] + (delta_poc_s1_minus1[j] + 1);
+      }
+    }
+
+  }
+
+  /* 7-57 */
+  stRPS->NumDeltaPocs = stRPS->NumPositivePics + stRPS->NumNegativePics;
+
+  return TRUE;
+
+error:
+  GST_WARNING ("error parsing \"ShortTermRefPicSet Parameters\"");
+  return FALSE;
+}
+
+static gboolean
+gst_h265_slice_parse_ref_pic_list_modification (GstH265SliceHdr * slice,
+    NalReader * nr, gint NumPocTotalCurr)
+{
+  guint i;
+  GstH265RefPicListModification *rpl_mod = &slice->ref_pic_list_modification;
+  const guint n = ceil_log2 (NumPocTotalCurr);
+
+  /* set default values */
+  rpl_mod->ref_pic_list_modification_flag_l0 = 0;
+  rpl_mod->ref_pic_list_modification_flag_l1 = 0;
+  for (i = 0; i < slice->num_ref_idx_l0_active_minus1; i++)
+    rpl_mod->list_entry_l0[i] = 0;
+  for (i = 0; i <= slice->num_ref_idx_l1_active_minus1; i++)
+    rpl_mod->list_entry_l1[i] = 0;
+
+  READ_UINT8 (nr, rpl_mod->ref_pic_list_modification_flag_l0, 1);
+
+  if (rpl_mod->ref_pic_list_modification_flag_l0) {
+    for (i = 0; i < slice->num_ref_idx_l0_active_minus1; i++) {
+      READ_UINT32 (nr, rpl_mod->list_entry_l0[i], n);
+      CHECK_ALLOWED_MAX (rpl_mod->list_entry_l0[i], (NumPocTotalCurr - 1));
+    }
+  }
+  if (GST_H265_IS_B_SLICE (slice)) {
+    READ_UINT8 (nr, rpl_mod->ref_pic_list_modification_flag_l1, 1);
+    if (rpl_mod->ref_pic_list_modification_flag_l1)
+      for (i = 0; i <= slice->num_ref_idx_l1_active_minus1; i++) {
+        READ_UINT32 (nr, rpl_mod->list_entry_l1[i], n);
+        CHECK_ALLOWED_MAX (rpl_mod->list_entry_l1[i], (NumPocTotalCurr - 1));
+      }
+  }
+
+  return TRUE;
+
+error:
+  GST_WARNING ("error parsing \"Prediction weight table\"");
+  return FALSE;
+}
+
+static gboolean
+gst_h265_slice_parse_pred_weight_table (GstH265SliceHdr * slice, NalReader * nr)
+{
+  GstH265PredWeightTable *p;
+  gint i, j;
+  GstH265PPS *pps = slice->pps;
+  GstH265SPS *sps = pps->sps;
+
+  GST_DEBUG ("parsing \"Prediction weight table\"");
+
+  p = &slice->pred_weight_table;
+
+  READ_UE_MAX (nr, p->luma_log2_weight_denom, 7);
+
+  /* set default values */
+  for (i = 0; i < G_N_ELEMENTS (p->chroma_weight_l0_flag); i++) {
+    p->chroma_weight_l0_flag[i] = 0;
+    p->luma_offset_l0[i] = 0;
+  }
+
+  if (GST_H265_IS_B_SLICE (slice)) {
+    for (i = 0; i < G_N_ELEMENTS (p->luma_weight_l1_flag); i++) {
+      p->chroma_weight_l1_flag[i] = 0;
+      p->luma_offset_l1[i] = 0;
+    }
+  }
+
+  if (sps->chroma_format_idc != 0)
+    READ_SE_ALLOWED (nr, p->delta_chroma_log2_weight_denom, 0, 7);
+
+  for (i = 0; i <= slice->num_ref_idx_l0_active_minus1; i++)
+    READ_UINT8 (nr, p->luma_weight_l0_flag[i], 1);
+
+  if (sps->chroma_format_idc != 0)
+    for (i = 0; i <= slice->num_ref_idx_l0_active_minus1; i++)
+      READ_UINT8 (nr, p->chroma_weight_l0_flag[i], 1);
+
+  for (i = 0; i <= slice->num_ref_idx_l0_active_minus1; i++) {
+    if (p->luma_weight_l0_flag[i]) {
+      READ_SE_ALLOWED (nr, p->delta_luma_weight_l0[i], -128, 127);
+      READ_SE_ALLOWED (nr, p->luma_offset_l0[i], -128, 127);
+    }
+    if (p->chroma_weight_l0_flag[i])
+      for (j = 0; j < 2; j++) {
+        READ_SE_ALLOWED (nr, p->delta_chroma_weight_l0[i][j], -128, 127);
+        READ_SE_ALLOWED (nr, p->delta_chroma_offset_l0[i][j], -512, 511);
+      }
+  }
+
+  if (GST_H265_IS_B_SLICE (slice)) {
+    for (i = 0; i <= slice->num_ref_idx_l1_active_minus1; i++)
+      READ_UINT8 (nr, p->luma_weight_l1_flag[i], 1);
+    if (sps->chroma_format_idc != 0)
+      for (i = 0; i <= slice->num_ref_idx_l1_active_minus1; i++)
+        READ_UINT8 (nr, p->chroma_weight_l1_flag[i], 1);
+
+    for (i = 0; i <= slice->num_ref_idx_l1_active_minus1; i++) {
+      if (p->luma_weight_l1_flag[i]) {
+        READ_SE_ALLOWED (nr, p->delta_luma_weight_l1[i], -128, 127);
+        READ_SE_ALLOWED (nr, p->luma_offset_l1[i], -128, 127);
+      }
+      if (p->chroma_weight_l1_flag[i])
+        for (j = 0; j < 2; j++) {
+          READ_SE_ALLOWED (nr, p->delta_chroma_weight_l1[i][j], -128, 127);
+          READ_SE_ALLOWED (nr, p->delta_chroma_offset_l1[i][j], -512, 511);
+        }
+    }
+  }
+
+  return TRUE;
+
+error:
+  GST_WARNING ("error parsing \"Prediction weight table\"");
+  return FALSE;
+}
+
+static GstH265ParserResult
+gst_h265_parser_parse_buffering_period (GstH265Parser * parser,
+    GstH265BufferingPeriod * per, NalReader * nr)
+{
+  GstH265SPS *sps;
+  guint8 sps_id;
+  guint i;
+  guint n;
+
+  GST_DEBUG ("parsing \"Buffering period\"");
+
+  READ_UE_MAX (nr, sps_id, GST_H265_MAX_SPS_COUNT - 1);
+  sps = gst_h265_parser_get_sps (parser, sps_id);
+  if (!sps) {
+    GST_WARNING ("couldn't find associated sequence parameter set with id: %d",
+        sps_id);
+    return GST_H265_PARSER_BROKEN_LINK;
+  }
+  per->sps = sps;
+
+  /* set default values if not present */
+  per->irap_cpb_params_present_flag = 0;
+  per->cpb_delay_offset = 0;
+  per->dpb_delay_offset = 0;
+
+  if (sps->vui_parameters_present_flag) {
+    GstH265VUIParams *vui = &sps->vui_params;
+    GstH265HRDParams *hrd = &vui->hrd_params;
+
+    if (!hrd->sub_pic_hrd_params_present_flag)
+      READ_UINT8 (nr, per->irap_cpb_params_present_flag, 1);
+
+    if (per->irap_cpb_params_present_flag) {
+      READ_UINT8 (nr, per->cpb_delay_offset,
+          (hrd->au_cpb_removal_delay_length_minus1 + 1));
+      READ_UINT8 (nr, per->dpb_delay_offset,
+          (hrd->dpb_output_delay_length_minus1 + 1));
+    }
+
+    n = hrd->initial_cpb_removal_delay_length_minus1 + 1;
+
+    READ_UINT8 (nr, per->concatenation_flag, 1);
+    READ_UINT8 (nr, per->au_cpb_removal_delay_delta_minus1,
+        (hrd->au_cpb_removal_delay_length_minus1 + 1));
+
+    if (hrd->nal_hrd_parameters_present_flag) {
+      for (i = 0; i <= hrd->cpb_cnt_minus1[i]; i++) {
+        READ_UINT8 (nr, per->nal_initial_cpb_removal_delay[i], n);
+        READ_UINT8 (nr, per->nal_initial_cpb_removal_offset[i], n);
+        if (hrd->sub_pic_hrd_params_present_flag
+            || per->irap_cpb_params_present_flag) {
+          READ_UINT8 (nr, per->nal_initial_alt_cpb_removal_delay[i], n);
+          READ_UINT8 (nr, per->nal_initial_alt_cpb_removal_offset[i], n);
+        }
+      }
+    }
+
+    if (hrd->vcl_hrd_parameters_present_flag) {
+      for (i = 0; i <= hrd->cpb_cnt_minus1[i]; i++) {
+        READ_UINT8 (nr, per->vcl_initial_cpb_removal_delay[i], n);
+        READ_UINT8 (nr, per->vcl_initial_cpb_removal_offset[i], n);
+        if (hrd->sub_pic_hrd_params_present_flag
+            || per->irap_cpb_params_present_flag) {
+          READ_UINT8 (nr, per->vcl_initial_alt_cpb_removal_delay[i], n);
+          READ_UINT8 (nr, per->vcl_initial_alt_cpb_removal_offset[i], n);
+        }
+      }
+    }
+
+  }
+  return GST_H265_PARSER_OK;
+
+error:
+  GST_WARNING ("error parsing \"Buffering period\"");
+  return GST_H265_PARSER_ERROR;
+}
+
+static GstH265ParserResult
+gst_h265_parser_parse_pic_timing (GstH265Parser * parser,
+    GstH265PicTiming * tim, NalReader * nr)
+{
+  GstH265ProfileTierLevel *profile_tier_level;
+  guint i;
+
+  GST_DEBUG ("parsing \"Picture timing\"");
+  if (!parser->last_sps || !parser->last_sps->valid) {
+    GST_WARNING ("didn't get the associated sequence paramater set for the "
+        "current access unit");
+    goto error;
+  }
+
+  profile_tier_level = &parser->last_sps->profile_tier_level;
+
+  /* set default values */
+  tim->pic_struct = 0;
+  if (!profile_tier_level->progressive_source_flag
+      && profile_tier_level->interlaced_source_flag)
+    tim->source_scan_type = 0;
+  else if (profile_tier_level->progressive_source_flag
+      && !profile_tier_level->interlaced_source_flag)
+    tim->source_scan_type = 1;
+  else
+    tim->source_scan_type = 2;
+
+  if (parser->last_sps->vui_parameters_present_flag) {
+    GstH265VUIParams *vui = &parser->last_sps->vui_params;
+
+    if (vui->frame_field_info_present_flag) {
+      READ_UINT8 (nr, tim->pic_struct, 4);
+      READ_UINT8 (nr, tim->source_scan_type, 2);
+      READ_UINT8 (nr, tim->duplicate_flag, 1);
+    } else {
+      /* set default values */
+      tim->pic_struct = 0;
+    }
+
+    if (vui->hrd_parameters_present_flag) {
+      GstH265HRDParams *hrd = &vui->hrd_params;
+
+      READ_UINT8 (nr, tim->au_cpb_removal_delay_minus1,
+          (hrd->au_cpb_removal_delay_length_minus1 + 1));
+      READ_UINT8 (nr, tim->pic_dpb_output_delay,
+          (hrd->dpb_output_delay_length_minus1 + 1));
+
+      if (hrd->sub_pic_hrd_params_present_flag)
+        READ_UINT8 (nr, tim->pic_dpb_output_du_delay,
+            (hrd->dpb_output_delay_du_length_minus1 + 1));
+
+      if (hrd->sub_pic_hrd_params_present_flag
+          && hrd->sub_pic_cpb_params_in_pic_timing_sei_flag) {
+        READ_UE (nr, tim->num_decoding_units_minus1);
+
+        READ_UINT8 (nr, tim->du_common_cpb_removal_delay_flag, 1);
+        if (tim->du_common_cpb_removal_delay_flag)
+          READ_UINT8 (nr, tim->du_common_cpb_removal_delay_increment_minus1,
+              (hrd->du_cpb_removal_delay_increment_length_minus1 + 1));
+
+        tim->num_nalus_in_du_minus1 =
+            g_new0 (guint32, (tim->num_decoding_units_minus1 + 1));
+        tim->du_cpb_removal_delay_increment_minus1 =
+            g_new0 (guint8, (tim->num_decoding_units_minus1 + 1));
+
+        for (i = 0; i <= (tim->num_decoding_units_minus1 + 1); i++) {
+          READ_UE (nr, tim->num_nalus_in_du_minus1[i]);
+
+          if (!tim->du_common_cpb_removal_delay_flag
+              && (i < tim->num_decoding_units_minus1))
+            READ_UINT8 (nr, tim->du_cpb_removal_delay_increment_minus1[i],
+                (hrd->du_cpb_removal_delay_increment_length_minus1 + 1));
+        }
+      }
+    }
+  }
+  return GST_H265_PARSER_OK;
+
+error:
+  GST_WARNING ("error parsing \"Picture timing\"");
+  return GST_H265_PARSER_ERROR;
+}
+
+/******** API *************/
+
+/**
+ * gst_h265_parser_new:
+ *
+ * Creates a new #GstH265Parser. It should be freed with
+ * gst_h265_parser_free after use.
+ *
+ * Returns: a new #GstH265Parser
+ */
+GstH265Parser *
+gst_h265_parser_new (void)
+{
+  GstH265Parser *parser;
+
+  parser = g_slice_new0 (GstH265Parser);
+  INITIALIZE_DEBUG_CATEGORY;
+
+  return parser;
+}
+
+/**
+ * gst_h265_parser_free:
+ * @parser: the #GstH265Parser to free
+ *
+ * Frees @parser and sets it to %NULL
+ */
+void
+gst_h265_parser_free (GstH265Parser * parser)
+{
+  g_slice_free (GstH265Parser, parser);
+  parser = NULL;
+}
+
+/**
+ * gst_h265_parser_identify_nalu_unchecked:
+ * @parser: a #GstH265Parser
+ * @data: The data to parse
+ * @offset: the offset from which to parse @data
+ * @size: the size of @data
+ * @nalu: The #GstH265NalUnit where to store parsed nal headers
+ *
+ * Parses @data and fills @nalu from the next nalu data from @data.
+ *
+ * This differs from @gst_h265_parser_identify_nalu in that it doesn't
+ * check whether the packet is complete or not.
+ *
+ * Note: Only use this function if you already know the provided @data
+ * is a complete NALU, else use @gst_h265_parser_identify_nalu.
+ *
+ * Returns: a #GstH265ParserResult
+ */
+GstH265ParserResult
+gst_h265_parser_identify_nalu_unchecked (GstH265Parser * parser,
+    const guint8 * data, guint offset, gsize size, GstH265NalUnit * nalu)
+{
+  gint off1;
+
+  if (size < offset + 4) {
+    GST_DEBUG ("Can't parse, buffer has too small size %" G_GSIZE_FORMAT
+        ", offset %u", size, offset);
+    return GST_H265_PARSER_ERROR;
+  }
+
+  off1 = scan_for_start_codes (data + offset, size - offset);
+
+  if (off1 < 0) {
+    GST_DEBUG ("No start code prefix in this buffer");
+    return GST_H265_PARSER_NO_NAL;
+  }
+
+  if (offset + off1 == size - 1) {
+    GST_DEBUG ("Missing data to identify nal unit");
+
+    return GST_H265_PARSER_ERROR;
+  }
+
+  nalu->sc_offset = offset + off1;
+
+  /* sc might have 2 or 3 0-bytes */
+  if (nalu->sc_offset > 0 && data[nalu->sc_offset - 1] == 00)
+    nalu->sc_offset--;
+
+  nalu->offset = offset + off1 + 3;
+  nalu->data = (guint8 *) data;
+  nalu->size = size - nalu->offset;
+
+  if (!gst_h265_parse_nalu_header (nalu)) {
+    GST_WARNING ("error parsing \"NAL unit header\"");
+    nalu->size = 0;
+    return GST_H265_PARSER_BROKEN_DATA;
+  }
+
+  nalu->valid = TRUE;
+
+  if (nalu->type == GST_H265_NAL_EOS || nalu->type == GST_H265_NAL_EOB) {
+    GST_DEBUG ("end-of-seq or end-of-stream nal found");
+    nalu->size = 2;
+    return GST_H265_PARSER_OK;
+  }
+
+  return GST_H265_PARSER_OK;
+}
+
+/**
+ * gst_h265_parser_identify_nalu:
+ * @parser: a #GstH265Parser
+ * @data: The data to parse
+ * @offset: the offset from which to parse @data
+ * @size: the size of @data
+ * @nalu: The #GstH265NalUnit where to store parsed nal headers
+ *
+ * Parses @data and fills @nalu from the next nalu data from @data
+ *
+ * Returns: a #GstH265ParserResult
+ */
+GstH265ParserResult
+gst_h265_parser_identify_nalu (GstH265Parser * parser,
+    const guint8 * data, guint offset, gsize size, GstH265NalUnit * nalu)
+{
+  GstH265ParserResult res;
+  gint off2;
+
+  res =
+      gst_h265_parser_identify_nalu_unchecked (parser, data, offset, size,
+      nalu);
+
+  if (res != GST_H265_PARSER_OK || nalu->size == 2)
+    goto beach;
+
+  off2 = scan_for_start_codes (data + nalu->offset, size - nalu->offset);
+  if (off2 < 0) {
+    GST_DEBUG ("Nal start %d, No end found", nalu->offset);
+
+    return GST_H265_PARSER_NO_NAL_END;
+  }
+
+  /* Mini performance improvement:
+   * We could have a way to store how many 0s were skipped to avoid
+   * parsing them again on the next NAL */
+  while (off2 > 0 && data[nalu->offset + off2 - 1] == 00)
+    off2--;
+
+  nalu->size = off2;
+  if (nalu->size < 3)
+    return GST_H265_PARSER_BROKEN_DATA;
+
+  GST_DEBUG ("Complete nal found. Off: %d, Size: %d", nalu->offset, nalu->size);
+
+beach:
+  return res;
+}
+
+/**
+ * gst_h265_parser_identify_nalu_hevc:
+ * @parser: a #GstH265Parser
+ * @data: The data to parse, must be the beging of the Nal unit
+ * @offset: the offset from which to parse @data
+ * @size: the size of @data
+ * @nal_length_size: the size in bytes of the HEVC nal length prefix.
+ * @nalu: The #GstH265NalUnit where to store parsed nal headers
+ *
+ * Parses @data and sets @nalu.
+ *
+ * Returns: a #GstH265ParserResult
+ */
+GstH265ParserResult
+gst_h265_parser_identify_nalu_hevc (GstH265Parser * parser,
+    const guint8 * data, guint offset, gsize size, guint8 nal_length_size,
+    GstH265NalUnit * nalu)
+{
+  GstBitReader br;
+
+  if (size < offset + nal_length_size) {
+    GST_DEBUG ("Can't parse, buffer has too small size %" G_GSIZE_FORMAT
+        ", offset %u", size, offset);
+    return GST_H265_PARSER_ERROR;
+  }
+
+  size = size - offset;
+  gst_bit_reader_init (&br, data + offset, size);
+
+  nalu->size = gst_bit_reader_get_bits_uint32_unchecked (&br,
+      nal_length_size * 8);
+  nalu->sc_offset = offset;
+  nalu->offset = offset + nal_length_size;
+
+  if (size < nalu->size + nal_length_size) {
+    nalu->size = 0;
+
+    return GST_H265_PARSER_NO_NAL_END;
+  }
+
+  nalu->data = (guint8 *) data;
+
+  if (!gst_h265_parse_nalu_header (nalu)) {
+    GST_WARNING ("error parsing \"NAL unit header\"");
+    nalu->size = 0;
+    return GST_H265_PARSER_BROKEN_DATA;
+  }
+
+  if (nalu->size < 2)
+    return GST_H265_PARSER_BROKEN_DATA;
+
+  nalu->valid = TRUE;
+
+  return GST_H265_PARSER_OK;
+}
+
+/**
+ * gst_h265_parser_parse_nal:
+ * @parser: a #GstH265Parser
+ * @nalu: The #GstH265NalUnit to parse
+ *
+ * This function should be called in the case one doesn't need to
+ * parse a specific structure. It is necessary to do so to make
+ * sure @parser is up to date.
+ *
+ * Returns: a #GstH265ParserResult
+ */
+GstH265ParserResult
+gst_h265_parser_parse_nal (GstH265Parser * parser, GstH265NalUnit * nalu)
+{
+  GstH265VPS vps;
+  GstH265SPS sps;
+  GstH265PPS pps;
+
+  switch (nalu->type) {
+    case GST_H265_NAL_VPS:
+      return gst_h265_parser_parse_vps (parser, nalu, &vps);
+      break;
+    case GST_H265_NAL_SPS:
+      return gst_h265_parser_parse_sps (parser, nalu, &sps, FALSE);
+      break;
+    case GST_H265_NAL_PPS:
+      return gst_h265_parser_parse_pps (parser, nalu, &pps);
+  }
+
+  return GST_H265_PARSER_OK;
+}
+
+/**
+ * gst_h265_parser_parse_vps:
+ * @parser: a #GstH265Parser
+ * @nalu: The #GST_H265_NAL_VPS #GstH265NalUnit to parse
+ * @vps: The #GstH265VPS to fill.
+ *
+ * Parses @data, and fills the @vps structure.
+ *
+ * Returns: a #GstH265ParserResult
+ */
+GstH265ParserResult
+gst_h265_parser_parse_vps (GstH265Parser * parser, GstH265NalUnit * nalu,
+    GstH265VPS * vps)
+{
+  GstH265ParserResult res = gst_h265_parse_vps (nalu, vps);
+
+  if (res == GST_H265_PARSER_OK) {
+    GST_DEBUG ("adding video parameter set with id: %d to array", vps->id);
+
+    parser->vps[vps->id] = *vps;
+    parser->last_vps = &parser->vps[vps->id];
+  }
+
+  return res;
+}
+
+/**
+ * gst_h265_parse_vps:
+ * @nalu: The #GST_H265_NAL_VPS #GstH265NalUnit to parse
+ * @sps: The #GstH265VPS to fill.
+ *
+ * Parses @data, and fills the @vps structure.
+ *
+ * Returns: a #GstH265ParserResult
+ */
+GstH265ParserResult
+gst_h265_parse_vps (GstH265NalUnit * nalu, GstH265VPS * vps)
+{
+  NalReader nr;
+  guint i, j;
+
+  INITIALIZE_DEBUG_CATEGORY;
+  GST_DEBUG ("parsing VPS");
+
+  nal_reader_init (&nr, nalu->data + nalu->offset + nalu->header_bytes,
+      nalu->size - nalu->header_bytes);
+
+  memset (&vps->profile_tier_level, 0, sizeof (vps->profile_tier_level));
+  memset (&vps->hrd_params, 0, sizeof (vps->hrd_params));
+  vps->cprms_present_flag = 1;
+
+  READ_UINT8 (&nr, vps->id, 4);
+
+  /* skip reserved_three_2bits */
+  if (!nal_reader_skip (&nr, 2))
+    goto error;
+
+  READ_UINT8 (&nr, vps->max_layers_minus1, 6);
+  READ_UINT8 (&nr, vps->max_sub_layers_minus1, 3);
+  READ_UINT8 (&nr, vps->temporal_id_nesting_flag, 1);
+
+  /* skip reserved_0xffff_16bits */
+  if (!nal_reader_skip (&nr, 16))
+    goto error;
+
+  if (!gst_h265_parse_profile_tier_level (&vps->profile_tier_level, &nr,
+          vps->max_sub_layers_minus1))
+    goto error;
+
+  READ_UINT8 (&nr, vps->sub_layer_ordering_info_present_flag, 1);
+
+  for (i =
+      (vps->sub_layer_ordering_info_present_flag ? 0 :
+          vps->max_sub_layers_minus1); i <= vps->max_sub_layers_minus1; i++) {
+    READ_UE_MAX (&nr, vps->max_dec_pic_buffering_minus1[i], G_MAXUINT32 - 1);
+    READ_UE_MAX (&nr, vps->max_num_reorder_pics[i],
+        vps->max_dec_pic_buffering_minus1[i]);
+    READ_UE_MAX (&nr, vps->max_latency_increase_plus1[i], G_MAXUINT32 - 1);
+  }
+  /* setting default values if vps->sub_layer_ordering_info_present_flag is zero */
+  if (!vps->sub_layer_ordering_info_present_flag && vps->max_sub_layers_minus1) {
+    for (i = 0; i <= (vps->max_sub_layers_minus1 - 1); i++) {
+      vps->max_dec_pic_buffering_minus1[i] =
+          vps->max_dec_pic_buffering_minus1[vps->max_sub_layers_minus1];
+      vps->max_num_reorder_pics[i] =
+          vps->max_num_reorder_pics[vps->max_sub_layers_minus1];
+      vps->max_latency_increase_plus1[i] =
+          vps->max_latency_increase_plus1[vps->max_sub_layers_minus1];
+    }
+  }
+
+  READ_UINT8 (&nr, vps->max_layer_id, 6);
+  CHECK_ALLOWED_MAX (vps->max_layer_id, 0);
+
+  READ_UE_MAX (&nr, vps->num_layer_sets_minus1, 1023);
+  CHECK_ALLOWED_MAX (vps->num_layer_sets_minus1, 0);
+
+  for (i = 1; i <= vps->num_layer_sets_minus1; i++)
+    for (j = 0; j <= vps->max_layer_id; j++)
+      nal_reader_skip (&nr, 1);
+
+  READ_UINT8 (&nr, vps->timing_info_present_flag, 1);
+
+  if (vps->timing_info_present_flag) {
+    READ_UINT32 (&nr, vps->num_units_in_tick, 32);
+    READ_UINT32 (&nr, vps->time_scale, 32);
+    READ_UINT8 (&nr, vps->poc_proportional_to_timing_flag, 1);
+
+    if (vps->poc_proportional_to_timing_flag)
+      READ_UE_MAX (&nr, vps->num_ticks_poc_diff_one_minus1, G_MAXUINT32 - 1);
+
+    READ_UE_MAX (&nr, vps->num_hrd_parameters, 1024);
+    CHECK_ALLOWED_MAX (vps->num_hrd_parameters, 1);
+
+    if (vps->num_hrd_parameters) {
+      READ_UE_MAX (&nr, vps->hrd_layer_set_idx, 1023);
+      CHECK_ALLOWED_MAX (vps->hrd_layer_set_idx, 0);
+
+      if (!gst_h265_parse_hrd_parameters (&vps->hrd_params, &nr,
+              vps->cprms_present_flag, vps->max_sub_layers_minus1))
+        goto error;
+    }
+  }
+  READ_UINT8 (&nr, vps->vps_extension, 1);
+  vps->valid = TRUE;
+
+  return GST_H265_PARSER_OK;
+
+error:
+  GST_WARNING ("error parsing \"Video parameter set\"");
+  vps->valid = FALSE;
+  return GST_H265_PARSER_ERROR;
+}
+
+/**
+ * gst_h265_parser_parse_sps:
+ * @parser: a #GstH265Parser
+ * @nalu: The #GST_H265_NAL_SPS #GstH265NalUnit to parse
+ * @sps: The #GstH265SPS to fill.
+ * @parse_vui_params: Whether to parse the vui_params or not
+ *
+ * Parses @data, and fills the @sps structure.
+ *
+ * Returns: a #GstH265ParserResult
+ */
+GstH265ParserResult
+gst_h265_parser_parse_sps (GstH265Parser * parser, GstH265NalUnit * nalu,
+    GstH265SPS * sps, gboolean parse_vui_params)
+{
+  GstH265ParserResult res =
+      gst_h265_parse_sps (parser, nalu, sps, parse_vui_params);
+
+  if (res == GST_H265_PARSER_OK) {
+    GST_DEBUG ("adding sequence parameter set with id: %d to array", sps->id);
+
+    parser->sps[sps->id] = *sps;
+    parser->last_sps = &parser->sps[sps->id];
+  }
+
+  return res;
+}
+
+/**
+ * gst_h265_parse_sps:
+ * parser: The #GstH265Parser
+ * @nalu: The #GST_H265_NAL_SPS #GstH265NalUnit to parse
+ * @sps: The #GstH265SPS to fill.
+ * @parse_vui_params: Whether to parse the vui_params or not
+ *
+ * Parses @data, and fills the @sps structure.
+ *
+ * Returns: a #GstH265ParserResult
+ */
+GstH265ParserResult
+gst_h265_parse_sps (GstH265Parser * parser, GstH265NalUnit * nalu,
+    GstH265SPS * sps, gboolean parse_vui_params)
+{
+  NalReader nr;
+  GstH265VPS *vps;
+  guint8 vps_id;
+  guint i;
+  guint subwc[] = { 1, 2, 2, 1, 1 };
+  guint subhc[] = { 1, 2, 1, 1, 1 };
+  GstH265VUIParams *vui = NULL;
+
+  INITIALIZE_DEBUG_CATEGORY;
+  GST_DEBUG ("parsing SPS");
+
+  nal_reader_init (&nr, nalu->data + nalu->offset + nalu->header_bytes,
+      nalu->size - nalu->header_bytes);
+
+  /* set default values for fields that might not be present in the bitstream
+     and have valid defaults */
+  memset (&sps->profile_tier_level, 0, sizeof (sps->profile_tier_level));
+  memset (sps->short_term_ref_pic_set, 0, sizeof (sps->short_term_ref_pic_set));
+  sps->scaling_list_data_present_flag = 0;
+  sps->separate_colour_plane_flag = 0;
+  sps->conf_win_left_offset = 0;
+  sps->conf_win_right_offset = 0;
+  sps->conf_win_top_offset = 0;
+  sps->conf_win_bottom_offset = 0;
+  sps->pcm_loop_filter_disabled_flag = 0;
+
+  READ_UINT8 (&nr, vps_id, 4);
+  vps = gst_h265_parser_get_vps (parser, vps_id);
+  if (!vps) {
+    GST_DEBUG ("couldn't find associated video parameter set with id: %d",
+        vps_id);
+  }
+  sps->vps = vps;
+
+  READ_UINT8 (&nr, sps->max_sub_layers_minus1, 3);
+  READ_UINT8 (&nr, sps->temporal_id_nesting_flag, 1);
+
+  if (!gst_h265_parse_profile_tier_level (&sps->profile_tier_level, &nr,
+          sps->max_sub_layers_minus1))
+    goto error;
+
+  READ_UE_MAX (&nr, sps->id, GST_H265_MAX_SPS_COUNT - 1);
+
+  READ_UE_MAX (&nr, sps->chroma_format_idc, 3);
+  if (sps->chroma_format_idc == 3)
+    READ_UINT8 (&nr, sps->separate_colour_plane_flag, 1);
+
+  READ_UE_ALLOWED (&nr, sps->pic_width_in_luma_samples, 1, 16888);
+  READ_UE_ALLOWED (&nr, sps->pic_height_in_luma_samples, 1, 16888);
+
+  READ_UINT8 (&nr, sps->conformance_window_flag, 1);
+  if (sps->conformance_window_flag) {
+    READ_UE (&nr, sps->conf_win_left_offset);
+    READ_UE (&nr, sps->conf_win_right_offset);
+    READ_UE (&nr, sps->conf_win_top_offset);
+    READ_UE (&nr, sps->conf_win_bottom_offset);
+  }
+
+  READ_UE_MAX (&nr, sps->bit_depth_luma_minus8, 6);
+  READ_UE_MAX (&nr, sps->bit_depth_chroma_minus8, 6);
+  READ_UE_MAX (&nr, sps->log2_max_pic_order_cnt_lsb_minus4, 12);
+
+  READ_UINT8 (&nr, sps->sub_layer_ordering_info_present_flag, 1);
+  for (i =
+      (sps->sub_layer_ordering_info_present_flag ? 0 :
+          sps->max_sub_layers_minus1); i <= sps->max_sub_layers_minus1; i++) {
+    READ_UE_MAX (&nr, sps->max_dec_pic_buffering_minus1[i], 16);
+    READ_UE_MAX (&nr, sps->max_num_reorder_pics[i],
+        sps->max_dec_pic_buffering_minus1[i]);
+    READ_UE_MAX (&nr, sps->max_latency_increase_plus1[i], G_MAXUINT32 - 1);
+  }
+  /* setting default values if sps->sub_layer_ordering_info_present_flag is zero */
+  if (!sps->sub_layer_ordering_info_present_flag && sps->max_sub_layers_minus1) {
+    for (i = 0; i <= (sps->max_sub_layers_minus1 - 1); i++) {
+      sps->max_dec_pic_buffering_minus1[i] =
+          sps->max_dec_pic_buffering_minus1[sps->max_sub_layers_minus1];
+      sps->max_num_reorder_pics[i] =
+          sps->max_num_reorder_pics[sps->max_sub_layers_minus1];
+      sps->max_latency_increase_plus1[i] =
+          sps->max_latency_increase_plus1[sps->max_sub_layers_minus1];
+    }
+  }
+
+  /* The limits are calculted based on the profile_tier_level constraint
+   * in Annex-A: CtbLog2SizeY = 4 to 6 */
+  READ_UE_MAX (&nr, sps->log2_min_luma_coding_block_size_minus3, 3);
+  READ_UE_MAX (&nr, sps->log2_diff_max_min_luma_coding_block_size, 6);
+  READ_UE_MAX (&nr, sps->log2_min_transform_block_size_minus2, 3);
+  READ_UE_MAX (&nr, sps->log2_diff_max_min_transform_block_size, 3);
+  READ_UE_MAX (&nr, sps->max_transform_hierarchy_depth_inter, 4);
+  READ_UE_MAX (&nr, sps->max_transform_hierarchy_depth_intra, 4);
+
+  READ_UINT8 (&nr, sps->scaling_list_enabled_flag, 1);
+  if (sps->scaling_list_enabled_flag) {
+    READ_UINT8 (&nr, sps->scaling_list_data_present_flag, 1);
+
+    if (sps->scaling_list_data_present_flag)
+      if (!gst_h265_parser_parse_scaling_lists (&nr, &sps->scaling_list, FALSE))
+        goto error;
+  }
+
+  READ_UINT8 (&nr, sps->amp_enabled_flag, 1);
+  READ_UINT8 (&nr, sps->sample_adaptive_offset_enabled_flag, 1);
+  READ_UINT8 (&nr, sps->pcm_enabled_flag, 1);
+
+  if (sps->pcm_enabled_flag) {
+    READ_UINT8 (&nr, sps->pcm_sample_bit_depth_luma_minus1, 4);
+    READ_UINT8 (&nr, sps->pcm_sample_bit_depth_chroma_minus1, 4);
+    READ_UE_MAX (&nr, sps->log2_min_pcm_luma_coding_block_size_minus3, 2);
+    READ_UE_MAX (&nr, sps->log2_diff_max_min_pcm_luma_coding_block_size, 2);
+    READ_UINT8 (&nr, sps->pcm_loop_filter_disabled_flag, 1);
+  }
+
+  READ_UE_MAX (&nr, sps->num_short_term_ref_pic_sets, 64);
+  for (i = 0; i < sps->num_short_term_ref_pic_sets; i++)
+    if (!gst_h265_parser_parse_short_term_ref_pic_sets
+        (&sps->short_term_ref_pic_set[i], &nr, i, sps))
+      goto error;
+
+  READ_UINT8 (&nr, sps->long_term_ref_pics_present_flag, 1);
+  if (sps->long_term_ref_pics_present_flag) {
+    READ_UE_MAX (&nr, sps->num_long_term_ref_pics_sps, 32);
+    for (i = 0; i < sps->num_long_term_ref_pics_sps; i++) {
+      READ_UINT16 (&nr, sps->lt_ref_pic_poc_lsb_sps[i],
+          sps->log2_max_pic_order_cnt_lsb_minus4 + 4);
+      READ_UINT8 (&nr, sps->used_by_curr_pic_lt_sps_flag[i], 1);
+    }
+  }
+
+  READ_UINT8 (&nr, sps->temporal_mvp_enabled_flag, 1);
+  READ_UINT8 (&nr, sps->strong_intra_smoothing_enabled_flag, 1);
+  READ_UINT8 (&nr, sps->vui_parameters_present_flag, 1);
+
+  if (sps->vui_parameters_present_flag && parse_vui_params) {
+    if (!gst_h265_parse_vui_parameters (sps, &nr))
+      goto error;
+    vui = &sps->vui_params;
+  }
+
+  READ_UINT8 (&nr, sps->sps_extension_flag, 1);
+
+  /* calculate ChromaArrayType */
+  if (sps->separate_colour_plane_flag)
+    sps->chroma_array_type = 0;
+  else
+    sps->chroma_array_type = sps->chroma_format_idc;
+
+  /* Calculate  width and height */
+  sps->width = sps->pic_width_in_luma_samples;
+  sps->height = sps->pic_height_in_luma_samples;
+  if (sps->width < 0 || sps->height < 0) {
+    GST_WARNING ("invalid width/height in SPS");
+    goto error;
+  }
+
+  if (sps->conformance_window_flag) {
+    const guint crop_unit_x = subwc[sps->chroma_format_idc];
+    const guint crop_unit_y = subhc[sps->chroma_format_idc];
+
+    sps->crop_rect_width = sps->width -
+        (sps->conf_win_left_offset + sps->conf_win_right_offset) * crop_unit_x;
+    sps->crop_rect_height = sps->height -
+        (sps->conf_win_top_offset + sps->conf_win_bottom_offset) * crop_unit_y;
+    sps->crop_rect_x = sps->conf_win_left_offset * crop_unit_x;
+    sps->crop_rect_y = sps->conf_win_top_offset * crop_unit_y;
+
+    GST_LOG ("crop_rectangle x=%u y=%u width=%u, height=%u", sps->crop_rect_x,
+        sps->crop_rect_y, sps->crop_rect_width, sps->crop_rect_height);
+  }
+
+  sps->fps_num = 0;
+  sps->fps_den = 1;
+
+  if (vui && vui->timing_info_present_flag) {
+    /* derive framerate for progressive stream if the pic_struct
+     * syntax element is not present in picture timing SEI messages */
+    /* Fixme: handle other cases also */
+    if (parse_vui_params && vui->timing_info_present_flag
+        && !vui->field_seq_flag && !vui->frame_field_info_present_flag) {
+      sps->fps_num = vui->time_scale;
+      sps->fps_den = vui->num_units_in_tick;
+      GST_LOG ("framerate %d/%d", sps->fps_num, sps->fps_den);
+    }
+  } else {
+    GST_LOG ("No VUI, unknown framerate");
+  }
+
+  sps->valid = TRUE;
+
+  return GST_H265_PARSER_OK;
+
+error:
+  GST_WARNING ("error parsing \"Sequence parameter set\"");
+  sps->valid = FALSE;
+  return GST_H265_PARSER_ERROR;
+}
+
+/**
+ * gst_h265_parse_pps:
+ * @parser: a #GstH265Parser
+ * @nalu: The #GST_H265_NAL_PPS #GstH265NalUnit to parse
+ * @pps: The #GstH265PPS to fill.
+ *
+ * Parses @data, and fills the @pps structure.
+ *
+ * Returns: a #GstH265ParserResult
+ */
+GstH265ParserResult
+gst_h265_parse_pps (GstH265Parser * parser, GstH265NalUnit * nalu,
+    GstH265PPS * pps)
+{
+  NalReader nr;
+  GstH265SPS *sps;
+  gint sps_id;
+  gint qp_bd_offset;
+  guint8 i;
+
+  INITIALIZE_DEBUG_CATEGORY;
+  GST_DEBUG ("parsing PPS");
+
+  nal_reader_init (&nr, nalu->data + nalu->offset + nalu->header_bytes,
+      nalu->size - nalu->header_bytes);
+
+  READ_UE_MAX (&nr, pps->id, GST_H265_MAX_PPS_COUNT - 1);
+  READ_UE_MAX (&nr, sps_id, GST_H265_MAX_SPS_COUNT - 1);
+
+  sps = gst_h265_parser_get_sps (parser, sps_id);
+  if (!sps) {
+    GST_WARNING ("couldn't find associated sequence parameter set with id: %d",
+        sps_id);
+    return GST_H265_PARSER_BROKEN_LINK;
+  }
+  pps->sps = sps;
+  qp_bd_offset = 6 * sps->bit_depth_luma_minus8;
+
+  /* set default values for fields that might not be present in the bitstream
+     and have valid defaults */
+  pps->diff_cu_qp_delta_depth = 0;
+  pps->num_tile_columns_minus1 = 0;
+  pps->num_tile_rows_minus1 = 0;
+  pps->uniform_spacing_flag = 1;
+  pps->loop_filter_across_tiles_enabled_flag = 1;
+  pps->deblocking_filter_override_enabled_flag = 0;
+  pps->deblocking_filter_disabled_flag = 0;
+  pps->beta_offset_div2 = 0;
+  pps->tc_offset_div2 = 0;
+
+  READ_UINT8 (&nr, pps->dependent_slice_segments_enabled_flag, 1);
+  READ_UINT8 (&nr, pps->output_flag_present_flag, 1);
+  READ_UINT8 (&nr, pps->num_extra_slice_header_bits, 3);
+  READ_UINT8 (&nr, pps->sign_data_hiding_enabled_flag, 1);
+  READ_UINT8 (&nr, pps->cabac_init_present_flag, 1);
+
+  READ_UE_MAX (&nr, pps->num_ref_idx_l0_default_active_minus1, 14);
+  READ_UE_MAX (&nr, pps->num_ref_idx_l1_default_active_minus1, 14);
+  READ_SE_ALLOWED (&nr, pps->init_qp_minus26, -(26 + qp_bd_offset), 25);
+
+  READ_UINT8 (&nr, pps->constrained_intra_pred_flag, 1);
+  READ_UINT8 (&nr, pps->transform_skip_enabled_flag, 1);
+
+  READ_UINT8 (&nr, pps->cu_qp_delta_enabled_flag, 1);
+  if (pps->cu_qp_delta_enabled_flag)
+    READ_UE_MAX (&nr, pps->diff_cu_qp_delta_depth,
+        sps->log2_diff_max_min_luma_coding_block_size);
+
+  READ_SE_ALLOWED (&nr, pps->cb_qp_offset, -12, 12);
+  READ_SE_ALLOWED (&nr, pps->cr_qp_offset, -12, 12);
+
+  READ_UINT8 (&nr, pps->slice_chroma_qp_offsets_present_flag, 1);
+  READ_UINT8 (&nr, pps->weighted_pred_flag, 1);
+  READ_UINT8 (&nr, pps->weighted_bipred_flag, 1);
+  READ_UINT8 (&nr, pps->transquant_bypass_enabled_flag, 1);
+  READ_UINT8 (&nr, pps->tiles_enabled_flag, 1);
+  READ_UINT8 (&nr, pps->entropy_coding_sync_enabled_flag, 1);
+
+  if (pps->tiles_enabled_flag) {
+    READ_UE_ALLOWED (&nr, pps->num_tile_columns_minus1, 0, 19);
+    READ_UE_ALLOWED (&nr, pps->num_tile_rows_minus1, 0, 21);
+
+    READ_UINT8 (&nr, pps->uniform_spacing_flag, 1);
+    if (!pps->uniform_spacing_flag) {
+      for (i = 0; i < pps->num_tile_columns_minus1; i++)
+        READ_UE (&nr, pps->column_width_minus1[i]);
+
+      for (i = 0; i < pps->num_tile_rows_minus1; i++)
+        READ_UE (&nr, pps->row_height_minus1[i]);
+    }
+    READ_UINT8 (&nr, pps->loop_filter_across_tiles_enabled_flag, 1);
+  }
+
+  READ_UINT8 (&nr, pps->loop_filter_across_slices_enabled_flag, 1);
+
+  READ_UINT8 (&nr, pps->deblocking_filter_control_present_flag, 1);
+  if (pps->deblocking_filter_control_present_flag) {
+    READ_UINT8 (&nr, pps->deblocking_filter_override_enabled_flag, 1);
+
+    READ_UINT8 (&nr, pps->deblocking_filter_disabled_flag, 1);
+    if (!pps->deblocking_filter_disabled_flag) {
+      READ_SE_ALLOWED (&nr, pps->beta_offset_div2, -6, 6);
+      READ_SE_ALLOWED (&nr, pps->tc_offset_div2, -6, +6);
+    }
+  }
+
+  READ_UINT8 (&nr, pps->scaling_list_data_present_flag, 1);
+  if (pps->scaling_list_data_present_flag)
+    if (!gst_h265_parser_parse_scaling_lists (&nr, &pps->scaling_list, FALSE))
+      goto error;
+  if (sps->scaling_list_enabled_flag && !sps->scaling_list_data_present_flag
+      && !pps->scaling_list_data_present_flag)
+    if (!gst_h265_parser_parse_scaling_lists (&nr, &pps->scaling_list, TRUE))
+      goto error;
+
+  READ_UINT8 (&nr, pps->lists_modification_present_flag, 1);
+  READ_UE_MAX (&nr, pps->log2_parallel_merge_level_minus2, 4);
+  READ_UINT8 (&nr, pps->slice_segment_header_extension_present_flag, 1);
+  READ_UINT8 (&nr, pps->pps_extension_flag, 1);
+
+  pps->valid = TRUE;
+  return GST_H265_PARSER_OK;
+
+error:
+  GST_WARNING ("error parsing \"Picture parameter set\"");
+  pps->valid = FALSE;
+  return GST_H265_PARSER_ERROR;
+}
+
+/**
+ * gst_h265_parser_parse_pps:
+ * @parser: a #GstH265Parser
+ * @nalu: The #GST_H265_NAL_PPS #GstH265NalUnit to parse
+ * @pps: The #GstH265PPS to fill.
+ *
+ * Parses @data, and fills the @pps structure.
+ *
+ * Returns: a #GstH265ParserResult
+ */
+GstH265ParserResult
+gst_h265_parser_parse_pps (GstH265Parser * parser,
+    GstH265NalUnit * nalu, GstH265PPS * pps)
+{
+  GstH265ParserResult res = gst_h265_parse_pps (parser, nalu, pps);
+  if (res == GST_H265_PARSER_OK) {
+    GST_DEBUG ("adding picture parameter set with id: %d to array", pps->id);
+
+    parser->pps[pps->id] = *pps;
+    parser->last_pps = &parser->pps[pps->id];
+  }
+
+  return res;
+}
+
+/**
+ * gst_h265_parser_parse_slice_hdr:
+ * @parser: a #GstH265Parser
+ * @nalu: The #GST_H265_NAL_SLICE #GstH265NalUnit to parse
+ * @slice: The #GstH265SliceHdr to fill.
+ *
+ * Parses @data, and fills the @slice structure.
+ * The resulting @slice_hdr structure shall be deallocated with
+ * gst_h265_slice_hdr_free() when it is no longer needed
+ *
+ * Returns: a #GstH265ParserResult
+ */
+GstH265ParserResult
+gst_h265_parser_parse_slice_hdr (GstH265Parser * parser,
+    GstH265NalUnit * nalu, GstH265SliceHdr * slice)
+{
+  NalReader nr;
+  gint pps_id;
+  GstH265PPS *pps;
+  GstH265SPS *sps;
+  guint i;
+  guint CurrRpsIdx = 0;
+  GstH265ShortTermRefPicSet *stRPS = NULL;
+  guint32 UsedByCurrPicLt[16];
+  guint32 PicSizeInCtbsY;
+  guint32 PicWidthInCtbsY;
+  guint32 PicHeightInCtbsY;
+  guint32 CtbSizeY;
+  guint32 MinCbLog2SizeY;
+  guint32 CtbLog2SizeY;
+  gint NumPocTotalCurr = 0;
+
+  if (!nalu->size) {
+    GST_DEBUG ("Invalid Nal Unit");
+    return GST_H265_PARSER_ERROR;
+  }
+
+  nal_reader_init (&nr, nalu->data + nalu->offset + nalu->header_bytes,
+      nalu->size - nalu->header_bytes);
+
+  GST_DEBUG ("parsing \"Slice header\", slice type");
+
+  READ_UINT8 (&nr, slice->first_slice_segment_in_pic_flag, 1);
+
+  if (nalu->type >= GST_H265_NAL_SLICE_BLA_W_LP
+      && nalu->type <= RESERVED_IRAP_NAL_TYPE_MAX)
+    READ_UINT8 (&nr, slice->no_output_of_prior_pics_flag, 1);
+
+  READ_UE_MAX (&nr, pps_id, GST_H265_MAX_PPS_COUNT - 1);
+  pps = gst_h265_parser_get_pps (parser, pps_id);
+  if (!pps) {
+    GST_WARNING
+        ("couldn't find associated picture parameter set with id: %d", pps_id);
+    return GST_H265_PARSER_BROKEN_LINK;
+  }
+
+  slice->pps = pps;
+  sps = pps->sps;
+  if (!sps) {
+    GST_WARNING
+        ("couldn't find associated sequence parameter set with id: %d",
+        pps->id);
+    return GST_H265_PARSER_BROKEN_LINK;
+  }
+
+  MinCbLog2SizeY = sps->log2_min_luma_coding_block_size_minus3 + 3;
+  CtbLog2SizeY = MinCbLog2SizeY + sps->log2_diff_max_min_luma_coding_block_size;
+  CtbSizeY = 1 << CtbLog2SizeY;
+  PicHeightInCtbsY =
+      ceil ((gdouble) sps->pic_height_in_luma_samples / (gdouble) CtbSizeY);
+  PicWidthInCtbsY =
+      ceil ((gdouble) sps->pic_width_in_luma_samples / (gdouble) CtbSizeY);
+  PicSizeInCtbsY = PicWidthInCtbsY * PicHeightInCtbsY;
+  /* set default values for fields that might not be present in the bitstream
+   * and have valid defaults */
+  slice->dependent_slice_segment_flag = 0;
+  slice->segment_address = 0;
+  slice->pic_output_flag = 1;
+  slice->pic_order_cnt_lsb = 0;
+  slice->short_term_ref_pic_set_idx = 0;
+  slice->num_long_term_sps = 0;
+  slice->num_long_term_pics = 0;
+  for (i = 0; i < 16; i++) {
+    slice->lt_idx_sps[i] = 0;
+    slice->delta_poc_msb_cycle_lt[i] = 0;
+  }
+  slice->temporal_mvp_enabled_flag = 0;
+  slice->sao_luma_flag = 0;
+  slice->sao_chroma_flag = 0;
+  slice->cabac_init_flag = 0;
+  slice->collocated_from_l0_flag = 1;
+  slice->cb_qp_offset = 0;
+  slice->cr_qp_offset = 0;
+  slice->deblocking_filter_override_flag = 0;
+  slice->deblocking_filter_disabled_flag = 0;
+  slice->beta_offset_div2 = pps->beta_offset_div2;
+  slice->tc_offset_div2 = pps->tc_offset_div2;
+  slice->loop_filter_across_slices_enabled_flag =
+      pps->loop_filter_across_slices_enabled_flag;
+  slice->num_entry_point_offsets = 0;
+  slice->entry_point_offset_minus1 = NULL;
+
+  if (!slice->first_slice_segment_in_pic_flag) {
+    const guint n = ceil_log2 (PicSizeInCtbsY);
+
+    if (pps->dependent_slice_segments_enabled_flag)
+      READ_UINT8 (&nr, slice->dependent_slice_segment_flag, 1);
+    /* sice_segment_address parsing */
+    READ_UINT32 (&nr, slice->segment_address, n);
+  }
+
+  if (!slice->dependent_slice_segment_flag) {
+    for (i = 0; i < pps->num_extra_slice_header_bits; i++)
+      nal_reader_skip (&nr, 1);
+    READ_UE_MAX (&nr, slice->type, 63);
+
+
+    if (pps->output_flag_present_flag)
+      READ_UINT8 (&nr, slice->pic_output_flag, 1);
+    if (sps->separate_colour_plane_flag == 1)
+      READ_UINT8 (&nr, slice->colour_plane_id, 2);
+
+    if ((nalu->type != GST_H265_NAL_SLICE_IDR_W_RADL)
+        && (nalu->type != GST_H265_NAL_SLICE_IDR_N_LP)) {
+      READ_UINT16 (&nr, slice->pic_order_cnt_lsb,
+          (sps->log2_max_pic_order_cnt_lsb_minus4 + 4));
+
+      READ_UINT8 (&nr, slice->short_term_ref_pic_set_sps_flag, 1);
+      if (!slice->short_term_ref_pic_set_sps_flag) {
+        if (!gst_h265_parser_parse_short_term_ref_pic_sets
+            (&slice->short_term_ref_pic_sets, &nr,
+                sps->num_short_term_ref_pic_sets, sps))
+          goto error;
+      } else if (sps->num_short_term_ref_pic_sets > 1) {
+        const guint n = ceil_log2 (sps->num_short_term_ref_pic_sets);
+        READ_UINT8 (&nr, slice->short_term_ref_pic_set_idx, n);
+        CHECK_ALLOWED_MAX (slice->short_term_ref_pic_set_idx,
+            sps->num_short_term_ref_pic_sets - 1);
+      }
+
+      if (sps->long_term_ref_pics_present_flag) {
+        guint32 limit;
+
+        if (sps->num_long_term_ref_pics_sps > 0)
+          READ_UE_MAX (&nr, slice->num_long_term_sps,
+              sps->num_long_term_ref_pics_sps);
+
+        READ_UE_MAX (&nr, slice->num_long_term_pics, 16);
+        limit = slice->num_long_term_sps + slice->num_long_term_pics;
+        for (i = 0; i < limit; i++) {
+          if (i < slice->num_long_term_sps) {
+            if (sps->num_long_term_ref_pics_sps > 1) {
+              const guint n = ceil_log2 (sps->num_long_term_ref_pics_sps);
+              READ_UINT8 (&nr, slice->lt_idx_sps[i], n);
+            }
+          } else {
+            READ_UINT32 (&nr, slice->poc_lsb_lt[i],
+                (sps->log2_max_pic_order_cnt_lsb_minus4 + 4));
+            READ_UINT8 (&nr, slice->used_by_curr_pic_lt_flag[i], 1);
+          }
+
+          /* calculate UsedByCurrPicLt */
+          if (i < slice->num_long_term_sps)
+            UsedByCurrPicLt[i] =
+                sps->used_by_curr_pic_lt_sps_flag[slice->lt_idx_sps[i]];
+          else
+            UsedByCurrPicLt[i] = slice->used_by_curr_pic_lt_flag[i];
+          READ_UINT8 (&nr, slice->delta_poc_msb_present_flag[i], 1);
+          if (slice->delta_poc_msb_present_flag[i])
+            READ_UE (&nr, slice->delta_poc_msb_cycle_lt[i]);
+        }
+      }
+      if (sps->temporal_mvp_enabled_flag)
+        READ_UINT8 (&nr, slice->temporal_mvp_enabled_flag, 1);
+    }
+
+    if (sps->sample_adaptive_offset_enabled_flag) {
+      READ_UINT8 (&nr, slice->sao_luma_flag, 1);
+      READ_UINT8 (&nr, slice->sao_chroma_flag, 1);
+    }
+
+    if (GST_H265_IS_B_SLICE (slice) || GST_H265_IS_P_SLICE (slice)) {
+      READ_UINT8 (&nr, slice->num_ref_idx_active_override_flag, 1);
+
+      if (slice->num_ref_idx_active_override_flag) {
+        READ_UE_MAX (&nr, slice->num_ref_idx_l0_active_minus1, 14);
+        if (GST_H265_IS_B_SLICE (slice))
+          READ_UE_MAX (&nr, slice->num_ref_idx_l1_active_minus1, 14);
+      } else {
+        /*set default values */
+        slice->num_ref_idx_l0_active_minus1 =
+            pps->num_ref_idx_l0_default_active_minus1;
+        slice->num_ref_idx_l1_active_minus1 =
+            pps->num_ref_idx_l1_default_active_minus1;
+      }
+
+      /* calculate NumPocTotalCurr */
+      if (slice->short_term_ref_pic_set_sps_flag)
+        CurrRpsIdx = slice->short_term_ref_pic_set_idx;
+      else
+        CurrRpsIdx = sps->num_short_term_ref_pic_sets;
+      stRPS = &sps->short_term_ref_pic_set[CurrRpsIdx];
+      for (i = 0; i < stRPS->NumNegativePics; i++)
+        if (stRPS->UsedByCurrPicS0[i])
+          NumPocTotalCurr++;
+      for (i = 0; i < stRPS->NumPositivePics; i++)
+        if (stRPS->UsedByCurrPicS1[i])
+          NumPocTotalCurr++;
+      for (i = 0;
+          i < (slice->num_long_term_sps + slice->num_long_term_pics); i++)
+        if (UsedByCurrPicLt[i])
+          NumPocTotalCurr++;
+      slice->NumPocTotalCurr = NumPocTotalCurr;
+
+      if (pps->lists_modification_present_flag) {
+        if (NumPocTotalCurr > 1)
+          if (!gst_h265_slice_parse_ref_pic_list_modification (slice, &nr,
+                  NumPocTotalCurr))
+            goto error;
+      }
+
+      if (GST_H265_IS_B_SLICE (slice))
+        READ_UINT8 (&nr, slice->mvd_l1_zero_flag, 1);
+      if (pps->cabac_init_present_flag)
+        READ_UINT8 (&nr, slice->cabac_init_flag, 1);
+      if (slice->temporal_mvp_enabled_flag) {
+        if (GST_H265_IS_B_SLICE (slice))
+          READ_UINT8 (&nr, slice->collocated_from_l0_flag, 1);
+
+        if ((slice->collocated_from_l0_flag
+                && slice->num_ref_idx_l0_active_minus1 > 0)
+            || (!slice->collocated_from_l0_flag
+                && slice->num_ref_idx_l1_active_minus1 > 0)) {
+
+          /*fixme: add optimization */
+          if ((GST_H265_IS_P_SLICE (slice))
+              || ((GST_H265_IS_B_SLICE (slice))
+                  && (slice->collocated_from_l0_flag))) {
+            READ_UE_MAX (&nr, slice->collocated_ref_idx,
+                slice->num_ref_idx_l0_active_minus1);
+          } else if ((GST_H265_IS_B_SLICE (slice))
+              && (!slice->collocated_from_l0_flag)) {
+            READ_UE_MAX (&nr, slice->collocated_ref_idx,
+                slice->num_ref_idx_l1_active_minus1);
+          }
+        }
+      }
+      if ((pps->weighted_pred_flag && GST_H265_IS_P_SLICE (slice)) ||
+          (pps->weighted_bipred_flag && GST_H265_IS_B_SLICE (slice)))
+        if (!gst_h265_slice_parse_pred_weight_table (slice, &nr))
+          goto error;
+      READ_UE_MAX (&nr, slice->five_minus_max_num_merge_cand, 4);
+    }
+
+    READ_SE_ALLOWED (&nr, slice->qp_delta, -87, 77);
+    if (pps->slice_chroma_qp_offsets_present_flag) {
+      READ_SE_ALLOWED (&nr, slice->cb_qp_offset, -12, 12);
+      READ_SE_ALLOWED (&nr, slice->cr_qp_offset, -12, 12);
+    }
+
+    if (pps->deblocking_filter_override_enabled_flag)
+      READ_UINT8 (&nr, slice->deblocking_filter_override_flag, 1);
+    if (slice->deblocking_filter_override_flag) {
+      READ_UINT8 (&nr, slice->deblocking_filter_disabled_flag, 1);
+      if (!slice->deblocking_filter_disabled_flag) {
+        READ_SE_ALLOWED (&nr, slice->beta_offset_div2, -6, 6);
+        READ_SE_ALLOWED (&nr, slice->tc_offset_div2, -6, 6);
+      }
+    }
+
+    if (pps->loop_filter_across_slices_enabled_flag &&
+        (slice->sao_luma_flag || slice->sao_chroma_flag ||
+            !slice->deblocking_filter_disabled_flag))
+      READ_UINT8 (&nr, slice->loop_filter_across_slices_enabled_flag, 1);
+  }
+
+  if (pps->tiles_enabled_flag || pps->entropy_coding_sync_enabled_flag) {
+    guint32 offset_max;
+
+    if (!pps->tiles_enabled_flag && pps->entropy_coding_sync_enabled_flag)
+      offset_max = PicHeightInCtbsY - 1;
+    else if (pps->tiles_enabled_flag && !pps->entropy_coding_sync_enabled_flag)
+      offset_max =
+          (pps->num_tile_columns_minus1 + 1) * (pps->num_tile_rows_minus1 + 1) -
+          1;
+    else
+      offset_max = (pps->num_tile_columns_minus1 + 1) * PicHeightInCtbsY - 1;
+
+    READ_UE_MAX (&nr, slice->num_entry_point_offsets, offset_max);
+    if (slice->num_entry_point_offsets > 0) {
+      READ_UE_MAX (&nr, slice->offset_len_minus1, 31);
+      slice->entry_point_offset_minus1 =
+          g_new0 (guint32, slice->num_entry_point_offsets);
+      for (i = 0; i < slice->num_entry_point_offsets; i++)
+        READ_UINT32 (&nr, slice->entry_point_offset_minus1[i],
+            (slice->offset_len_minus1 + 1));
+    }
+  }
+
+  if (pps->slice_segment_header_extension_present_flag) {
+    guint16 slice_segment_header_extension_length;
+    READ_UE_MAX (&nr, slice_segment_header_extension_length, 256);
+    for (i = 0; i < slice_segment_header_extension_length; i++)
+      if (!nal_reader_skip (&nr, 8))
+        goto error;
+  }
+
+  /* Skip the byte alignment bits */
+  if (!nal_reader_skip (&nr, 1))
+    goto error;
+  while (!nal_reader_is_byte_aligned (&nr)) {
+    if (!nal_reader_skip (&nr, 1))
+      goto error;
+  }
+
+  slice->header_size = nal_reader_get_pos (&nr);
+  slice->n_emulation_prevention_bytes = nal_reader_get_epb_count (&nr);
+
+  return GST_H265_PARSER_OK;
+
+error:
+  GST_WARNING ("error parsing \"Slice header\"");
+
+  gst_h265_slice_hdr_free (slice);
+
+  return GST_H265_PARSER_ERROR;
+}
+
+static gboolean
+nal_reader_has_more_data_in_payload (NalReader * nr,
+    guint32 payload_start_pos_bit, guint32 payloadSize)
+{
+  if (nal_reader_is_byte_aligned (nr) &&
+      (nal_reader_get_pos (nr) == (payload_start_pos_bit + 8 * payloadSize)))
+    return FALSE;
+
+  return TRUE;
+}
+
+static GstH265ParserResult
+gst_h265_parser_parse_sei_message (GstH265Parser * parser,
+    guint8 nal_type, NalReader * nr, GstH265SEIMessage * sei)
+{
+  guint32 payloadSize;
+  guint8 payload_type_byte, payload_size_byte;
+  guint remaining, payload_size;
+  guint32 payload_start_pos_bit;
+  GstH265ParserResult res = GST_H265_PARSER_OK;
+
+  GST_DEBUG ("parsing \"Sei message\"");
+
+  sei->payloadType = 0;
+  do {
+    READ_UINT8 (nr, payload_type_byte, 8);
+    sei->payloadType += payload_type_byte;
+  } while (payload_type_byte == 0xff);
+  payloadSize = 0;
+  do {
+    READ_UINT8 (nr, payload_size_byte, 8);
+    payloadSize += payload_size_byte;
+  }
+  while (payload_size_byte == 0xff);
+
+  remaining = nal_reader_get_remaining (nr);
+  payload_size = payloadSize * 8 < remaining ? payloadSize * 8 : remaining;
+
+  payload_start_pos_bit = nal_reader_get_pos (nr);
+  GST_DEBUG
+      ("SEI message received: payloadType  %u, payloadSize = %u bytes",
+      sei->payloadType, payload_size);
+
+  if (nal_type == GST_H265_NAL_PREFIX_SEI) {
+    switch (sei->payloadType) {
+      case GST_H265_SEI_BUF_PERIOD:
+        /* size not set; might depend on emulation_prevention_three_byte */
+        res = gst_h265_parser_parse_buffering_period (parser,
+            &sei->payload.buffering_period, nr);
+        break;
+      case GST_H265_SEI_PIC_TIMING:
+        /* size not set; might depend on emulation_prevention_three_byte */
+        res = gst_h265_parser_parse_pic_timing (parser,
+            &sei->payload.pic_timing, nr);
+        break;
+      default:
+        /* Just consume payloadSize bytes, which does not account for
+           emulation prevention bytes */
+        if (!nal_reader_skip_long (nr, payload_size))
+          goto error;
+        res = GST_H265_PARSER_OK;
+        break;
+    }
+  } else if (nal_type == GST_H265_NAL_SUFFIX_SEI) {
+    switch (sei->payloadType) {
+      default:
+        /* Just consume payloadSize bytes, which does not account for
+           emulation prevention bytes */
+        if (!nal_reader_skip_long (nr, payload_size))
+          goto error;
+        res = GST_H265_PARSER_OK;
+        break;
+    }
+  }
+
+  /* Not parsing the reserved_payload_extension, but it shouldn't be
+   * an issue because of 1: There shall not be any reserved_payload_extension
+   * present in bitstreams conforming to the specification.2. Even though
+   * it is present, the size will be less than total PayloadSize since the
+   * size of reserved_payload_extension is supposed to be
+   * 8 * payloadSize - nEarlierBits - nPayloadZeroBits -1 which means the
+   * the current implementation will still skip all unnecessary bits correctly.
+   * In theory, we can have a more optimized implementation by skipping the
+   * data left in PayLoadSize without out individually checking for each bits,
+   * since the totoal size will be always less than payloadSize*/
+  if (nal_reader_has_more_data_in_payload (nr, payload_start_pos_bit,
+          payloadSize)) {
+    /* Skip the byte alignment bits */
+    if (!nal_reader_skip (nr, 1))
+      goto error;
+    while (!nal_reader_is_byte_aligned (nr)) {
+      if (!nal_reader_skip (nr, 1))
+        goto error;
+    }
+  }
+
+  return res;
+
+error:
+  GST_WARNING ("error parsing \"Sei message\"");
+  return GST_H265_PARSER_ERROR;
+}
+
+/**
+ * gst_h265_slice_hdr_copy:
+ * @dst_slice: The destination #GstH265SliceHdr to copy into
+ * @src_slice: The source #GstH265SliceHdr to copy from
+ *
+ * Copies @src_slice into @dst_slice
+ *
+ * Returns: %TRUE if everything went fine, %FALSE otherwise
+ */
+gboolean
+gst_h265_slice_hdr_copy (GstH265SliceHdr * dst_slice,
+    const GstH265SliceHdr * src_slice)
+{
+  guint i;
+
+  g_return_val_if_fail (dst_slice != NULL, FALSE);
+  g_return_val_if_fail (src_slice != NULL, FALSE);
+
+  gst_h265_slice_hdr_free (dst_slice);
+
+  *dst_slice = *src_slice;
+
+  if (dst_slice->num_entry_point_offsets > 0) {
+    dst_slice->entry_point_offset_minus1 =
+        g_new0 (guint32, dst_slice->num_entry_point_offsets);
+    for (i = 0; i < dst_slice->num_entry_point_offsets; i++)
+      dst_slice->entry_point_offset_minus1[i] =
+          src_slice->entry_point_offset_minus1[i];
+  }
+
+  return TRUE;
+}
+
+/**
+ * gst_h265_slice_hdr_free:
+ * slice_hdr: The #GstH265SliceHdr to free
+ *
+ * Frees @slice_hdr fields.
+ */
+void
+gst_h265_slice_hdr_free (GstH265SliceHdr * slice_hdr)
+{
+  g_return_if_fail (slice_hdr != NULL);
+
+  if (slice_hdr->num_entry_point_offsets > 0)
+    g_free (slice_hdr->entry_point_offset_minus1);
+  slice_hdr->entry_point_offset_minus1 = 0;
+}
+
+/**
+ * gst_h265_sei_copy:
+ * @dst_sei: The destination #GstH265SEIMessage to copy into
+ * @src_sei: The source #GstH265SEIMessage to copy from
+ *
+ * Copies @src_sei into @dst_sei
+ *
+ * Returns: %TRUE if everything went fine, %FALSE otherwise
+ */
+gboolean
+gst_h265_sei_copy (GstH265SEIMessage * dst_sei,
+    const GstH265SEIMessage * src_sei)
+{
+  guint i;
+
+  g_return_val_if_fail (dst_sei != NULL, FALSE);
+  g_return_val_if_fail (src_sei != NULL, FALSE);
+
+  gst_h265_sei_free (dst_sei);
+
+  *dst_sei = *src_sei;
+
+  if (dst_sei->payloadType == GST_H265_SEI_PIC_TIMING) {
+    GstH265PicTiming *dst_pic_timing = &dst_sei->payload.pic_timing;
+    const GstH265PicTiming *src_pic_timing = &src_sei->payload.pic_timing;
+
+    if (dst_pic_timing->num_decoding_units_minus1 > 0) {
+      dst_pic_timing->num_nalus_in_du_minus1 =
+          g_new0 (guint32, (dst_pic_timing->num_decoding_units_minus1 + 1));
+      dst_pic_timing->du_cpb_removal_delay_increment_minus1 =
+          g_new0 (guint8, (dst_pic_timing->num_decoding_units_minus1 + 1));
+
+      for (i = 0; i <= dst_pic_timing->num_decoding_units_minus1; i++) {
+        dst_pic_timing->num_nalus_in_du_minus1[i] =
+            src_pic_timing->num_nalus_in_du_minus1[i];
+        dst_pic_timing->du_cpb_removal_delay_increment_minus1[i] =
+            src_pic_timing->du_cpb_removal_delay_increment_minus1[i];
+      }
+    }
+  }
+
+  return TRUE;
+}
+
+/**
+ * gst_h265_sei_free:
+ * sei: The #GstH265SEIMessage to free
+ *
+ * Frees @sei fields.
+ */
+void
+gst_h265_sei_free (GstH265SEIMessage * sei)
+{
+  g_return_if_fail (sei != NULL);
+
+  if (sei->payloadType == GST_H265_SEI_PIC_TIMING) {
+    GstH265PicTiming *pic_timing = &sei->payload.pic_timing;
+    if (pic_timing->num_decoding_units_minus1 > 0) {
+      g_free (pic_timing->num_nalus_in_du_minus1);
+      g_free (pic_timing->du_cpb_removal_delay_increment_minus1);
+    }
+    pic_timing->num_nalus_in_du_minus1 = 0;
+    pic_timing->du_cpb_removal_delay_increment_minus1 = 0;
+  }
+}
+
+/**
+ * gst_h265_parser_parse_sei:
+ * @nalparser: a #GstH265Parser
+ * @nalu: The #GST_H265_NAL_SEI #GstH265NalUnit to parse
+ * @messages: The GArray of #GstH265SEIMessage to fill. The caller must free it when done.
+ *
+ * Parses @data, create and fills the @messages array.
+ *
+ * Returns: a #GstH265ParserResult
+ */
+GstH265ParserResult
+gst_h265_parser_parse_sei (GstH265Parser * nalparser, GstH265NalUnit * nalu,
+    GArray ** messages)
+{
+  NalReader nr;
+  GstH265SEIMessage sei;
+  GstH265ParserResult res;
+
+  GST_DEBUG ("parsing SEI nal");
+  nal_reader_init (&nr, nalu->data + nalu->offset + nalu->header_bytes,
+      nalu->size - nalu->header_bytes);
+  *messages = g_array_new (FALSE, FALSE, sizeof (GstH265SEIMessage));
+  g_array_set_clear_func (*messages, (GDestroyNotify) gst_h265_sei_free);
+
+  do {
+    res = gst_h265_parser_parse_sei_message (nalparser, nalu->type, &nr, &sei);
+    if (res == GST_H265_PARSER_OK)
+      g_array_append_val (*messages, sei);
+    else
+      break;
+  } while (nal_reader_has_more_data (&nr));
+
+  return res;
+}
+
+
+/**
+ * gst_h265_quant_matrix_4x4_get_zigzag_from_raster:
+ * @out_quant: (out): The resulting quantization matrix
+ * @quant: The source quantization matrix
+ *
+ * Converts quantization matrix @quant from raster scan order to
+ * zigzag scan order and store the resulting factors into @out_quant.
+ *
+ * Note: it is an error to pass the same table in both @quant and
+ * @out_quant arguments.
+ *
+ * Since: 1.6
+ */
+void
+gst_h265_quant_matrix_4x4_get_zigzag_from_raster (guint8 out_quant[16],
+    const guint8 quant[16])
+{
+  guint i;
+
+  g_return_if_fail (out_quant != quant);
+
+  for (i = 0; i < 16; i++)
+    out_quant[i] = quant[zigzag_4x4[i]];
+}
+
+/**
+ * gst_h265_quant_matrix_4x4_get_raster_from_zigzag:
+ * @out_quant: (out): The resulting quantization matrix
+ * @quant: The source quantization matrix
+ *
+ * Converts quantization matrix @quant from zigzag scan order to
+ * raster scan order and store the resulting factors into @out_quant.
+ *
+ * Note: it is an error to pass the same table in both @quant and
+ * @out_quant arguments.
+ *
+ * Since: 1.6
+ */
+void
+gst_h265_quant_matrix_4x4_get_raster_from_zigzag (guint8 out_quant[16],
+    const guint8 quant[16])
+{
+  guint i;
+
+  g_return_if_fail (out_quant != quant);
+
+  for (i = 0; i < 16; i++)
+    out_quant[zigzag_4x4[i]] = quant[i];
+}
+
+/**
+ * gst_h265_quant_matrix_8x8_get_zigzag_from_raster:
+ * @out_quant: (out): The resulting quantization matrix
+ * @quant: The source quantization matrix
+ *
+ * Converts quantization matrix @quant from raster scan order to
+ * zigzag scan order and store the resulting factors into @out_quant.
+ *
+ * Note: it is an error to pass the same table in both @quant and
+ * @out_quant arguments.
+ *
+ * Since: 1.6
+ */
+void
+gst_h265_quant_matrix_8x8_get_zigzag_from_raster (guint8 out_quant[64],
+    const guint8 quant[64])
+{
+  guint i;
+
+  g_return_if_fail (out_quant != quant);
+
+  for (i = 0; i < 64; i++)
+    out_quant[i] = quant[zigzag_8x8[i]];
+}
+
+/**
+ * gst_h265_quant_matrix_8x8_get_raster_from_zigzag:
+ * @out_quant: (out): The resulting quantization matrix
+ * @quant: The source quantization matrix
+ *
+ * Converts quantization matrix @quant from zigzag scan order to
+ * raster scan order and store the resulting factors into @out_quant.
+ *
+ * Note: it is an error to pass the same table in both @quant and
+ * @out_quant arguments.
+ *
+ * Since: 1.6
+ */
+void
+gst_h265_quant_matrix_8x8_get_raster_from_zigzag (guint8 out_quant[64],
+    const guint8 quant[64])
+{
+  guint i;
+
+  g_return_if_fail (out_quant != quant);
+
+  for (i = 0; i < 64; i++)
+    out_quant[zigzag_8x8[i]] = quant[i];
+}
diff -Nru gstreamer-vaapi-0.5.10/ext/codecparsers/gst-libs/gst/codecparsers/gsth265parser.h gstreamer-vaapi-0.6.0/ext/codecparsers/gst-libs/gst/codecparsers/gsth265parser.h
--- gstreamer-vaapi-0.5.10/ext/codecparsers/gst-libs/gst/codecparsers/gsth265parser.h	1970-01-01 00:00:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/ext/codecparsers/gst-libs/gst/codecparsers/gsth265parser.h	2015-07-15 12:50:06.000000000 +0000
@@ -0,0 +1,1088 @@
+/* Gstreamer H.265 bitstream parser
+ * Copyright (C) 2013 Intel Corporation
+ * Copyright (C) 2013 Sreerenj Balachandran <sreerenj.balachandran@intel.com>
+ *
+ *  Contact: Sreerenj Balachandran <sreerenj.balachandran@intel.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef __GST_H265_PARSER_H__
+#define __GST_H265_PARSER_H__
+
+#ifndef GST_USE_UNSTABLE_API
+#warning "The H.265 parsing library is unstable API and may change in future."
+#warning "You can define GST_USE_UNSTABLE_API to avoid this warning."
+#endif
+
+#include <gst/gst.h>
+
+G_BEGIN_DECLS
+
+#define GST_H265_MAX_SUB_LAYERS   8
+#define GST_H265_MAX_VPS_COUNT   16
+#define GST_H265_MAX_SPS_COUNT   16
+#define GST_H265_MAX_PPS_COUNT   64
+
+#define GST_H265_IS_B_SLICE(slice)  ((slice)->type == GST_H265_B_SLICE)
+#define GST_H265_IS_P_SLICE(slice)  ((slice)->type == GST_H265_P_SLICE)
+#define GST_H265_IS_I_SLICE(slice)  ((slice)->type == GST_H265_I_SLICE)
+
+/**
+ * GstH265Profile:
+ * @GST_H265_PROFILE_MAIN: Main profile (A.3.2)
+ * @GST_H265_PROFILE_MAIN_10: Main 10 profile (A.3.3)
+ * @GST_H265_PROFILE_MAIN_STILL_PICTURE: Main Still Picture profile (A.3.4)
+ *
+ * H.265 Profiles.
+ *
+ */
+typedef enum {
+  GST_H265_PROFILE_MAIN                 = 1,
+  GST_H265_PROFILE_MAIN_10              = 2,
+  GST_H265_PROFILE_MAIN_STILL_PICTURE   = 3
+} GstH265Profile;
+
+/**
+ * GstH265NalUnitType:
+ * @GST_H265_NAL_SLICE_TRAIL_N: Slice nal of a non-TSA, non-STSA trailing picture
+ * @GST_H265_NAL_SLICE_TRAIL_R: Slice nal of a non-TSA, non-STSA trailing picture
+ * @GST_H265_NAL_SLICE_TSA_N: Slice nal of a TSA picture
+ * @GST_H265_NAL_SLICE_TSA_R: Slice nal of a TSA picture
+ * @GST_H265_NAL_SLICE_STSA_N: Slice nal of a STSA picture
+ * @GST_H265_NAL_SLICE_STSA_R: Slice nal of a STSA picture
+ * @GST_H265_NAL_SLICE_RADL_N: Slice nal of a RADL picture
+ * @GST_H265_NAL_SLICE_RADL_R: Slice nal of a RADL piicture
+ * @GST_H265_NAL_SLICE_RASL_N: Slice nal of a RASL picture
+ * @GST_H265_NAL_SLICE_RASL_R: Slice nal of a RASL picture
+ * @GST_H265_NAL_SLICE_BLA_W_LP: Slice nal of a BLA picture
+ * @GST_H265_NAL_SLICE_BLA_W_RADL: Slice nal of a BLA picture
+ * @GST_H265_NAL_SLICE_BLA_N_LP: Slice nal of a BLA picture
+ * @GST_H265_NAL_SLICE_IDR_W_RADL: Slice nal of an IDR picture
+ * @GST_H265_NAL_SLICE_IDR_N_LP: Slice nal of an IDR picture
+ * @GST_H265_NAL_SLICE_CRA_NUT: Slice nal of a CRA picture
+ * @GST_H265_NAL_VPS: Video parameter set(VPS) nal unit
+ * @GST_H265_NAL_SPS: Sequence parameter set (SPS) nal unit
+ * @GST_H265_NAL_PPS: Picture parameter set (PPS) nal unit
+ * @GST_H265_NAL_AUD: Access unit (AU) delimiter nal unit
+ * @GST_H265_NAL_EOS: End of sequence (EOS) nal unit
+ * @GST_H265_NAL_EOB: End of bitstream (EOB) nal unit
+ * @GST_H265_NAL_FD: Filler data (FD) nal lunit
+ * @GST_H265_NAL_PREFIX_SEI: Supplemental enhancement information prefix nal unit
+ * @GST_H265_NAL_SUFFIX_SEI: Suppliemental enhancement information suffix nal unit
+ *
+ * Indicates the type of H265 Nal Units
+ */
+typedef enum
+{
+  GST_H265_NAL_SLICE_TRAIL_N    = 0,
+  GST_H265_NAL_SLICE_TRAIL_R    = 1,
+  GST_H265_NAL_SLICE_TSA_N      = 2,
+  GST_H265_NAL_SLICE_TSA_R      = 3,
+  GST_H265_NAL_SLICE_STSA_N     = 4,
+  GST_H265_NAL_SLICE_STSA_R     = 5,
+  GST_H265_NAL_SLICE_RADL_N     = 6,
+  GST_H265_NAL_SLICE_RADL_R     = 7,
+  GST_H265_NAL_SLICE_RASL_N     = 8,
+  GST_H265_NAL_SLICE_RASL_R     = 9,
+  GST_H265_NAL_SLICE_BLA_W_LP   = 16,
+  GST_H265_NAL_SLICE_BLA_W_RADL = 17,
+  GST_H265_NAL_SLICE_BLA_N_LP   = 18,
+  GST_H265_NAL_SLICE_IDR_W_RADL = 19,
+  GST_H265_NAL_SLICE_IDR_N_LP   = 20,
+  GST_H265_NAL_SLICE_CRA_NUT    = 21,
+  GST_H265_NAL_VPS              = 32,
+  GST_H265_NAL_SPS              = 33,
+  GST_H265_NAL_PPS              = 34,
+  GST_H265_NAL_AUD              = 35,
+  GST_H265_NAL_EOS              = 36,
+  GST_H265_NAL_EOB              = 37,
+  GST_H265_NAL_FD               = 38,
+  GST_H265_NAL_PREFIX_SEI       = 39,
+  GST_H265_NAL_SUFFIX_SEI       = 40
+} GstH265NalUnitType;
+
+#define RESERVED_NON_IRAP_SUBLAYER_NAL_TYPE_MIN 10
+#define RESERVED_NON_IRAP_SUBLAYER_NAL_TYPE_MAX 15
+
+#define RESERVED_IRAP_NAL_TYPE_MIN 22
+#define RESERVED_IRAP_NAL_TYPE_MAX 23
+
+#define RESERVED_NON_IRAP_NAL_TYPE_MIN 24
+#define RESERVED_NON_IRAP_NAL_TYPE_MAX 31
+
+#define RESERVED_NON_VCL_NAL_TYPE_MIN 41
+#define RESERVED_NON_VCL_NAL_TYPE_MAX 47
+
+#define UNSPECIFIED_NON_VCL_NAL_TYPE_MIN 48
+#define UNSPECIFIED_NON_VCL_NAL_TYPE_MAX 63
+
+/**
+ * GstH265ParserResult:
+ * @GST_H265_PARSER_OK: The parsing succeded
+ * @GST_H265_PARSER_BROKEN_DATA: The data to parse is broken
+ * @GST_H265_PARSER_BROKEN_LINK: The link to structure needed for the parsing couldn't be found
+ * @GST_H265_PARSER_ERROR: An error accured when parsing
+ * @GST_H265_PARSER_NO_NAL: No nal found during the parsing
+ * @GST_H265_PARSER_NO_NAL_END: Start of the nal found, but not the end.
+ *
+ * The result of parsing H265 data.
+ */
+typedef enum
+{
+  GST_H265_PARSER_OK,
+  GST_H265_PARSER_BROKEN_DATA,
+  GST_H265_PARSER_BROKEN_LINK,
+  GST_H265_PARSER_ERROR,
+  GST_H265_PARSER_NO_NAL,
+  GST_H265_PARSER_NO_NAL_END
+} GstH265ParserResult;
+
+/**
+ * GstH265SEIPayloadType:
+ * @GST_H265_SEI_BUF_PERIOD: Buffering Period SEI Message
+ * @GST_H265_SEI_PIC_TIMING: Picture Timing SEI Message
+ * ...
+ *
+ * The type of SEI message.
+ */
+typedef enum
+{
+  GST_H265_SEI_BUF_PERIOD = 0,
+  GST_H265_SEI_PIC_TIMING = 1
+      /* and more...  */
+} GstH265SEIPayloadType;
+
+/**
+ * GstH265SEIPicStructType:
+ * @GST_H265_SEI_PIC_STRUCT_FRAME: Picture is a frame
+ * @GST_H265_SEI_PIC_STRUCT_TOP_FIELD: Top field of frame
+ * @GST_H265_SEI_PIC_STRUCT_BOTTOM_FIELD: Botom field of frame
+ * @GST_H265_SEI_PIC_STRUCT_TOP_BOTTOM: Top bottom field of frame
+ * @GST_H265_SEI_PIC_STRUCT_BOTTOM_TOP: bottom top field of frame
+ * @GST_H265_SEI_PIC_STRUCT_TOP_BOTTOM_TOP: top bottom top field of frame
+ * @GST_H265_SEI_PIC_STRUCT_BOTTOM_TOP_BOTTOM: bottom top bottom field of frame
+ * @GST_H265_SEI_PIC_STRUCT_FRAME_DOUBLING: indicates that the frame should
+ *  be displayed two times consecutively
+ * @GST_H265_SEI_PIC_STRUCT_FRAME_TRIPLING: indicates that the frame should be
+ *  displayed three times consecutively
+ * @GST_H265_SEI_PIC_STRUCT_TOP_PAIRED_PREVIOUS_BOTTOM: top field paired with
+ *  previous bottom field in output order
+ * @GST_H265_SEI_PIC_STRUCT_BOTTOM_PAIRED_PREVIOUS_TOP: bottom field paried with
+ *  previous top field in output order
+ * @GST_H265_SEI_PIC_STRUCT_TOP_PAIRED_NEXT_BOTTOM: top field paired with next
+ *  bottom field in output order
+ * @GST_H265_SEI_PIC_STRUCT_BOTTOM_PAIRED_NEXT_TOP: bottom field paired with
+ *  next top field in output order
+ *
+ * SEI pic_struct type
+ */
+typedef enum
+{
+  GST_H265_SEI_PIC_STRUCT_FRAME                         = 0,
+  GST_H265_SEI_PIC_STRUCT_TOP_FIELD                     = 1,
+  GST_H265_SEI_PIC_STRUCT_BOTTOM_FIELD                  = 2,
+  GST_H265_SEI_PIC_STRUCT_TOP_BOTTOM                    = 3,
+  GST_H265_SEI_PIC_STRUCT_BOTTOM_TOP                    = 4,
+  GST_H265_SEI_PIC_STRUCT_TOP_BOTTOM_TOP                = 5,
+  GST_H265_SEI_PIC_STRUCT_BOTTOM_TOP_BOTTOM             = 6,
+  GST_H265_SEI_PIC_STRUCT_FRAME_DOUBLING                = 7,
+  GST_H265_SEI_PIC_STRUCT_FRAME_TRIPLING                = 8,
+  GST_H265_SEI_PIC_STRUCT_TOP_PAIRED_PREVIOUS_BOTTOM    = 9,
+  GST_H265_SEI_PIC_STRUCT_BOTTOM_PAIRED_PREVIOUS_TOP    = 10,
+  GST_H265_SEI_PIC_STRUCT_TOP_PAIRED_NEXT_BOTTOM        = 11,
+  GST_H265_SEI_PIC_STRUCT_BOTTOM_PAIRED_NEXT_TOP        = 12
+} GstH265SEIPicStructType;
+
+/**
+ * GstH265SliceType:
+ *
+ * Type of Picture slice
+ */
+
+typedef enum
+{
+  GST_H265_B_SLICE    = 0,
+  GST_H265_P_SLICE    = 1,
+  GST_H265_I_SLICE    = 2
+} GstH265SliceType;
+
+typedef enum
+{
+  GST_H265_QUANT_MATIX_4X4   = 0,
+  GST_H265_QUANT_MATIX_8X8   = 1,
+  GST_H265_QUANT_MATIX_16X16 = 2,
+  GST_H265_QUANT_MATIX_32X32 = 3
+} GstH265QuantMatrixSize;
+
+typedef struct _GstH265Parser                   GstH265Parser;
+
+typedef struct _GstH265NalUnit                  GstH265NalUnit;
+
+typedef struct _GstH265VPS                      GstH265VPS;
+typedef struct _GstH265SPS                      GstH265SPS;
+typedef struct _GstH265PPS                      GstH265PPS;
+typedef struct _GstH265ProfileTierLevel         GstH265ProfileTierLevel;
+typedef struct _GstH265SubLayerHRDParams        GstH265SubLayerHRDParams;
+typedef struct _GstH265HRDParams                GstH265HRDParams;
+typedef struct _GstH265VUIParams                GstH265VUIParams;
+
+typedef struct _GstH265ScalingList              GstH265ScalingList;
+typedef struct _GstH265RefPicListModification   GstH265RefPicListModification;
+typedef struct _GstH265PredWeightTable          GstH265PredWeightTable;
+typedef struct _GstH265ShortTermRefPicSet       GstH265ShortTermRefPicSet;
+typedef struct _GstH265SliceHdr                 GstH265SliceHdr;
+
+typedef struct _GstH265PicTiming                GstH265PicTiming;
+typedef struct _GstH265BufferingPeriod          GstH265BufferingPeriod;
+typedef struct _GstH265SEIMessage               GstH265SEIMessage;
+
+/**
+ * GstH265NalUnit:
+ * @type: A #GstH265NalUnitType
+ * @layer_id: A nal unit layer id
+ * @temporal_id_plus1: A nal unit temporal identifier
+ * @size: The size of the nal unit starting from @offset
+ * @offset: The offset of the actual start of the nal unit
+ * @sc_offset:The offset of the start code of the nal unit
+ * @valid: If the nal unit is valid, which mean it has
+ * already been parsed
+ * @data: The data from which the Nalu has been parsed
+ *
+ * Structure defining the Nal unit headers
+ */
+struct _GstH265NalUnit
+{
+  guint8 type;
+  guint8 layer_id;
+  guint8 temporal_id_plus1;
+
+  /* calculated values */
+  guint size;
+  guint offset;
+  guint sc_offset;
+  gboolean valid;
+
+  guint8 *data;
+  guint8 header_bytes;
+};
+
+/**
+ * GstH265ProfileTierLevel:
+ * @profile_space: specifies the context for the interpretation of
+ *   general_profile_idc and general_profile_combatibility_flag
+ * @tier_flag: the tier context for the interpretation of general_level_idc
+ * @profile_idc: profile id
+ * @profile_compatibility_flag: compatibility flags
+ * @progressive_source_flag: flag to indicate the type of stream
+ * @interlaced_source_flag: flag to indicate the type of stream
+ * @non_packed_constraint_flag: indicate the presence of frame packing
+ *   arragement sei message
+ * @frame_only_constraint_flag: recognize the field_seq_flag
+ * @level idc: indicate the level which the CVS confirms
+ * @sub_layer_profile_present_flag: sublayer profile presence ind
+ * @sub_layer_level_present_flag:sublayer level presence indicator.
+ * @sub_layer_profile_space: profile space for sublayers
+ * @sub_layer_tier_flag: tier flags for sublayers.
+ * @sub_layer_profile_idc: conformant profile indicator for sublayers.
+ * @sub_layer_profile_compatibility_flag[6][32]: compatibility flags for sublayers
+ * @sub_layer_progressive_source_flag:progressive stream indicator for sublayer
+ * @sub_layer_interlaced_source_flag: interlaced stream indicator for sublayer
+ * @sub_layer_non_packed_constraint_flag: indicate the presence of
+ *   frame packing arrangement sei message with in sublayers
+ * @sub_layer_frame_only_constraint_flag:recognize the sublayer
+ *   specific field_seq_flag
+ * @sub_layer_level_idc:indicate the sublayer specific level
+ *
+ * Define ProfileTierLevel parameters
+ */
+struct _GstH265ProfileTierLevel {
+  guint8 profile_space;
+  guint8 tier_flag;
+  guint8 profile_idc;
+
+  guint8 profile_compatibility_flag[32];
+
+  guint8 progressive_source_flag;
+  guint8 interlaced_source_flag;
+  guint8 non_packed_constraint_flag;
+  guint8 frame_only_constraint_flag;
+  guint8 level_idc;
+
+  guint8 sub_layer_profile_present_flag[6];
+  guint8 sub_layer_level_present_flag[6];
+
+  guint8 sub_layer_profile_space[6];
+  guint8 sub_layer_tier_flag[6];
+  guint8 sub_layer_profile_idc[6];
+  guint8 sub_layer_profile_compatibility_flag[6][32];
+  guint8 sub_layer_progressive_source_flag[6];
+  guint8 sub_layer_interlaced_source_flag[6];
+  guint8 sub_layer_non_packed_constraint_flag[6];
+  guint8 sub_layer_frame_only_constraint_flag[6];
+  guint8 sub_layer_level_idc[6];
+};
+
+/**
+ * GstH265SubLayerHRDParams:
+ * @bit_rate_value_minus1:togeter with bit_rate_scale, it specifies
+ *   the maximum input bitrate when the CPB operates at the access
+ *   unit level
+ * @cpb_size_value_minus1: is used together with cpb_size_scale to
+ *   specify the CPB size when the CPB operates at the access unit
+ *   level
+ * @cpb_size_du_value_minus1: is used together with cpb_size_du_scale
+ *   to specify the CPB size when the CPB operates at sub-picture
+ *   level
+ * @bit_rate_du_value_minus1: together with bit_rate_scale, it
+ *   specifies the maximum input bit rate when the CPB operates at the
+ *   sub-picture level
+ * @cbr_flag: indicate whether HSS operates in intermittent bit rate
+ *   mode or constant bit rate mode.
+ *
+ * Defines the Sublayer HRD parameters
+ */
+struct _GstH265SubLayerHRDParams
+{
+  guint32 bit_rate_value_minus1[32];
+  guint32 cpb_size_value_minus1[32];
+
+  guint32 cpb_size_du_value_minus1[32];
+  guint32 bit_rate_du_value_minus1[32];
+
+  guint8 cbr_flag[32];
+};
+
+/**
+ * GstH265HRDParams:
+ * @nal_hrd_parameters_present_flag: indicate the presence of NAL HRD parameters
+ * @vcl_hrd_parameters_present_flag: indicate the presence of VCL HRD parameters
+ * @sub_pic_hrd_params_present_flag: indicate the presence of sub_pic_hrd_params
+ * @tick_divisor_minus2: is used to specify the clock sub-tick
+ * @du_cpb_removal_delay_increment_length_minus1: specifies the length,
+ *   in bits, of the nal_initial_cpb_removal_delay
+ * @sub_pic_cpb_params_in_pic_timing_sei_flag: specifies the length, in bits, of
+ *   the cpb_delay_offset and the au_cpb_removal_delay_minus1 syntax elements.
+ * @dpb_output_delay_du_length_minu1: specifies the length, in bits, of the
+ *   dpb_delay_offset and the pic_dpb_output_delay syntax elements
+ * @bit_rate_scale: maximum input bitrate
+ * @cpb_size_scale: CPB size when operates in access unit level
+ * @cpb_size_du_scale: CPB size when operates in sub-picture level
+ * @initial_cpb_removal_delay_length_minus1: specifies the length, in bits, of the
+ *   nal_initial_cpb_removal_delay, nal_initial_cpb_removal_offset,
+ *   vcl_initial_cpb_removal_delay and vcl_initial_cpb_removal_offset.
+ * @au_cpb_removal_delay_length_minus1: specifies the length, in bits, of the
+ *   cpb_delay_offset and the au_cpb_removal_delay_minus1 syntax elements
+ * @dpb_output_delay_length_minus1: specifies the length, in bits, of the
+ *   dpb_delay_offset and the pic_dpb_output_delay syntax elements
+ * @fixed_pic_rate_general_flag: flag to indicate the presence of constraint
+ *   on the temporal distance between the HRD output times of consecutive
+ *   pictures in output order
+ * @fixed_pic_rate_within_cvs_flag: same as fixed_pic_rate_general_flag
+ * @elemental_duration_in_tc_minus1: temporal distance in clock ticks
+ * @low_delay_hrd_flag: specifies the HRD operational mode
+ * @cpb_cnt_minus1:specifies the number of alternative CPS specifications.
+ * @sublayer_hrd_params: Sublayer HRD parameters.
+ *
+ * Defines the HRD parameters
+ */
+struct _GstH265HRDParams
+{
+  guint8 nal_hrd_parameters_present_flag;
+  guint8 vcl_hrd_parameters_present_flag;
+  guint8 sub_pic_hrd_params_present_flag;
+
+  guint8 tick_divisor_minus2;
+  guint8 du_cpb_removal_delay_increment_length_minus1;
+  guint8 sub_pic_cpb_params_in_pic_timing_sei_flag;
+  guint8 dpb_output_delay_du_length_minus1;
+
+  guint8 bit_rate_scale;
+  guint8 cpb_size_scale;
+  guint8 cpb_size_du_scale;
+
+  guint8 initial_cpb_removal_delay_length_minus1;
+  guint8 au_cpb_removal_delay_length_minus1;
+  guint8 dpb_output_delay_length_minus1;
+
+  guint8 fixed_pic_rate_general_flag [7];
+  guint8 fixed_pic_rate_within_cvs_flag [7];
+  guint16 elemental_duration_in_tc_minus1 [7];
+  guint8 low_delay_hrd_flag [7];
+  guint8 cpb_cnt_minus1[7];
+
+  GstH265SubLayerHRDParams sublayer_hrd_params[7];
+};
+
+/**
+ * GstH265VPS:
+ * @id: vps id
+ * @max_layers_minus1: should be zero, but can be other values in future
+ * @max_sub_layers_minus1:specifies the maximum number of temporal sub-layers
+ * @temporal_id_nesting_flag: specifies whether inter prediction is
+ *   additionally restricted
+ * @profile_tier_level: ProfileTierLevel info
+ * @sub_layer_ordering_info_present_flag: indicates the presense of
+ *   vps_max_dec_pic_buffering_minus1, vps_max_num_reorder_pics and
+ *   vps_max_latency_increase_plus1
+ * @max_dec_pic_buffering_minus1: specifies the maximum required size
+ *   of the decoded picture buffer
+ * @max_num_reorder_pics: indicates the maximum allowed number of
+ *   pictures that can precede any picture in the CVS in decoding
+ *   order
+ * @max_latency_increase_plus1: is used to compute the value of
+ *   VpsMaxLatencyPictures
+ * @max_layer_id: specifies the maximum allowed value of nuh_layer_id
+ * @num_layer_sets_minus1: specifies the number of layer sets
+ * @layer_id_included_flag: specifies whether a nuh_layer_id included
+ *   in the layer identifier list
+ * @timing_info_present_flag: indicate the presence of
+ *   num_units_in_tick, time_scale, poc_proportional_to_timing_flag
+ *   and num_hrd_parameters
+ * @num_units_in_tick: number of time units in a tick
+ * @time_scale: number of time units that pass in one second
+ * @poc_proportional_to_timing_flag: indicate whether the picture
+ *   order count is proportional to output timin
+ * @num_ticks_poc_diff_one_minus1: specifies the number of clock ticks
+ *   corresponding to a difference of picture order count values equal
+ *   to 1
+ * @num_hrd_parameters: number of hrd_parameters present
+ * @hrd_layer_set_idx: index to the list of layer hrd params.
+ * @hrd_params: the GstH265HRDParams list
+ *
+ * Defines the VPS parameters
+ */
+struct _GstH265VPS {
+  guint8 id;
+
+  guint8 max_layers_minus1;
+  guint8 max_sub_layers_minus1;
+  guint8 temporal_id_nesting_flag;
+
+  GstH265ProfileTierLevel profile_tier_level;
+
+  guint8 sub_layer_ordering_info_present_flag;
+  guint8 max_dec_pic_buffering_minus1[GST_H265_MAX_SUB_LAYERS];
+  guint8 max_num_reorder_pics[GST_H265_MAX_SUB_LAYERS];
+  guint32 max_latency_increase_plus1[GST_H265_MAX_SUB_LAYERS];
+
+  guint8 max_layer_id;
+  guint16 num_layer_sets_minus1;
+
+  guint8 timing_info_present_flag;
+  guint32 num_units_in_tick;
+  guint32 time_scale;
+  guint8 poc_proportional_to_timing_flag;
+  guint32 num_ticks_poc_diff_one_minus1;
+
+  guint16 num_hrd_parameters;
+  guint16 hrd_layer_set_idx;
+  guint8 cprms_present_flag;
+
+  GstH265HRDParams hrd_params;
+
+  guint8 vps_extension;
+
+  gboolean valid;
+};
+/**
+ * GstH265ShortTermRefPicSet:
+ * @inter_ref_pic_set_prediction_flag: %TRUE specifies that the stRpsIdx-th candidate
+ *  short-term RPS is predicted from another candidate short-term RPS
+ * @delta_idx_minus1: plus 1 specifies the difference between the value of source and
+ *  candidate short term RPS.
+ * @delta_rps_sign: delta_rps_sign and abs_delta_rps_minus1 together specify
+ *  the value of the variable deltaRps.
+ * @abs_delta_rps_minus1: delta_rps_sign and abs_delta_rps_minus1 together specify
+ *  the value of the variable deltaRps
+ *
+ * Defines the #GstH265ShortTermRefPicSet params
+ */
+struct _GstH265ShortTermRefPicSet
+{
+  guint8 inter_ref_pic_set_prediction_flag;
+  guint8 delta_idx_minus1;
+  guint8 delta_rps_sign;
+  guint16 abs_delta_rps_minus1;
+
+  /* calculated values */
+  guint8 NumDeltaPocs;
+  guint8 NumNegativePics;
+  guint8 NumPositivePics;
+  guint8 UsedByCurrPicS0[16];
+  guint8 UsedByCurrPicS1[16];
+  gint32 DeltaPocS0[16];
+  gint32 DeltaPocS1[16];
+};
+
+/**
+ * GstH265VUIParams:
+ * @aspect_ratio_info_present_flag: %TRUE specifies that aspect_ratio_idc is present.
+ *  %FALSE specifies that aspect_ratio_idc is not present
+ * @aspect_ratio_idc specifies the value of the sample aspect ratio of the luma samples
+ * @sar_width indicates the horizontal size of the sample aspect ratio
+ * @sar_height indicates the vertical size of the sample aspect ratio
+ * @overscan_info_present_flag: %TRUE overscan_appropriate_flag is present %FALSE otherwize
+ * @overscan_appropriate_flag: %TRUE indicates that the cropped decoded pictures
+ *  output are suitable for display using overscan. %FALSE the cropped decoded pictures
+ *  output contain visually important information
+ * @video_signal_type_present_flag: %TRUE specifies that video_format, video_full_range_flag and
+ *  colour_description_present_flag are present.
+ * @video_format: indicates the representation of the picture
+ * @video_full_range_flag: indicates the black level and range of the luma and chroma signals
+ * @colour_description_present_flag: %TRUE specifies that colour_primaries,
+ *  transfer_characteristics and matrix_coefficients are present
+ * @colour_primaries: indicates the chromaticity coordinates of the source primaries
+ * @transfer_characteristics: indicates the opto-electronic transfer characteristic
+ * @matrix_coefficients: describes the matrix coefficients used in deriving luma and chroma signals
+ * @chroma_loc_info_present_flag: %TRUE specifies that chroma_sample_loc_type_top_field and
+ *  chroma_sample_loc_type_bottom_field are present, %FALSE otherwize
+ * @chroma_sample_loc_type_top_field: specify the location of chroma for top field
+ * @chroma_sample_loc_type_bottom_field specify the location of chroma for bottom field
+ * @neutral_chroma_indication_flag: %TRUE indicate that the value of chroma samples is equla
+ *  to 1<<(BitDepthchrom-1).
+ * @field_seq_flag: %TRUE indicate field and %FALSE indicate frame
+ * @frame_field_info_present_flag: %TRUE indicate picture timing SEI messages are present for every
+ *   picture and include the pic_struct, source_scan_type, and duplicate_flag syntax elements.
+ * @default_display_window_flag: %TRUE indicate that the default display window parameters present
+ * def_disp_win_left_offset:left offset of display rect
+ * def_disp_win_right_offset: right offset of display rect
+ * def_disp_win_top_offset: top offset of display rect
+ * def_disp_win_bottom_offset: bottom offset of display rect
+ * @timing_info_present_flag: %TRUE specifies that num_units_in_tick,
+ *  time_scale and fixed_frame_rate_flag are present in the bitstream
+ * @num_units_in_tick: is the number of time units of a clock operating at the frequency time_scale Hz
+ * @time_scale: is the number of time units that pass in one second
+ * @poc_proportional_to_timing_flag: %TRUE indicates that the picture order count value for each picture
+ *  in the CVS that is not the first picture in the CVS, in decoding order, is proportional to the output
+ *  time of the picture relative to the output time of the first picture in the CVS.
+ * @num_ticks_poc_diff_one_minus1: plus 1 specifies the number of clock ticks corresponding to a
+ *  difference of picture order count values equal to 1
+ * @hrd_parameters_present_flag: %TRUE if hrd parameters present in the bitstream
+ * @bitstream_restriction_flag: %TRUE specifies that the following coded video sequence bitstream restriction
+ * parameters are present
+ * @tiles_fixed_structure_flag: %TRUE indicates that each PPS that is active in the CVS has the same value
+ *   of the syntax elements num_tile_columns_minus1, num_tile_rows_minus1, uniform_spacing_flag,
+ *   column_width_minus1, row_height_minus1 and loop_filter_across_tiles_enabled_flag, when present
+ * @motion_vectors_over_pic_boundaries_flag: %FALSE indicates that no sample outside the
+ *  picture boundaries and no sample at a fractional sample position, %TRUE indicates that one or more
+ *  samples outside picture boundaries may be used in inter prediction
+ * @restricted_ref_pic_list_flag: %TRUE indicates that all P and B slices (when present) that belong to
+ *  the same picture have an identical reference picture list 0, and that all B slices (when present)
+ *   that belong to the same picture have an identical reference picture list 1
+ * @min_spatial_segmentation_idc: when not equal to 0, establishes a bound on the maximum possible size
+ *  of distinct coded spatial segmentation regions in the pictures of the CVS
+ * @max_bytes_per_pic_denom: indicates a number of bytes not exceeded by the sum of the sizes of
+ *  the VCL NAL units associated with any coded picture in the coded video sequence.
+ * @max_bits_per_min_cu_denom: indicates an upper bound for the number of coded bits of coding_unit
+ *  data for any coding block in any picture of the CVS
+ * @log2_max_mv_length_horizontal: indicate the maximum absolute value of a decoded horizontal
+ * motion vector component
+ * @log2_max_mv_length_vertical: indicate the maximum absolute value of a decoded vertical
+ *  motion vector component
+ *
+ * The structure representing the VUI parameters.
+ */
+struct _GstH265VUIParams
+{
+  guint8 aspect_ratio_info_present_flag;
+  guint8 aspect_ratio_idc;
+  /* if aspect_ratio_idc == 255 */
+  guint16 sar_width;
+  guint16 sar_height;
+
+  guint8 overscan_info_present_flag;
+  /* if overscan_info_present_flag */
+  guint8 overscan_appropriate_flag;
+
+  guint8 video_signal_type_present_flag;
+  guint8 video_format;
+  guint8 video_full_range_flag;
+  guint8 colour_description_present_flag;
+  guint8 colour_primaries;
+  guint8 transfer_characteristics;
+  guint8 matrix_coefficients;
+
+  guint8 chroma_loc_info_present_flag;
+  guint8 chroma_sample_loc_type_top_field;
+  guint8 chroma_sample_loc_type_bottom_field;
+
+  guint8 neutral_chroma_indication_flag;
+  guint8 field_seq_flag;
+  guint8 frame_field_info_present_flag;
+  guint8 default_display_window_flag;
+  guint32 def_disp_win_left_offset;
+  guint32 def_disp_win_right_offset;
+  guint32 def_disp_win_top_offset;
+  guint32 def_disp_win_bottom_offset;
+
+  guint8 timing_info_present_flag;
+  /* if timing_info_present_flag */
+  guint32 num_units_in_tick;
+  guint32 time_scale;
+  guint8 poc_proportional_to_timing_flag;
+  /* if poc_proportional_to_timing_flag */
+  guint32 num_ticks_poc_diff_one_minus1;
+  guint8 hrd_parameters_present_flag;
+  /*if hrd_parameters_present_flat */
+  GstH265HRDParams hrd_params;
+
+  guint8 bitstream_restriction_flag;
+  /*  if bitstream_restriction_flag */
+  guint8 tiles_fixed_structure_flag;
+  guint8 motion_vectors_over_pic_boundaries_flag;
+  guint8 restricted_ref_pic_lists_flag;
+  guint16 min_spatial_segmentation_idc;
+  guint8 max_bytes_per_pic_denom;
+  guint8 max_bits_per_min_cu_denom;
+  guint8 log2_max_mv_length_horizontal;
+  guint8 log2_max_mv_length_vertical;
+
+  /* calculated values */
+  guint par_n;
+  guint par_d;
+};
+
+/**
+ * GstH265ScalingList:
+ * @scaling_list_dc_coef_minus8_16x16: this plus 8 specifies the DC
+ *   Coefficient values for 16x16 scaling list
+ * @scaling_list_dc_coef_minus8_32x32: this plus 8 specifies the DC
+ *   Coefficient values for 32x32 scaling list
+ * @scaling_lists_4x4: 4x4 scaling list
+ * @scaling_lists_8x8: 8x8 scaling list
+ * @scaling_lists_16x16: 16x16 scaling list
+ * @guint8 scaling_lists_32x32: 32x32 scaling list
+ *
+ * Defines the GstH265ScalingList
+ */
+struct _GstH265ScalingList {
+
+  gint16 scaling_list_dc_coef_minus8_16x16[6];
+  gint16 scaling_list_dc_coef_minus8_32x32[2];
+
+  guint8 scaling_lists_4x4 [6][16];
+  guint8 scaling_lists_8x8 [6][64];
+  guint8 scaling_lists_16x16 [6][64];
+  guint8 scaling_lists_32x32 [2][64];
+};
+
+/**
+ * GstH265SPS:
+ * @id: The ID of the sequence parameter set
+ * @profile_idc: indicate the profile to which the coded video sequence conforms
+ *
+ * H265 Sequence Parameter Set (SPS)
+ */
+struct _GstH265SPS
+{
+  guint8 id;
+
+  GstH265VPS *vps;
+
+  guint8 max_sub_layers_minus1;
+  guint8 temporal_id_nesting_flag;
+
+  GstH265ProfileTierLevel profile_tier_level;
+
+  guint8 chroma_format_idc;
+  guint8 separate_colour_plane_flag;
+  guint16 pic_width_in_luma_samples;
+  guint16 pic_height_in_luma_samples;
+
+  guint8 conformance_window_flag;
+  /* if conformance_window_flag */
+  guint32 conf_win_left_offset;
+  guint32 conf_win_right_offset;
+  guint32 conf_win_top_offset;
+  guint32 conf_win_bottom_offset;
+
+  guint8 bit_depth_luma_minus8;
+  guint8 bit_depth_chroma_minus8;
+  guint8 log2_max_pic_order_cnt_lsb_minus4;
+
+  guint8 sub_layer_ordering_info_present_flag;
+  guint8 max_dec_pic_buffering_minus1[GST_H265_MAX_SUB_LAYERS];
+  guint8 max_num_reorder_pics[GST_H265_MAX_SUB_LAYERS];
+  guint8 max_latency_increase_plus1[GST_H265_MAX_SUB_LAYERS];
+
+  guint8 log2_min_luma_coding_block_size_minus3;
+  guint8 log2_diff_max_min_luma_coding_block_size;
+  guint8 log2_min_transform_block_size_minus2;
+  guint8 log2_diff_max_min_transform_block_size;
+  guint8 max_transform_hierarchy_depth_inter;
+  guint8 max_transform_hierarchy_depth_intra;
+
+  guint8 scaling_list_enabled_flag;
+  /* if scaling_list_enabled_flag */
+  guint8 scaling_list_data_present_flag;
+
+  GstH265ScalingList scaling_list;
+
+  guint8 amp_enabled_flag;
+  guint8 sample_adaptive_offset_enabled_flag;
+  guint8 pcm_enabled_flag;
+  /* if pcm_enabled_flag */
+  guint8 pcm_sample_bit_depth_luma_minus1;
+  guint8 pcm_sample_bit_depth_chroma_minus1;
+  guint8 log2_min_pcm_luma_coding_block_size_minus3;
+  guint8 log2_diff_max_min_pcm_luma_coding_block_size;
+  guint8 pcm_loop_filter_disabled_flag;
+
+  guint8 num_short_term_ref_pic_sets;
+  GstH265ShortTermRefPicSet short_term_ref_pic_set[65];
+
+  guint8 long_term_ref_pics_present_flag;
+  /* if long_term_ref_pics_present_flag */
+  guint8 num_long_term_ref_pics_sps;
+  guint16 lt_ref_pic_poc_lsb_sps[32];
+  guint8 used_by_curr_pic_lt_sps_flag[32];
+
+  guint8 temporal_mvp_enabled_flag;
+  guint8 strong_intra_smoothing_enabled_flag;
+  guint8 vui_parameters_present_flag;
+
+  /* if vui_parameters_present_flat */
+  GstH265VUIParams vui_params;
+
+  guint8 sps_extension_flag;
+
+  /* calculated values */
+  guint8 chroma_array_type;
+  gint width, height;
+  gint crop_rect_width, crop_rect_height;
+  gint crop_rect_x, crop_rect_y;
+  gint fps_num, fps_den;
+  gboolean valid;
+};
+
+/**
+ * GstH265PPS:
+ *
+ * H265 Picture Parameter Set
+ */
+struct _GstH265PPS
+{
+  guint id;
+
+  GstH265SPS *sps;
+
+  guint8 dependent_slice_segments_enabled_flag;
+  guint8 output_flag_present_flag;
+  guint8 num_extra_slice_header_bits;
+  guint8 sign_data_hiding_enabled_flag;
+  guint8 cabac_init_present_flag;
+  guint8 num_ref_idx_l0_default_active_minus1;
+  guint8 num_ref_idx_l1_default_active_minus1;
+  gint8 init_qp_minus26;
+  guint8 constrained_intra_pred_flag;
+  guint8 transform_skip_enabled_flag;
+  guint8 cu_qp_delta_enabled_flag;
+  /*if cu_qp_delta_enabled_flag */
+  guint8 diff_cu_qp_delta_depth;
+
+  gint8 cb_qp_offset;
+  gint8 cr_qp_offset;
+  guint8 slice_chroma_qp_offsets_present_flag;
+  guint8 weighted_pred_flag;
+  guint8 weighted_bipred_flag;
+  guint8 transquant_bypass_enabled_flag;
+  guint8 tiles_enabled_flag;
+  guint8 entropy_coding_sync_enabled_flag;
+
+  guint8 num_tile_columns_minus1;
+  guint8 num_tile_rows_minus1;
+  guint8 uniform_spacing_flag;
+  guint32 column_width_minus1[19];
+  guint32 row_height_minus1[21];
+  guint8 loop_filter_across_tiles_enabled_flag;
+
+  guint8 loop_filter_across_slices_enabled_flag;
+  guint8 deblocking_filter_control_present_flag;
+  guint8 deblocking_filter_override_enabled_flag;
+  guint8 deblocking_filter_disabled_flag;
+  gint8 beta_offset_div2;
+  gint8 tc_offset_div2;
+
+  guint8 scaling_list_data_present_flag;
+
+  GstH265ScalingList scaling_list;
+
+  guint8 lists_modification_present_flag;
+  guint8 log2_parallel_merge_level_minus2;
+  guint8 slice_segment_header_extension_present_flag;
+
+  guint8 pps_extension_flag;
+
+  gboolean valid;
+};
+
+struct _GstH265RefPicListModification
+{
+  guint8 ref_pic_list_modification_flag_l0;
+  guint32 list_entry_l0[15];
+  guint8 ref_pic_list_modification_flag_l1;
+  guint32 list_entry_l1[15];
+};
+
+struct _GstH265PredWeightTable
+{
+  guint8 luma_log2_weight_denom;
+  gint8 delta_chroma_log2_weight_denom;
+
+  guint8 luma_weight_l0_flag[15];
+  guint8  chroma_weight_l0_flag[15];
+  gint8 delta_luma_weight_l0[15];
+  gint8 luma_offset_l0[15];
+  gint8 delta_chroma_weight_l0 [15][2];
+  gint16 delta_chroma_offset_l0 [15][2];
+
+  guint8 luma_weight_l1_flag[15];
+  guint8 chroma_weight_l1_flag[15];
+  gint8 delta_luma_weight_l1[15];
+  gint8 luma_offset_l1[15];
+  gint8 delta_chroma_weight_l1[15][2];
+  gint16 delta_chroma_offset_l1[15][2];
+};
+
+struct _GstH265SliceHdr
+{
+  guint8 first_slice_segment_in_pic_flag;
+  guint8 no_output_of_prior_pics_flag;
+
+  GstH265PPS *pps;
+
+  guint8 dependent_slice_segment_flag;
+  guint32 segment_address;
+
+  guint8 type;
+
+  guint8 pic_output_flag;
+  guint8 colour_plane_id;
+  guint16 pic_order_cnt_lsb;
+
+  guint8  short_term_ref_pic_set_sps_flag;
+  GstH265ShortTermRefPicSet short_term_ref_pic_sets;
+  guint8 short_term_ref_pic_set_idx;
+
+  guint8 num_long_term_sps;
+  guint8 num_long_term_pics;
+  guint8 lt_idx_sps[16];
+  guint32 poc_lsb_lt[16];
+  guint8 used_by_curr_pic_lt_flag[16];
+  guint8 delta_poc_msb_present_flag[16];
+  guint32 delta_poc_msb_cycle_lt[16];
+
+  guint8 temporal_mvp_enabled_flag;
+  guint8 sao_luma_flag;
+  guint8 sao_chroma_flag;
+  guint8 num_ref_idx_active_override_flag;
+  guint8 num_ref_idx_l0_active_minus1;
+  guint8 num_ref_idx_l1_active_minus1;
+
+  GstH265RefPicListModification ref_pic_list_modification;
+
+  guint8 mvd_l1_zero_flag;
+  guint8 cabac_init_flag;
+  guint8 collocated_from_l0_flag;
+  guint8 collocated_ref_idx;
+
+  GstH265PredWeightTable pred_weight_table;
+
+  guint8 five_minus_max_num_merge_cand;
+
+  gint8 qp_delta;
+  gint8 cb_qp_offset;
+  gint8 cr_qp_offset;
+
+  guint8 deblocking_filter_override_flag;
+  guint8 deblocking_filter_disabled_flag;
+  gint8 beta_offset_div2;
+  gint8 tc_offset_div2;
+
+  guint8 loop_filter_across_slices_enabled_flag;
+
+  guint32 num_entry_point_offsets;
+  guint8 offset_len_minus1;
+  guint32 *entry_point_offset_minus1;
+
+  /* calculated values */
+
+  gint NumPocTotalCurr;
+  /* Size of the slice_header() in bits */
+  guint header_size;
+  /* Number of emulation prevention bytes (EPB) in this slice_header() */
+  guint n_emulation_prevention_bytes;
+};
+
+struct _GstH265PicTiming
+{
+  guint8 pic_struct;
+  guint8 source_scan_type;
+  guint8 duplicate_flag;
+
+  guint8 au_cpb_removal_delay_minus1;
+  guint8 pic_dpb_output_delay;
+  guint8 pic_dpb_output_du_delay;
+  guint32 num_decoding_units_minus1;
+  guint8 du_common_cpb_removal_delay_flag;
+  guint8 du_common_cpb_removal_delay_increment_minus1;
+  guint32 *num_nalus_in_du_minus1;
+  guint8 *du_cpb_removal_delay_increment_minus1;
+};
+
+struct _GstH265BufferingPeriod
+{
+  GstH265SPS *sps;
+
+  guint8 irap_cpb_params_present_flag;
+  guint8 cpb_delay_offset;
+  guint8 dpb_delay_offset;
+  guint8 concatenation_flag;
+  guint8 au_cpb_removal_delay_delta_minus1;
+
+  /* seq->vui_parameters->nal_hrd_parameters_present_flag */
+  guint8 nal_initial_cpb_removal_delay[32];
+  guint8 nal_initial_cpb_removal_offset[32];
+  guint8 nal_initial_alt_cpb_removal_delay[32];
+  guint8 nal_initial_alt_cpb_removal_offset [32];
+
+  /* seq->vui_parameters->vcl_hrd_parameters_present_flag */
+  guint8 vcl_initial_cpb_removal_delay[32];
+  guint8 vcl_initial_cpb_removal_offset[32];
+  guint8 vcl_initial_alt_cpb_removal_delay[32];
+  guint8 vcl_initial_alt_cpb_removal_offset[32];
+};
+
+struct _GstH265SEIMessage
+{
+  GstH265SEIPayloadType payloadType;
+
+  union {
+    GstH265BufferingPeriod buffering_period;
+    GstH265PicTiming pic_timing;
+    /* ... could implement more */
+  } payload;
+};
+
+/**
+ * GstH265Parser:
+ *
+ * H265 NAL Parser (opaque structure).
+ */
+struct _GstH265Parser
+{
+  /*< private >*/
+  GstH265VPS vps[GST_H265_MAX_VPS_COUNT];
+  GstH265SPS sps[GST_H265_MAX_SPS_COUNT];
+  GstH265PPS pps[GST_H265_MAX_PPS_COUNT];
+  GstH265VPS *last_vps;
+  GstH265SPS *last_sps;
+  GstH265PPS *last_pps;
+};
+
+GstH265Parser *     gst_h265_parser_new               (void);
+
+GstH265ParserResult gst_h265_parser_identify_nalu      (GstH265Parser  * parser,
+                                                        const guint8   * data,
+                                                        guint            offset,
+                                                        gsize            size,
+                                                        GstH265NalUnit * nalu);
+
+GstH265ParserResult gst_h265_parser_identify_nalu_unchecked (GstH265Parser * parser,
+                                                        const guint8   * data,
+                                                        guint            offset,
+                                                        gsize            size,
+                                                        GstH265NalUnit * nalu);
+
+GstH265ParserResult gst_h265_parser_identify_nalu_hevc (GstH265Parser  * parser,
+                                                        const guint8   * data,
+                                                        guint            offset,
+                                                        gsize            size,
+                                                        guint8           nal_length_size,
+                                                        GstH265NalUnit * nalu);
+
+GstH265ParserResult gst_h265_parser_parse_nal       (GstH265Parser   * parser,
+                                                     GstH265NalUnit  * nalu);
+
+GstH265ParserResult gst_h265_parser_parse_slice_hdr (GstH265Parser   * parser,
+                                                     GstH265NalUnit  * nalu,
+                                                     GstH265SliceHdr * slice);
+
+GstH265ParserResult gst_h265_parser_parse_vps       (GstH265Parser   * parser,
+                                                     GstH265NalUnit  * nalu,
+                                                     GstH265VPS      * vps);
+
+GstH265ParserResult gst_h265_parser_parse_sps       (GstH265Parser   * parser,
+                                                     GstH265NalUnit  * nalu,
+                                                     GstH265SPS      * sps,
+                                                     gboolean          parse_vui_params);
+
+GstH265ParserResult gst_h265_parser_parse_pps       (GstH265Parser   * parser,
+                                                     GstH265NalUnit  * nalu,
+                                                     GstH265PPS      * pps);
+
+GstH265ParserResult gst_h265_parser_parse_sei       (GstH265Parser   * parser,
+                                                     GstH265NalUnit  * nalu,
+                                                     GArray **messages);
+
+void                gst_h265_parser_free            (GstH265Parser  * parser);
+
+GstH265ParserResult gst_h265_parse_vps              (GstH265NalUnit * nalu,
+                                                     GstH265VPS     * vps);
+
+GstH265ParserResult gst_h265_parse_sps              (GstH265Parser  * parser,
+                                                     GstH265NalUnit * nalu,
+                                                     GstH265SPS     * sps,
+                                                     gboolean         parse_vui_params);
+
+GstH265ParserResult gst_h265_parse_pps              (GstH265Parser  * parser,
+                                                     GstH265NalUnit * nalu,
+                                                     GstH265PPS     * pps);
+
+gboolean            gst_h265_slice_hdr_copy (GstH265SliceHdr       * dst_slice,
+                                             const GstH265SliceHdr * src_slice);
+
+void                gst_h265_slice_hdr_free (GstH265SliceHdr * slice_hdr);
+
+gboolean            gst_h265_sei_copy       (GstH265SEIMessage       * dest_sei,
+                                             const GstH265SEIMessage * src_sei);
+
+void                gst_h265_sei_free       (GstH265SEIMessage * sei);
+
+void    gst_h265_quant_matrix_4x4_get_zigzag_from_raster (guint8 out_quant[16],
+                                                          const guint8 quant[16]);
+
+void    gst_h265_quant_matrix_4x4_get_raster_from_zigzag (guint8 out_quant[16],
+                                                          const guint8 quant[16]);
+
+void    gst_h265_quant_matrix_8x8_get_zigzag_from_raster (guint8 out_quant[64],
+                                                          const guint8 quant[64]);
+
+void    gst_h265_quant_matrix_8x8_get_raster_from_zigzag (guint8 out_quant[64],
+                                                          const guint8 quant[64]);
+
+#define gst_h265_quant_matrix_16x16_get_zigzag_from_raster \
+        gst_h265_quant_matrix_8x8_get_zigzag_from_raster
+#define gst_h265_quant_matrix_16x16_get_raster_from_zigzag \
+        gst_h265_quant_matrix_8x8_get_raster_from_zigzag
+#define gst_h265_quant_matrix_32x32_get_zigzag_from_raster \
+        gst_h265_quant_matrix_8x8_get_zigzag_from_raster
+#define gst_h265_quant_matrix_32x32_get_raster_from_zigzag \
+        gst_h265_quant_matrix_8x8_get_raster_from_zigzag
+
+G_END_DECLS
+#endif
diff -Nru gstreamer-vaapi-0.5.10/ext/codecparsers/gst-libs/gst/codecparsers/gstvc1parser.c gstreamer-vaapi-0.6.0/ext/codecparsers/gst-libs/gst/codecparsers/gstvc1parser.c
--- gstreamer-vaapi-0.5.10/ext/codecparsers/gst-libs/gst/codecparsers/gstvc1parser.c	2015-02-03 08:38:55.000000000 +0000
+++ gstreamer-vaapi-0.6.0/ext/codecparsers/gst-libs/gst/codecparsers/gstvc1parser.c	2015-07-15 12:50:06.000000000 +0000
@@ -242,7 +242,7 @@
   gint par_n, par_d;
 } PAR;
 
-static PAR aspect_ratios[] = {
+static const PAR aspect_ratios[] = {
   {0, 0},
   {1, 1},
   {12, 11},
diff -Nru gstreamer-vaapi-0.5.10/ext/codecparsers/gst-libs/gst/codecparsers/nalutils.h gstreamer-vaapi-0.6.0/ext/codecparsers/gst-libs/gst/codecparsers/nalutils.h
--- gstreamer-vaapi-0.5.10/ext/codecparsers/gst-libs/gst/codecparsers/nalutils.h	2015-02-03 08:38:55.000000000 +0000
+++ gstreamer-vaapi-0.6.0/ext/codecparsers/gst-libs/gst/codecparsers/nalutils.h	2015-07-15 12:50:06.000000000 +0000
@@ -138,6 +138,13 @@
   val = tmp; \
 }
 
+#define READ_UE_MAX(nr, val, max) { \
+  guint32 tmp; \
+  READ_UE (nr, tmp); \
+  CHECK_ALLOWED_MAX (tmp, max); \
+  val = tmp; \
+}
+
 #define READ_SE(nr, val) { \
   if (!nal_reader_get_se (nr, &val)) { \
     GST_WARNING ("failed to read SE"); \
diff -Nru gstreamer-vaapi-0.5.10/ext/libvpx/Makefile.am gstreamer-vaapi-0.6.0/ext/libvpx/Makefile.am
--- gstreamer-vaapi-0.5.10/ext/libvpx/Makefile.am	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/ext/libvpx/Makefile.am	2015-07-15 12:47:43.000000000 +0000
@@ -69,11 +69,21 @@
 vpx.clean:
 	@[ -d $(vpx_builddir) ] && \
 	$(MAKE) -C $(vpx_builddir) clean || :
-	rm -f vpx.build.stamp vpx.configure.stamp
+	rm -f vpx.configure.stamp
 
 vpx.maintainer.clean: vpx.clean
 	rm -rf $(vpx_builddir)
 
+DISTCLEANFILES = \
+	$(vpx_builddir)/config.mk			\
+	$(vpx_builddir)/config.log			\
+	$(vpx_builddir)/libs-x86_64-linux-gcc.mk	\
+	$(vpx_builddir)/Makefile			\
+	$(vpx_builddir)/vpx_config.c			\
+	$(vpx_builddir)/vpx_config.h			\
+	$(vpx_builddir)/vpx_config.asm			\
+	$(NULL)
+
 vpx.configure.stamp:
 	@[ -d $(vpx_builddir) ] || mkdir $(vpx_builddir);		 \
 	cd $(vpx_builddir)						;  \
@@ -97,7 +107,7 @@
 
 $(gst_vpx_source_c): vpx.build
 
-CLEANFILES = vpx.build.stamp
+CLEANFILES = vpx.configure.stamp
 
 # Files for packaging
 include $(srcdir)/sources.frag
@@ -138,5 +148,8 @@
 	  cp -fpR $(vpx_srcdir)/$$f $(distdir)/$(vpx_upstream)/$$f;	\
 	done
 
-# Extra clean files so that maintainer-clean removes *everything*
-MAINTAINERCLEANFILES = Makefile.in vpx.configure.stamp
+-include $(top_srcdir)/git.mk
+
+# Tell version 3.79 and up of GNU make to not build goals in this
+# directory in parallel.
+.NOTPARALLEL:
diff -Nru gstreamer-vaapi-0.5.10/ext/libvpx/Makefile.in gstreamer-vaapi-0.6.0/ext/libvpx/Makefile.in
--- gstreamer-vaapi-0.5.10/ext/libvpx/Makefile.in	2015-02-03 08:39:54.000000000 +0000
+++ gstreamer-vaapi-0.6.0/ext/libvpx/Makefile.in	2015-07-15 12:50:34.000000000 +0000
@@ -260,10 +260,16 @@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
+EGL_CFLAGS = @EGL_CFLAGS@
+EGL_LIBS = @EGL_LIBS@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GIT = @GIT@
+GLES2_CFLAGS = @GLES2_CFLAGS@
+GLES2_LIBS = @GLES2_LIBS@
+GLES3_CFLAGS = @GLES3_CFLAGS@
+GLES3_LIBS = @GLES3_LIBS@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_VERSION_REQUIRED = @GLIB_VERSION_REQUIRED@
@@ -281,6 +287,8 @@
 GST_CFLAGS = @GST_CFLAGS@
 GST_CODEC_PARSERS_CFLAGS = @GST_CODEC_PARSERS_CFLAGS@
 GST_CODEC_PARSERS_LIBS = @GST_CODEC_PARSERS_LIBS@
+GST_GL_CFLAGS = @GST_GL_CFLAGS@
+GST_GL_LIBS = @GST_GL_LIBS@
 GST_INTERFACES_CFLAGS = @GST_INTERFACES_CFLAGS@
 GST_INTERFACES_LIBS = @GST_INTERFACES_LIBS@
 GST_LIBS = @GST_LIBS@
@@ -290,7 +298,6 @@
 GST_PLUGINS_BASE_LIBS = @GST_PLUGINS_BASE_LIBS@
 GST_PLUGINS_BASE_VERSION_REQUIRED = @GST_PLUGINS_BASE_VERSION_REQUIRED@
 GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
-GST_PLUGIN_PATH = @GST_PLUGIN_PATH@
 GST_PLUGIN_PATH_1_0 = @GST_PLUGIN_PATH_1_0@
 GST_VAAPI_LT_LDFLAGS = @GST_VAAPI_LT_LDFLAGS@
 GST_VAAPI_LT_VERSION = @GST_VAAPI_LT_VERSION@
@@ -461,7 +468,17 @@
 VP8_ENCODER = disable
 VP9_DECODER = disable
 VP9_ENCODER = disable
-CLEANFILES = vpx.build.stamp
+DISTCLEANFILES = \
+	$(vpx_builddir)/config.mk			\
+	$(vpx_builddir)/config.log			\
+	$(vpx_builddir)/libs-x86_64-linux-gcc.mk	\
+	$(vpx_builddir)/Makefile			\
+	$(vpx_builddir)/vpx_config.c			\
+	$(vpx_builddir)/vpx_config.h			\
+	$(vpx_builddir)/vpx_config.asm			\
+	$(NULL)
+
+CLEANFILES = vpx.configure.stamp
 vpx_source_mak = \
 	docs.mk \
 	examples.mk \
@@ -745,9 +762,6 @@
 	$(vpx_versions)		\
 	$(NULL)
 
-
-# Extra clean files so that maintainer-clean removes *everything*
-MAINTAINERCLEANFILES = Makefile.in vpx.configure.stamp
 all: all-am
 
 .SUFFIXES:
@@ -983,11 +997,11 @@
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
 clean: clean-am
 
 clean-am: clean-generic clean-libLTLIBRARIES clean-libtool clean-local \
@@ -1087,7 +1101,7 @@
 vpx.clean:
 	@[ -d $(vpx_builddir) ] && \
 	$(MAKE) -C $(vpx_builddir) clean || :
-	rm -f vpx.build.stamp vpx.configure.stamp
+	rm -f vpx.configure.stamp
 
 vpx.maintainer.clean: vpx.clean
 	rm -rf $(vpx_builddir)
@@ -1122,6 +1136,12 @@
 	  cp -fpR $(vpx_srcdir)/$$f $(distdir)/$(vpx_upstream)/$$f;	\
 	done
 
+-include $(top_srcdir)/git.mk
+
+# Tell version 3.79 and up of GNU make to not build goals in this
+# directory in parallel.
+.NOTPARALLEL:
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -Nru gstreamer-vaapi-0.5.10/ext/Makefile.am gstreamer-vaapi-0.6.0/ext/Makefile.am
--- gstreamer-vaapi-0.5.10/ext/Makefile.am	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/ext/Makefile.am	2015-07-15 12:47:43.000000000 +0000
@@ -17,6 +17,7 @@
 	nalutils.c		\
 	parserutils.c		\
 	vp8utils.c		\
+	gsth265parser.c         \
 	$(NULL)
 
 EXTRA_DIST += $(codecparsers_source_c:%.c=$(codecparsers_srcdir)/%.c)
@@ -33,6 +34,7 @@
 	nalutils.h		\
 	parserutils.h		\
 	vp8utils.h		\
+	gsth265parser.h         \
 	$(NULL)
 
 EXTRA_DIST += $(codecparsers_source_h:%.h=$(codecparsers_srcdir)/%.h)
@@ -42,36 +44,16 @@
 
 videoparsers_source_c = \
 	gsth264parse.c		\
+	gsth265parse.c		\
 	$(NULL)
 
 EXTRA_DIST += $(videoparsers_source_c:%.c=$(videoparsers_srcdir)/%.c)
 
 videoparsers_source_h = \
 	gsth264parse.h		\
+	gsth265parse.h		\
 	$(NULL)
 
 EXTRA_DIST += $(videoparsers_source_h:%.h=$(videoparsers_srcdir)/%.h)
 
-videoutils_srcdir = \
-	$(top_srcdir)/ext/videoutils/gst-libs/gst/video
-
-videoutils_source_c = \
-	gstvideodecoder.c	\
-	gstvideoencoder.c	\
-	gstvideoutils.c		\
-	video.c			\
-	$(NULL)
-
-EXTRA_DIST += $(videoutils_source_c:%.c=$(videoutils_srcdir)/%.c)
-
-videoutils_source_h = \
-	gstvideodecoder.h	\
-	gstvideoencoder.h	\
-	gstvideoutils.h		\
-	video.h			\
-	$(NULL)
-
-EXTRA_DIST += $(videoutils_source_h:%.h=$(videoutils_srcdir)/%.h)
-
-# Extra clean files so that maintainer-clean removes *everything*
-MAINTAINERCLEANFILES = Makefile.in
+-include $(top_srcdir)/git.mk
diff -Nru gstreamer-vaapi-0.5.10/ext/Makefile.in gstreamer-vaapi-0.6.0/ext/Makefile.in
--- gstreamer-vaapi-0.5.10/ext/Makefile.in	2015-02-03 08:39:54.000000000 +0000
+++ gstreamer-vaapi-0.6.0/ext/Makefile.in	2015-07-15 12:50:34.000000000 +0000
@@ -197,10 +197,16 @@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
+EGL_CFLAGS = @EGL_CFLAGS@
+EGL_LIBS = @EGL_LIBS@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GIT = @GIT@
+GLES2_CFLAGS = @GLES2_CFLAGS@
+GLES2_LIBS = @GLES2_LIBS@
+GLES3_CFLAGS = @GLES3_CFLAGS@
+GLES3_LIBS = @GLES3_LIBS@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_VERSION_REQUIRED = @GLIB_VERSION_REQUIRED@
@@ -218,6 +224,8 @@
 GST_CFLAGS = @GST_CFLAGS@
 GST_CODEC_PARSERS_CFLAGS = @GST_CODEC_PARSERS_CFLAGS@
 GST_CODEC_PARSERS_LIBS = @GST_CODEC_PARSERS_LIBS@
+GST_GL_CFLAGS = @GST_GL_CFLAGS@
+GST_GL_LIBS = @GST_GL_LIBS@
 GST_INTERFACES_CFLAGS = @GST_INTERFACES_CFLAGS@
 GST_INTERFACES_LIBS = @GST_INTERFACES_LIBS@
 GST_LIBS = @GST_LIBS@
@@ -227,7 +235,6 @@
 GST_PLUGINS_BASE_LIBS = @GST_PLUGINS_BASE_LIBS@
 GST_PLUGINS_BASE_VERSION_REQUIRED = @GST_PLUGINS_BASE_VERSION_REQUIRED@
 GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
-GST_PLUGIN_PATH = @GST_PLUGIN_PATH@
 GST_PLUGIN_PATH_1_0 = @GST_PLUGIN_PATH_1_0@
 GST_VAAPI_LT_LDFLAGS = @GST_VAAPI_LT_LDFLAGS@
 GST_VAAPI_LT_VERSION = @GST_VAAPI_LT_VERSION@
@@ -368,9 +375,7 @@
 EXTRA_DIST = $(codecparsers_source_c:%.c=$(codecparsers_srcdir)/%.c) \
 	$(codecparsers_source_h:%.h=$(codecparsers_srcdir)/%.h) \
 	$(videoparsers_source_c:%.c=$(videoparsers_srcdir)/%.c) \
-	$(videoparsers_source_h:%.h=$(videoparsers_srcdir)/%.h) \
-	$(videoutils_source_c:%.c=$(videoutils_srcdir)/%.c) \
-	$(videoutils_source_h:%.h=$(videoutils_srcdir)/%.h)
+	$(videoparsers_source_h:%.h=$(videoparsers_srcdir)/%.h)
 codecparsers_srcdir = \
 	$(top_srcdir)/ext/codecparsers/gst-libs/gst/codecparsers
 
@@ -386,6 +391,7 @@
 	nalutils.c		\
 	parserutils.c		\
 	vp8utils.c		\
+	gsth265parser.c         \
 	$(NULL)
 
 codecparsers_source_h = \
@@ -400,6 +406,7 @@
 	nalutils.h		\
 	parserutils.h		\
 	vp8utils.h		\
+	gsth265parser.h         \
 	$(NULL)
 
 videoparsers_srcdir = \
@@ -407,32 +414,14 @@
 
 videoparsers_source_c = \
 	gsth264parse.c		\
+	gsth265parse.c		\
 	$(NULL)
 
 videoparsers_source_h = \
 	gsth264parse.h		\
+	gsth265parse.h		\
 	$(NULL)
 
-videoutils_srcdir = \
-	$(top_srcdir)/ext/videoutils/gst-libs/gst/video
-
-videoutils_source_c = \
-	gstvideodecoder.c	\
-	gstvideoencoder.c	\
-	gstvideoutils.c		\
-	video.c			\
-	$(NULL)
-
-videoutils_source_h = \
-	gstvideodecoder.h	\
-	gstvideoencoder.h	\
-	gstvideoutils.h		\
-	video.h			\
-	$(NULL)
-
-
-# Extra clean files so that maintainer-clean removes *everything*
-MAINTAINERCLEANFILES = Makefile.in
 all: all-recursive
 
 .SUFFIXES:
@@ -662,7 +651,6 @@
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
 clean: clean-recursive
 
 clean-am: clean-generic clean-libtool mostlyclean-am
@@ -745,6 +733,8 @@
 	ps ps-am tags tags-am uninstall uninstall-am
 
 
+-include $(top_srcdir)/git.mk
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -Nru gstreamer-vaapi-0.5.10/ext/videoutils/gst-libs/gst/video/gstvideodecoder.c gstreamer-vaapi-0.6.0/ext/videoutils/gst-libs/gst/video/gstvideodecoder.c
--- gstreamer-vaapi-0.5.10/ext/videoutils/gst-libs/gst/video/gstvideodecoder.c	2015-02-03 08:39:48.000000000 +0000
+++ gstreamer-vaapi-0.6.0/ext/videoutils/gst-libs/gst/video/gstvideodecoder.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,3114 +0,0 @@
-/* GStreamer
- * Copyright (C) 2008 David Schleef <ds@schleef.org>
- * Copyright (C) 2011 Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>.
- * Copyright (C) 2011 Nokia Corporation. All rights reserved.
- *   Contact: Stefan Kost <stefan.kost@nokia.com>
- * Copyright (C) 2012 Collabora Ltd.
- *	Author : Edward Hervey <edward@collabora.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/**
- * SECTION:gstvideodecoder
- * @short_description: Base class for video decoders
- * @see_also: 
- *
- * This base class is for video decoders turning encoded data into raw video
- * frames.
- *
- * The GstVideoDecoder base class and derived subclasses should cooperate as follows:
- * <orderedlist>
- * <listitem>
- *   <itemizedlist><title>Configuration</title>
- *   <listitem><para>
- *     Initially, GstVideoDecoder calls @start when the decoder element
- *     is activated, which allows the subclass to perform any global setup.
- *   </para></listitem>
- *   <listitem><para>
- *     GstVideoDecoder calls @set_format to inform the subclass of caps
- *     describing input video data that it is about to receive, including
- *     possibly configuration data.
- *     While unlikely, it might be called more than once, if changing input
- *     parameters require reconfiguration.
- *   </para></listitem>
- *   <listitem><para>
- *     Incoming data buffers are processed as needed, described in Data Processing below.
- *   </para></listitem>
- *   <listitem><para>
- *     GstVideoDecoder calls @stop at end of all processing.
- *   </para></listitem>
- *   </itemizedlist>
- * </listitem>
- * <listitem>
- *   <itemizedlist>
- *   <title>Data processing</title>
- *     <listitem><para>
- *       The base class gathers input data, and optionally allows subclass
- *       to parse this into subsequently manageable chunks, typically
- *       corresponding to and referred to as 'frames'.
- *     </para></listitem>
- *     <listitem><para>
- *       Each input frame is provided in turn to the subclass' @handle_frame callback.
- *       The ownership of the frame is given to the @handle_frame callback.
- *     </para></listitem>
- *     <listitem><para>
- *       If codec processing results in decoded data, the subclass should call
- *       @gst_video_decoder_finish_frame to have decoded data pushed.
- *       downstream. Otherwise, the subclass must call @gst_video_decoder_drop_frame, to
- *       allow the base class to do timestamp and offset tracking, and possibly to
- *       requeue the frame for a later attempt in the case of reverse playback.
- *     </para></listitem>
- *   </itemizedlist>
- * </listitem>
- * <listitem>
- *   <itemizedlist><title>Shutdown phase</title>
- *   <listitem><para>
- *     The GstVideoDecoder class calls @stop to inform the subclass that data
- *     parsing will be stopped.
- *   </para></listitem>
- *   </itemizedlist>
- * </listitem>
- * <listitem>
- *   <itemizedlist><title>Additional Notes</title>
- *   <listitem>
- *     <itemizedlist><title>Seeking/Flushing</title>
- *     <listitem><para>
- *   When the pipeline is seeked or otherwise flushed, the subclass is informed via a call
- *   to its @reset callback, with the hard parameter set to true. This indicates the
- *   subclass should drop any internal data queues and timestamps and prepare for a fresh
- *   set of buffers to arrive for parsing and decoding.
- *     </para></listitem>
- *     </itemizedlist>
- *   </listitem>
- *   <listitem>
- *     <itemizedlist><title>End Of Stream</title>
- *     <listitem><para>
- *   At end-of-stream, the subclass @parse function may be called some final times with the 
- *   at_eos parameter set to true, indicating that the element should not expect any more data
- *   to be arriving, and it should parse and remaining frames and call
- *   gst_video_decoder_have_frame() if possible.
- *     </para></listitem>
- *     </itemizedlist>
- *   </listitem>
- *   </itemizedlist>
- * </listitem>
- * </orderedlist>
- *
- * Subclass is responsible for providing pad template caps for
- * source and sink pads. The pads need to be named "sink" and "src". It also
- * needs to set the fixed caps on srcpad, when the format is ensured.  This
- * is typically when base class calls subclass' @set_format function, though
- * it might be delayed until calling @gst_video_decoder_finish_frame.
- *
- * The subclass is also responsible for providing (presentation) timestamps
- * (likely based on corresponding input ones).  If that is not applicable
- * or possible, the base class provides limited framerate based interpolation.
- *
- * Similarly, the base class provides some limited (legacy) seeking support
- * if specifically requested by the subclass, as full-fledged support
- * should rather be left to upstream demuxer, parser or alike.  This simple
- * approach caters for seeking and duration reporting using estimated input
- * bitrates. To enable it, a subclass should call
- * @gst_video_decoder_set_estimate_rate to enable handling of incoming byte-streams.
- *
- * The base class provides some support for reverse playback, in particular
- * in case incoming data is not packetized or upstream does not provide
- * fragments on keyframe boundaries.  However, the subclass should then be prepared
- * for the parsing and frame processing stage to occur separately (in normal
- * forward processing, the latter immediately follows the former),
- * The subclass also needs to ensure the parsing stage properly marks keyframes,
- * unless it knows the upstream elements will do so properly for incoming data.
- *
- * The bare minimum that a functional subclass needs to implement is:
- * <itemizedlist>
- *   <listitem><para>Provide pad templates</para></listitem>
- *   <listitem><para>
- *      Set source pad caps when appropriate
- *   </para></listitem>
- *   <listitem><para>
- *      Parse input data, if it is not considered packetized from upstream
- *      Data will be provided to @parse which should invoke @gst_video_decoder_add_to_frame and
- *      @gst_video_decoder_have_frame to separate the data belonging to each video frame.
- *   </para></listitem>
- *   <listitem><para>
- *      Accept data in @handle_frame and provide decoded results to
- *      @gst_video_decoder_finish_frame, or call @gst_video_decoder_drop_frame.
- *   </para></listitem>
- * </itemizedlist>
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-/* TODO
- *
- * * Add a flag/boolean for I-frame-only/image decoders so we can do extra
- *   features, like applying QoS on input (as opposed to after the frame is
- *   decoded).
- * * Add a flag/boolean for decoders that require keyframes, so the base
- *   class can automatically discard non-keyframes before one has arrived
- * * Support for GstIndex (or shall we not care ?)
- * * Calculate actual latency based on input/output timestamp/frame_number
- *   and if it exceeds the recorded one, save it and emit a GST_MESSAGE_LATENCY
- * * Emit latency message when it changes
- *
- */
-
-/* Implementation notes:
- * The Video Decoder base class operates in 2 primary processing modes, depending
- * on whether forward or reverse playback is requested.
- *
- * Forward playback:
- *   * Incoming buffer -> @parse() -> add_to_frame()/have_frame() -> handle_frame() -> 
- *     push downstream
- *
- * Reverse playback is more complicated, since it involves gathering incoming data regions
- * as we loop backwards through the upstream data. The processing concept (using incoming
- * buffers as containing one frame each to simplify things) is:
- *
- * Upstream data we want to play:
- *  Buffer encoded order:  1  2  3  4  5  6  7  8  9  EOS
- *  Keyframe flag:            K        K        
- *  Groupings:             AAAAAAA  BBBBBBB  CCCCCCC
- *
- * Input:
- *  Buffer reception order:  7  8  9  4  5  6  1  2  3  EOS
- *  Keyframe flag:                       K        K
- *  Discont flag:            D        D        D
- *
- * - Each Discont marks a discont in the decoding order.
- * - The keyframes mark where we can start decoding.
- *
- * Initially, we prepend incoming buffers to the gather queue. Whenever the
- * discont flag is set on an incoming buffer, the gather queue is flushed out
- * before the new buffer is collected.
- *
- * The above data will be accumulated in the gather queue like this:
- *
- *   gather queue:  9  8  7
- *                        D
- *
- * Whe buffer 4 is received (with a DISCONT), we flush the gather queue like
- * this:
- *
- *   while (gather)
- *     take head of queue and prepend to parse queue (this reverses the sequence,
- *     so parse queue is 7 -> 8 -> 9)
- *
- *   Next, we process the parse queue, which now contains all un-parsed packets (including
- *   any leftover ones from the previous decode section)
- *
- *   for each buffer now in the parse queue:
- *     Call the subclass parse function, prepending each resulting frame to
- *     the parse_gather queue. Buffers which precede the first one that
- *     produces a parsed frame are retained in the parse queue for re-processing on
- *     the next cycle of parsing.
- *
- *   The parse_gather queue now contains frame objects ready for decoding, in reverse order.
- *   parse_gather: 9 -> 8 -> 7
- *
- *   while (parse_gather)
- *     Take the head of the queue and prepend it to the decode queue
- *     If the frame was a keyframe, process the decode queue
- *   decode is now 7-8-9
- *
- *  Processing the decode queue results in frames with attached output buffers
- *  stored in the 'output_queue' ready for outputting in reverse order.
- *
- * After we flushed the gather queue and parsed it, we add 4 to the (now empty) gather queue.
- * We get the following situation:
- *
- *  gather queue:    4
- *  decode queue:    7  8  9
- *
- * After we received 5 (Keyframe) and 6:
- *
- *  gather queue:    6  5  4
- *  decode queue:    7  8  9
- *
- * When we receive 1 (DISCONT) which triggers a flush of the gather queue:
- *
- *   Copy head of the gather queue (6) to decode queue:
- *
- *    gather queue:    5  4
- *    decode queue:    6  7  8  9
- *
- *   Copy head of the gather queue (5) to decode queue. This is a keyframe so we
- *   can start decoding.
- *
- *    gather queue:    4
- *    decode queue:    5  6  7  8  9
- *
- *   Decode frames in decode queue, store raw decoded data in output queue, we
- *   can take the head of the decode queue and prepend the decoded result in the
- *   output queue:
- *
- *    gather queue:    4
- *    decode queue:    
- *    output queue:    9  8  7  6  5
- *
- *   Now output all the frames in the output queue, picking a frame from the
- *   head of the queue.
- *
- *   Copy head of the gather queue (4) to decode queue, we flushed the gather
- *   queue and can now store input buffer in the gather queue:
- *
- *    gather queue:    1
- *    decode queue:    4
- *
- *  When we receive EOS, the queue looks like:
- *
- *    gather queue:    3  2  1
- *    decode queue:    4
- *
- *  Fill decode queue, first keyframe we copy is 2:
- *
- *    gather queue:    1
- *    decode queue:    2  3  4
- *
- *  Decoded output:
- *
- *    gather queue:    1
- *    decode queue:    
- *    output queue:    4  3  2
- *
- *  Leftover buffer 1 cannot be decoded and must be discarded.
- */
-
-/* FIXME 0.11: suppress warnings for deprecated API such as GStaticRecMutex
- * with newer GLib versions (>= 2.31.0) */
-#define GLIB_DISABLE_DEPRECATION_WARNINGS
-
-#include "gstvideodecoder.h"
-#include "gstvideoutils.h"
-
-#include <string.h>
-
-GST_DEBUG_CATEGORY (videodecoder_debug);
-#define GST_CAT_DEFAULT videodecoder_debug
-
-#define GST_VIDEO_DECODER_GET_PRIVATE(obj)  \
-    (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GST_TYPE_VIDEO_DECODER, \
-        GstVideoDecoderPrivate))
-
-/* FIXME : I really hope we never see streams that go over this */
-#define MAX_DTS_PTS_REORDER_DEPTH 36
-
-struct _GstVideoDecoderPrivate
-{
-  /* FIXME introduce a context ? */
-
-  /* parse tracking */
-  /* input data */
-  GstAdapter *input_adapter;
-  /* assembles current frame */
-  GstAdapter *output_adapter;
-
-  /* Whether we attempt to convert newsegment from bytes to
-   * time using a bitrate estimation */
-  gboolean do_estimate_rate;
-
-  /* Whether input is considered packetized or not */
-  gboolean packetized;
-
-  /* Error handling */
-  gint max_errors;
-  gint error_count;
-
-  /* ... being tracked here;
-   * only available during parsing */
-  GstVideoCodecFrame *current_frame;
-  /* events that should apply to the current frame */
-  GList *current_frame_events;
-
-  /* relative offset of input data */
-  guint64 input_offset;
-  /* relative offset of frame */
-  guint64 frame_offset;
-  /* tracking ts and offsets */
-  GList *timestamps;
-
-  /* last incoming and outgoing ts */
-  GstClockTime last_timestamp_in;
-  GstClockTime last_timestamp_out;
-
-  /* last outgoing system frame number (used to detect reordering) */
-  guint last_out_frame_number;
-
-  /* TRUE if input timestamp is not monotonically increasing */
-  gboolean reordered_input;
-
-  /* TRUE if frames come out in a different order than they were inputted */
-  gboolean reordered_output;
-
-  /* reverse playback */
-  /* collect input */
-  GList *gather;
-  /* to-be-parsed */
-  GList *parse;
-  /* collected parsed frames */
-  GList *parse_gather;
-  /* frames to be handled == decoded */
-  GList *decode;
-  /* collected output - of buffer objects, not frames */
-  GList *output_queued;
-
-
-  /* base_picture_number is the picture number of the reference picture */
-  guint64 base_picture_number;
-  /* combine with base_picture_number, framerate and calcs to yield (presentation) ts */
-  GstClockTime base_timestamp;
-
-  /* FIXME : reorder_depth is never set */
-  int reorder_depth;
-  int distance_from_sync;
-
-  guint32 system_frame_number;
-  guint32 decode_frame_number;
-
-  GList *frames;                /* Protected with OBJECT_LOCK */
-  GstVideoCodecState *input_state;
-  GstVideoCodecState *output_state;     /* OBJECT_LOCK and STREAM_LOCK */
-  gboolean output_state_changed;
-
-  /* QoS properties */
-  gdouble proportion;           /* OBJECT_LOCK */
-  GstClockTime earliest_time;   /* OBJECT_LOCK */
-  GstClockTime qos_frame_duration;      /* OBJECT_LOCK */
-  gboolean discont;
-  /* qos messages: frames dropped/processed */
-  guint dropped;
-  guint processed;
-
-  /* Outgoing byte size ? */
-  gint64 bytes_out;
-  gint64 time;
-
-  gint64 min_latency;
-  gint64 max_latency;
-
-  /* Handle incoming buffers with DTS instead of PTS as timestamps */
-  GstClockTime incoming_timestamps[MAX_DTS_PTS_REORDER_DEPTH];
-  guint reorder_idx_in;
-  guint reorder_idx_out;
-};
-
-static void gst_video_decoder_finalize (GObject * object);
-
-static gboolean gst_video_decoder_sink_setcaps (GstPad * pad, GstCaps * caps);
-static gboolean gst_video_decoder_sink_event (GstPad * pad, GstEvent * event);
-static gboolean gst_video_decoder_src_event (GstPad * pad, GstEvent * event);
-static GstFlowReturn gst_video_decoder_chain (GstPad * pad, GstBuffer * buf);
-static gboolean gst_video_decoder_sink_query (GstPad * pad, GstQuery * query);
-static GstStateChangeReturn
-gst_video_decoder_change_state (GstElement * element,
-    GstStateChange transition);
-static const GstQueryType *gst_video_decoder_get_query_types (GstPad * pad);
-static gboolean gst_video_decoder_src_query (GstPad * pad, GstQuery * query);
-static void gst_video_decoder_reset (GstVideoDecoder * decoder, gboolean full);
-
-static GstFlowReturn gst_video_decoder_decode_frame (GstVideoDecoder * decoder,
-    GstVideoCodecFrame * frame);
-
-static void gst_video_decoder_release_frame (GstVideoDecoder * dec,
-    GstVideoCodecFrame * frame);
-static GstClockTime gst_video_decoder_get_frame_duration (GstVideoDecoder *
-    decoder, GstVideoCodecFrame * frame);
-static GstVideoCodecFrame *gst_video_decoder_new_frame (GstVideoDecoder *
-    decoder);
-static GstFlowReturn gst_video_decoder_clip_and_push_buf (GstVideoDecoder *
-    decoder, GstBuffer * buf);
-static GstFlowReturn gst_video_decoder_flush_parse (GstVideoDecoder * dec,
-    gboolean at_eos);
-
-static void gst_video_decoder_clear_queues (GstVideoDecoder * dec);
-
-static GstFlowReturn gst_video_decoder_parse_available (GstVideoDecoder * dec,
-    gboolean at_eos);
-
-GST_BOILERPLATE (GstVideoDecoder, gst_video_decoder,
-    GstElement, GST_TYPE_ELEMENT);
-
-static void
-gst_video_decoder_base_init (gpointer g_class)
-{
-  GST_DEBUG_CATEGORY_INIT (videodecoder_debug, "videodecoder", 0,
-      "Base Video Decoder");
-}
-
-static void
-gst_video_decoder_class_init (GstVideoDecoderClass * klass)
-{
-  GObjectClass *gobject_class;
-  GstElementClass *gstelement_class;
-
-  gobject_class = G_OBJECT_CLASS (klass);
-  gstelement_class = GST_ELEMENT_CLASS (klass);
-
-  g_type_class_add_private (klass, sizeof (GstVideoDecoderPrivate));
-
-  gobject_class->finalize = gst_video_decoder_finalize;
-
-  gstelement_class->change_state =
-      GST_DEBUG_FUNCPTR (gst_video_decoder_change_state);
-}
-
-static void
-gst_video_decoder_init (GstVideoDecoder * decoder, GstVideoDecoderClass * klass)
-{
-  GstPadTemplate *pad_template;
-  GstPad *pad;
-
-  GST_DEBUG_OBJECT (decoder, "gst_video_decoder_init");
-
-  decoder->priv = GST_VIDEO_DECODER_GET_PRIVATE (decoder);
-
-  pad_template =
-      gst_element_class_get_pad_template (GST_ELEMENT_CLASS (klass), "sink");
-  g_return_if_fail (pad_template != NULL);
-
-  decoder->sinkpad = pad = gst_pad_new_from_template (pad_template, "sink");
-
-  gst_pad_set_chain_function (pad, GST_DEBUG_FUNCPTR (gst_video_decoder_chain));
-  gst_pad_set_event_function (pad,
-      GST_DEBUG_FUNCPTR (gst_video_decoder_sink_event));
-  gst_pad_set_setcaps_function (pad,
-      GST_DEBUG_FUNCPTR (gst_video_decoder_sink_setcaps));
-  gst_pad_set_query_function (pad,
-      GST_DEBUG_FUNCPTR (gst_video_decoder_sink_query));
-  gst_element_add_pad (GST_ELEMENT (decoder), decoder->sinkpad);
-
-  pad_template =
-      gst_element_class_get_pad_template (GST_ELEMENT_CLASS (klass), "src");
-  g_return_if_fail (pad_template != NULL);
-
-  decoder->srcpad = pad = gst_pad_new_from_template (pad_template, "src");
-
-  gst_pad_set_event_function (pad,
-      GST_DEBUG_FUNCPTR (gst_video_decoder_src_event));
-  gst_pad_set_query_type_function (pad,
-      GST_DEBUG_FUNCPTR (gst_video_decoder_get_query_types));
-  gst_pad_set_query_function (pad,
-      GST_DEBUG_FUNCPTR (gst_video_decoder_src_query));
-  gst_pad_use_fixed_caps (pad);
-  gst_element_add_pad (GST_ELEMENT (decoder), decoder->srcpad);
-
-  gst_segment_init (&decoder->input_segment, GST_FORMAT_TIME);
-  gst_segment_init (&decoder->output_segment, GST_FORMAT_TIME);
-
-  g_static_rec_mutex_init (&decoder->stream_lock);
-
-  decoder->priv->input_adapter = gst_adapter_new ();
-  decoder->priv->output_adapter = gst_adapter_new ();
-  decoder->priv->packetized = TRUE;
-
-  gst_video_decoder_reset (decoder, TRUE);
-}
-
-static gboolean
-gst_video_rawvideo_convert (GstVideoCodecState * state,
-    GstFormat src_format, gint64 src_value,
-    GstFormat * dest_format, gint64 * dest_value)
-{
-  gboolean res = FALSE;
-  guint vidsize;
-  guint fps_n, fps_d;
-
-  g_return_val_if_fail (dest_format != NULL, FALSE);
-  g_return_val_if_fail (dest_value != NULL, FALSE);
-
-  if (src_format == *dest_format || src_value == 0 || src_value == -1) {
-    *dest_value = src_value;
-    return TRUE;
-  }
-
-  vidsize = GST_VIDEO_INFO_SIZE (&state->info);
-  fps_n = GST_VIDEO_INFO_FPS_N (&state->info);
-  fps_d = GST_VIDEO_INFO_FPS_D (&state->info);
-
-  if (src_format == GST_FORMAT_BYTES &&
-      *dest_format == GST_FORMAT_DEFAULT && vidsize) {
-    /* convert bytes to frames */
-    *dest_value = gst_util_uint64_scale_int (src_value, 1, vidsize);
-    res = TRUE;
-  } else if (src_format == GST_FORMAT_DEFAULT &&
-      *dest_format == GST_FORMAT_BYTES && vidsize) {
-    /* convert bytes to frames */
-    *dest_value = src_value * vidsize;
-    res = TRUE;
-  } else if (src_format == GST_FORMAT_DEFAULT &&
-      *dest_format == GST_FORMAT_TIME && fps_n) {
-    /* convert frames to time */
-    /* FIXME add segment time? */
-    *dest_value = gst_util_uint64_scale (src_value, GST_SECOND * fps_d, fps_n);
-    res = TRUE;
-  } else if (src_format == GST_FORMAT_TIME &&
-      *dest_format == GST_FORMAT_DEFAULT && fps_d) {
-    /* convert time to frames */
-    /* FIXME subtract segment time? */
-    *dest_value = gst_util_uint64_scale (src_value, fps_n, GST_SECOND * fps_d);
-    res = TRUE;
-  } else if (src_format == GST_FORMAT_TIME &&
-      *dest_format == GST_FORMAT_BYTES && fps_d && vidsize) {
-    /* convert time to frames */
-    /* FIXME subtract segment time? */
-    *dest_value = gst_util_uint64_scale (src_value,
-        fps_n * vidsize, GST_SECOND * fps_d);
-    res = TRUE;
-  } else if (src_format == GST_FORMAT_BYTES &&
-      *dest_format == GST_FORMAT_TIME && fps_n && vidsize) {
-    /* convert frames to time */
-    /* FIXME add segment time? */
-    *dest_value = gst_util_uint64_scale (src_value,
-        GST_SECOND * fps_d, fps_n * vidsize);
-    res = TRUE;
-  }
-
-  return res;
-}
-
-static gboolean
-gst_video_encoded_video_convert (gint64 bytes, gint64 time,
-    GstFormat src_format, gint64 src_value, GstFormat * dest_format,
-    gint64 * dest_value)
-{
-  gboolean res = FALSE;
-
-  g_return_val_if_fail (dest_format != NULL, FALSE);
-  g_return_val_if_fail (dest_value != NULL, FALSE);
-
-  if (G_UNLIKELY (src_format == *dest_format || src_value == 0 ||
-          src_value == -1)) {
-    if (dest_value)
-      *dest_value = src_value;
-    return TRUE;
-  }
-
-  if (bytes <= 0 || time <= 0) {
-    GST_DEBUG ("not enough metadata yet to convert");
-    goto exit;
-  }
-
-  switch (src_format) {
-    case GST_FORMAT_BYTES:
-      switch (*dest_format) {
-        case GST_FORMAT_TIME:
-          *dest_value = gst_util_uint64_scale (src_value, time, bytes);
-          res = TRUE;
-          break;
-        default:
-          res = FALSE;
-      }
-      break;
-    case GST_FORMAT_TIME:
-      switch (*dest_format) {
-        case GST_FORMAT_BYTES:
-          *dest_value = gst_util_uint64_scale (src_value, bytes, time);
-          res = TRUE;
-          break;
-        default:
-          res = FALSE;
-      }
-      break;
-    default:
-      GST_DEBUG ("unhandled conversion from %d to %d", src_format,
-          *dest_format);
-      res = FALSE;
-  }
-
-exit:
-  return res;
-}
-
-static GstVideoCodecState *
-_new_input_state (GstCaps * caps)
-{
-  GstVideoCodecState *state;
-  GstStructure *structure;
-  const GValue *codec_data;
-
-  state = g_slice_new0 (GstVideoCodecState);
-  state->ref_count = 1;
-  gst_video_info_init (&state->info);
-  if (G_UNLIKELY (!gst_video_info_from_caps (&state->info, caps)))
-    goto parse_fail;
-  state->caps = gst_caps_ref (caps);
-
-  structure = gst_caps_get_structure (caps, 0);
-
-  codec_data = gst_structure_get_value (structure, "codec_data");
-  if (codec_data && G_VALUE_TYPE (codec_data) == GST_TYPE_BUFFER)
-    state->codec_data = GST_BUFFER (gst_value_dup_mini_object (codec_data));
-
-  return state;
-
-parse_fail:
-  {
-    g_slice_free (GstVideoCodecState, state);
-    return NULL;
-  }
-}
-
-static GstVideoCodecState *
-_new_output_state (GstVideoFormat fmt, guint width, guint height,
-    GstVideoCodecState * reference)
-{
-  GstVideoCodecState *state;
-
-  state = g_slice_new0 (GstVideoCodecState);
-  state->ref_count = 1;
-  gst_video_info_init (&state->info);
-  gst_video_info_set_format (&state->info, fmt, width, height);
-
-  if (reference) {
-    GstVideoInfo *tgt, *ref;
-
-    tgt = &state->info;
-    ref = &reference->info;
-
-    /* Copy over extra fields from reference state */
-    tgt->interlace_mode = ref->interlace_mode;
-    tgt->flags = ref->flags;
-    tgt->chroma_site = ref->chroma_site;
-    tgt->colorimetry = ref->colorimetry;
-    GST_DEBUG ("reference par %d/%d fps %d/%d",
-        ref->par_n, ref->par_d, ref->fps_n, ref->fps_d);
-    tgt->par_n = ref->par_n;
-    tgt->par_d = ref->par_d;
-    tgt->fps_n = ref->fps_n;
-    tgt->fps_d = ref->fps_d;
-  }
-
-  GST_DEBUG ("reference par %d/%d fps %d/%d",
-      state->info.par_n, state->info.par_d,
-      state->info.fps_n, state->info.fps_d);
-
-  return state;
-}
-
-static gboolean
-gst_video_decoder_sink_setcaps (GstPad * pad, GstCaps * caps)
-{
-  GstVideoDecoder *decoder;
-  GstVideoDecoderClass *decoder_class;
-  GstVideoCodecState *state;
-  gboolean ret = TRUE;
-
-  decoder = GST_VIDEO_DECODER (gst_pad_get_parent (pad));
-  decoder_class = GST_VIDEO_DECODER_GET_CLASS (decoder);
-
-  GST_DEBUG_OBJECT (decoder, "setcaps %" GST_PTR_FORMAT, caps);
-
-  state = _new_input_state (caps);
-
-  if (G_UNLIKELY (state == NULL))
-    goto parse_fail;
-
-  GST_VIDEO_DECODER_STREAM_LOCK (decoder);
-
-  if (decoder_class->set_format)
-    ret = decoder_class->set_format (decoder, state);
-
-  if (!ret)
-    goto refused_format;
-
-  if (decoder->priv->input_state)
-    gst_video_codec_state_unref (decoder->priv->input_state);
-  decoder->priv->input_state = state;
-
-  GST_VIDEO_DECODER_STREAM_UNLOCK (decoder);
-  gst_object_unref (decoder);
-
-  return ret;
-
-  /* ERRORS */
-
-parse_fail:
-  {
-    GST_WARNING_OBJECT (decoder, "Failed to parse caps");
-    gst_object_unref (decoder);
-    return FALSE;
-  }
-
-refused_format:
-  {
-    GST_VIDEO_DECODER_STREAM_UNLOCK (decoder);
-    GST_WARNING_OBJECT (decoder, "Subclass refused caps");
-    gst_video_codec_state_unref (state);
-    gst_object_unref (decoder);
-    return FALSE;
-  }
-}
-
-static void
-gst_video_decoder_finalize (GObject * object)
-{
-  GstVideoDecoder *decoder;
-
-  decoder = GST_VIDEO_DECODER (object);
-
-  GST_DEBUG_OBJECT (object, "finalize");
-
-  g_static_rec_mutex_free (&decoder->stream_lock);
-
-  if (decoder->priv->input_adapter) {
-    g_object_unref (decoder->priv->input_adapter);
-    decoder->priv->input_adapter = NULL;
-  }
-  if (decoder->priv->output_adapter) {
-    g_object_unref (decoder->priv->output_adapter);
-    decoder->priv->output_adapter = NULL;
-  }
-
-  if (decoder->priv->input_state)
-    gst_video_codec_state_unref (decoder->priv->input_state);
-  if (decoder->priv->output_state)
-    gst_video_codec_state_unref (decoder->priv->output_state);
-
-  G_OBJECT_CLASS (parent_class)->finalize (object);
-}
-
-/* hard == FLUSH, otherwise discont */
-static GstFlowReturn
-gst_video_decoder_flush (GstVideoDecoder * dec, gboolean hard)
-{
-  GstVideoDecoderClass *klass;
-  GstVideoDecoderPrivate *priv = dec->priv;
-  GstFlowReturn ret = GST_FLOW_OK;
-
-  klass = GST_VIDEO_DECODER_GET_CLASS (dec);
-
-  GST_LOG_OBJECT (dec, "flush hard %d", hard);
-
-  /* Inform subclass */
-  if (klass->reset)
-    klass->reset (dec, hard);
-
-  /* FIXME make some more distinction between hard and soft,
-   * but subclass may not be prepared for that */
-  /* FIXME perhaps also clear pending frames ?,
-   * but again, subclass may still come up with one of those */
-  if (!hard) {
-    /* TODO ? finish/drain some stuff */
-  } else {
-    gst_segment_init (&dec->input_segment, GST_FORMAT_UNDEFINED);
-    gst_segment_init (&dec->output_segment, GST_FORMAT_UNDEFINED);
-    gst_video_decoder_clear_queues (dec);
-    priv->error_count = 0;
-    g_list_foreach (priv->current_frame_events, (GFunc) gst_event_unref, NULL);
-    g_list_free (priv->current_frame_events);
-    priv->current_frame_events = NULL;
-  }
-  /* and get (re)set for the sequel */
-  gst_video_decoder_reset (dec, FALSE);
-
-  return ret;
-}
-
-static GstFlowReturn
-gst_video_decoder_parse_available (GstVideoDecoder * dec, gboolean at_eos)
-{
-  GstVideoDecoderClass *decoder_class = GST_VIDEO_DECODER_GET_CLASS (dec);
-  GstVideoDecoderPrivate *priv = dec->priv;
-  GstFlowReturn ret = GST_FLOW_OK;
-  gsize start_size, available;
-
-  available = gst_adapter_available (priv->input_adapter);
-  start_size = 0;
-
-  while (ret == GST_FLOW_OK && available && start_size != available) {
-    /* current frame may have been parsed and handled,
-     * so we need to set up a new one when asking subclass to parse */
-    if (priv->current_frame == NULL)
-      priv->current_frame = gst_video_decoder_new_frame (dec);
-
-    start_size = available;
-    ret = decoder_class->parse (dec, priv->current_frame,
-        priv->input_adapter, at_eos);
-    available = gst_adapter_available (priv->input_adapter);
-  }
-
-  return ret;
-}
-
-static GstFlowReturn
-gst_video_decoder_drain_out (GstVideoDecoder * dec, gboolean at_eos)
-{
-  GstVideoDecoderClass *decoder_class = GST_VIDEO_DECODER_GET_CLASS (dec);
-  GstVideoDecoderPrivate *priv = dec->priv;
-  GstFlowReturn ret = GST_FLOW_OK;
-
-  GST_VIDEO_DECODER_STREAM_LOCK (dec);
-
-  if (dec->input_segment.rate > 0.0) {
-    /* Forward mode, if unpacketized, give the child class
-     * a final chance to flush out packets */
-    if (!priv->packetized) {
-      ret = gst_video_decoder_parse_available (dec, TRUE);
-    }
-  } else {
-    /* Reverse playback mode */
-    ret = gst_video_decoder_flush_parse (dec, TRUE);
-  }
-
-  if (at_eos) {
-    if (decoder_class->finish)
-      ret = decoder_class->finish (dec);
-  }
-
-  GST_VIDEO_DECODER_STREAM_UNLOCK (dec);
-
-  return ret;
-}
-
-static gboolean
-gst_video_decoder_sink_eventfunc (GstVideoDecoder * decoder, GstEvent * event)
-{
-  GstVideoDecoderPrivate *priv;
-  gboolean handled = FALSE;
-
-  priv = decoder->priv;
-
-  switch (GST_EVENT_TYPE (event)) {
-    case GST_EVENT_EOS:
-    {
-      GstFlowReturn flow_ret = GST_FLOW_OK;
-
-      flow_ret = gst_video_decoder_drain_out (decoder, TRUE);
-      handled = (flow_ret == GST_VIDEO_DECODER_FLOW_DROPPED);
-
-      break;
-    }
-    case GST_EVENT_NEWSEGMENT:
-    {
-      gboolean update;
-      double rate, arate;
-      GstFormat format;
-      gint64 start;
-      gint64 stop;
-      gint64 pos;
-      GstSegment *segment = &decoder->input_segment;
-
-      GST_VIDEO_DECODER_STREAM_LOCK (decoder);
-      gst_event_parse_new_segment_full (event, &update, &rate,
-          &arate, &format, &start, &stop, &pos);
-
-      if (format == GST_FORMAT_TIME) {
-        GST_DEBUG_OBJECT (decoder,
-            "received TIME NEW_SEGMENT %" GST_TIME_FORMAT
-            " -- %" GST_TIME_FORMAT ", pos %" GST_TIME_FORMAT
-            ", rate %g, applied_rate %g",
-            GST_TIME_ARGS (start), GST_TIME_ARGS (stop), GST_TIME_ARGS (pos),
-            rate, arate);
-      } else {
-        GstFormat dformat = GST_FORMAT_TIME;
-
-        GST_DEBUG_OBJECT (decoder,
-            "received NEW_SEGMENT %" G_GINT64_FORMAT
-            " -- %" G_GINT64_FORMAT ", time %" G_GINT64_FORMAT
-            ", rate %g, applied_rate %g", start, stop, pos, rate, arate);
-
-        /* handle newsegment as a result from our legacy simple seeking */
-        /* note that initial 0 should convert to 0 in any case */
-        if (priv->do_estimate_rate &&
-            gst_pad_query_convert (decoder->sinkpad, GST_FORMAT_BYTES, start,
-                &dformat, &start)) {
-          /* best attempt convert */
-          /* as these are only estimates, stop is kept open-ended to avoid
-           * premature cutting */
-          GST_DEBUG_OBJECT (decoder,
-              "converted to TIME start %" GST_TIME_FORMAT,
-              GST_TIME_ARGS (start));
-          pos = start;
-          stop = GST_CLOCK_TIME_NONE;
-          /* replace event */
-          gst_event_unref (event);
-          event = gst_event_new_new_segment_full (update, rate, arate,
-              GST_FORMAT_TIME, start, stop, pos);
-        } else {
-          GST_VIDEO_DECODER_STREAM_UNLOCK (decoder);
-          goto newseg_wrong_format;
-        }
-      }
-
-      if (!update) {
-        gst_video_decoder_flush (decoder, FALSE);
-      }
-
-      priv->base_timestamp = GST_CLOCK_TIME_NONE;
-      priv->base_picture_number = 0;
-
-      gst_segment_set_newsegment_full (segment,
-          update, rate, arate, format, start, stop, pos);
-
-      GST_VIDEO_DECODER_STREAM_UNLOCK (decoder);
-      break;
-    }
-    case GST_EVENT_FLUSH_STOP:
-    {
-      GST_VIDEO_DECODER_STREAM_LOCK (decoder);
-      /* well, this is kind of worse than a DISCONT */
-      gst_video_decoder_flush (decoder, TRUE);
-      GST_VIDEO_DECODER_STREAM_UNLOCK (decoder);
-      break;
-    }
-    default:
-      break;
-  }
-
-  return handled;
-
-newseg_wrong_format:
-  {
-    GST_DEBUG_OBJECT (decoder, "received non TIME newsegment");
-    gst_event_unref (event);
-    /* SWALLOW EVENT */
-    /* FIXME : Ideally we'd like to return FALSE in the event handler */
-    return TRUE;
-  }
-}
-
-static gboolean
-gst_video_decoder_push_event (GstVideoDecoder * decoder, GstEvent * event)
-{
-  switch (GST_EVENT_TYPE (event)) {
-    case GST_EVENT_NEWSEGMENT:
-    {
-      gboolean update;
-      double rate;
-      double applied_rate;
-      GstFormat format;
-      gint64 start;
-      gint64 stop;
-      gint64 position;
-
-      GST_VIDEO_DECODER_STREAM_LOCK (decoder);
-      gst_event_parse_new_segment_full (event, &update, &rate, &applied_rate,
-          &format, &start, &stop, &position);
-
-      GST_DEBUG_OBJECT (decoder, "newseg rate %g, applied rate %g, "
-          "format %d, start = %" GST_TIME_FORMAT ", stop = %" GST_TIME_FORMAT
-          ", pos = %" GST_TIME_FORMAT, rate, applied_rate, format,
-          GST_TIME_ARGS (start), GST_TIME_ARGS (stop),
-          GST_TIME_ARGS (position));
-
-      if (format != GST_FORMAT_TIME) {
-        GST_DEBUG_OBJECT (decoder, "received non TIME newsegment");
-        GST_VIDEO_DECODER_STREAM_UNLOCK (decoder);
-        break;
-      }
-
-      gst_segment_set_newsegment_full (&decoder->output_segment, update, rate,
-          applied_rate, format, start, stop, position);
-      GST_VIDEO_DECODER_STREAM_UNLOCK (decoder);
-      break;
-    }
-    default:
-      break;
-  }
-
-  return gst_pad_push_event (decoder->srcpad, event);
-}
-
-static gboolean
-gst_video_decoder_sink_event (GstPad * pad, GstEvent * event)
-{
-  GstVideoDecoder *decoder;
-  GstVideoDecoderClass *decoder_class;
-  gboolean ret = FALSE;
-  gboolean handled = FALSE;
-
-  decoder = GST_VIDEO_DECODER (gst_pad_get_parent (pad));
-  decoder_class = GST_VIDEO_DECODER_GET_CLASS (decoder);
-
-  GST_DEBUG_OBJECT (decoder, "received event %d, %s", GST_EVENT_TYPE (event),
-      GST_EVENT_TYPE_NAME (event));
-
-  if (decoder_class->sink_event)
-    handled = decoder_class->sink_event (decoder, event);
-
-  if (!handled)
-    handled = gst_video_decoder_sink_eventfunc (decoder, event);
-
-  if (!handled) {
-    /* Forward non-serialized events and EOS/FLUSH_STOP immediately.
-     * For EOS this is required because no buffer or serialized event
-     * will come after EOS and nothing could trigger another
-     * _finish_frame() call.   *
-     * If the subclass handles sending of EOS manually it can return
-     * _DROPPED from ::finish() and all other subclasses should have
-     * decoded/flushed all remaining data before this
-     *
-     * For FLUSH_STOP this is required because it is expected
-     * to be forwarded immediately and no buffers are queued anyway.
-     */
-    if (!GST_EVENT_IS_SERIALIZED (event)
-        || GST_EVENT_TYPE (event) == GST_EVENT_EOS
-        || GST_EVENT_TYPE (event) == GST_EVENT_FLUSH_STOP) {
-      ret = gst_video_decoder_push_event (decoder, event);
-    } else {
-      GST_VIDEO_DECODER_STREAM_LOCK (decoder);
-      decoder->priv->current_frame_events =
-          g_list_prepend (decoder->priv->current_frame_events, event);
-      GST_VIDEO_DECODER_STREAM_UNLOCK (decoder);
-      ret = TRUE;
-    }
-  }
-
-  gst_object_unref (decoder);
-  return ret;
-
-}
-
-/* perform upstream byte <-> time conversion (duration, seeking)
- * if subclass allows and if enough data for moderately decent conversion */
-static inline gboolean
-gst_video_decoder_do_byte (GstVideoDecoder * dec)
-{
-  return dec->priv->do_estimate_rate && (dec->priv->bytes_out > 0)
-      && (dec->priv->time > GST_SECOND);
-}
-
-static gboolean
-gst_video_decoder_do_seek (GstVideoDecoder * dec, GstEvent * event)
-{
-  GstFormat format;
-  GstSeekFlags flags;
-  GstSeekType start_type, end_type;
-  gdouble rate;
-  gint64 start, start_time, end_time;
-  GstSegment seek_segment;
-  guint32 seqnum;
-
-  gst_event_parse_seek (event, &rate, &format, &flags, &start_type,
-      &start_time, &end_type, &end_time);
-
-  /* we'll handle plain open-ended flushing seeks with the simple approach */
-  if (rate != 1.0) {
-    GST_DEBUG_OBJECT (dec, "unsupported seek: rate");
-    return FALSE;
-  }
-
-  if (start_type != GST_SEEK_TYPE_SET) {
-    GST_DEBUG_OBJECT (dec, "unsupported seek: start time");
-    return FALSE;
-  }
-
-  if (end_type != GST_SEEK_TYPE_NONE ||
-      (end_type == GST_SEEK_TYPE_SET && end_time != GST_CLOCK_TIME_NONE)) {
-    GST_DEBUG_OBJECT (dec, "unsupported seek: end time");
-    return FALSE;
-  }
-
-  if (!(flags & GST_SEEK_FLAG_FLUSH)) {
-    GST_DEBUG_OBJECT (dec, "unsupported seek: not flushing");
-    return FALSE;
-  }
-
-  memcpy (&seek_segment, &dec->output_segment, sizeof (seek_segment));
-  gst_segment_set_seek (&seek_segment, rate, format, flags, start_type,
-      start_time, end_type, end_time, NULL);
-  start_time = seek_segment.last_stop;
-
-  format = GST_FORMAT_BYTES;
-  if (!gst_pad_query_convert (dec->sinkpad, GST_FORMAT_TIME, start_time,
-          &format, &start)) {
-    GST_DEBUG_OBJECT (dec, "conversion failed");
-    return FALSE;
-  }
-
-  seqnum = gst_event_get_seqnum (event);
-  event = gst_event_new_seek (1.0, GST_FORMAT_BYTES, flags,
-      GST_SEEK_TYPE_SET, start, GST_SEEK_TYPE_NONE, -1);
-  gst_event_set_seqnum (event, seqnum);
-
-  GST_DEBUG_OBJECT (dec, "seeking to %" GST_TIME_FORMAT " at byte offset %"
-      G_GINT64_FORMAT, GST_TIME_ARGS (start_time), start);
-
-  return gst_pad_push_event (dec->sinkpad, event);
-}
-
-static gboolean
-gst_video_decoder_src_eventfunc (GstVideoDecoder * decoder, GstEvent * event)
-{
-  GstVideoDecoderPrivate *priv;
-  gboolean res = FALSE;
-
-  priv = decoder->priv;
-
-  GST_DEBUG_OBJECT (decoder,
-      "received event %d, %s", GST_EVENT_TYPE (event),
-      GST_EVENT_TYPE_NAME (event));
-
-  switch (GST_EVENT_TYPE (event)) {
-    case GST_EVENT_SEEK:
-    {
-      GstFormat format, tformat;
-      gdouble rate;
-      GstSeekFlags flags;
-      GstSeekType cur_type, stop_type;
-      gint64 cur, stop;
-      gint64 tcur, tstop;
-      guint32 seqnum;
-
-      gst_event_parse_seek (event, &rate, &format, &flags, &cur_type, &cur,
-          &stop_type, &stop);
-      seqnum = gst_event_get_seqnum (event);
-
-      /* upstream gets a chance first */
-      if ((res = gst_pad_push_event (decoder->sinkpad, event)))
-        break;
-
-      /* if upstream fails for a time seek, maybe we can help if allowed */
-      if (format == GST_FORMAT_TIME) {
-        if (gst_video_decoder_do_byte (decoder))
-          res = gst_video_decoder_do_seek (decoder, event);
-        break;
-      }
-
-      /* ... though a non-time seek can be aided as well */
-      /* First bring the requested format to time */
-      tformat = GST_FORMAT_TIME;
-      if (!(res =
-              gst_pad_query_convert (decoder->srcpad, format, cur, &tformat,
-                  &tcur)))
-        goto convert_error;
-      if (!(res =
-              gst_pad_query_convert (decoder->srcpad, format, stop, &tformat,
-                  &tstop)))
-        goto convert_error;
-
-      /* then seek with time on the peer */
-      event = gst_event_new_seek (rate, GST_FORMAT_TIME,
-          flags, cur_type, tcur, stop_type, tstop);
-      gst_event_set_seqnum (event, seqnum);
-
-      res = gst_pad_push_event (decoder->sinkpad, event);
-      break;
-    }
-    case GST_EVENT_QOS:
-    {
-      gdouble proportion;
-      GstClockTimeDiff diff;
-      GstClockTime timestamp;
-
-      gst_event_parse_qos (event, &proportion, &diff, &timestamp);
-
-      GST_OBJECT_LOCK (decoder);
-      priv->proportion = proportion;
-      if (G_LIKELY (GST_CLOCK_TIME_IS_VALID (timestamp))) {
-        if (G_UNLIKELY (diff > 0)) {
-          priv->earliest_time = timestamp + 2 * diff + priv->qos_frame_duration;
-        } else {
-          priv->earliest_time = timestamp + diff;
-        }
-      } else {
-        priv->earliest_time = GST_CLOCK_TIME_NONE;
-      }
-      GST_OBJECT_UNLOCK (decoder);
-
-      GST_DEBUG_OBJECT (decoder,
-          "got QoS %" GST_TIME_FORMAT ", %" G_GINT64_FORMAT ", %g",
-          GST_TIME_ARGS (timestamp), diff, proportion);
-
-      res = gst_pad_push_event (decoder->sinkpad, event);
-      break;
-    }
-    default:
-      res = gst_pad_push_event (decoder->sinkpad, event);
-      break;
-  }
-done:
-  return res;
-
-convert_error:
-  GST_DEBUG_OBJECT (decoder, "could not convert format");
-  goto done;
-}
-
-static gboolean
-gst_video_decoder_src_event (GstPad * pad, GstEvent * event)
-{
-  GstVideoDecoder *decoder;
-  GstVideoDecoderClass *decoder_class;
-  gboolean ret = TRUE;
-  gboolean handled = FALSE;
-
-  decoder = GST_VIDEO_DECODER (gst_pad_get_parent (pad));
-  decoder_class = GST_VIDEO_DECODER_GET_CLASS (decoder);
-
-  GST_DEBUG_OBJECT (decoder, "received event %d, %s", GST_EVENT_TYPE (event),
-      GST_EVENT_TYPE_NAME (event));
-
-  if (decoder_class->src_event)
-    handled = decoder_class->src_event (decoder, event);
-
-  if (!handled)
-    handled = gst_video_decoder_src_eventfunc (decoder, event);
-
-  gst_object_unref (decoder);
-
-  return ret;
-}
-
-static const GstQueryType *
-gst_video_decoder_get_query_types (GstPad * pad)
-{
-  static const GstQueryType query_types[] = {
-    GST_QUERY_POSITION,
-    GST_QUERY_DURATION,
-    GST_QUERY_CONVERT,
-    GST_QUERY_LATENCY,
-    0
-  };
-
-  return query_types;
-}
-
-static gboolean
-gst_video_decoder_src_query (GstPad * pad, GstQuery * query)
-{
-  GstVideoDecoder *dec;
-  gboolean res = TRUE;
-
-  dec = GST_VIDEO_DECODER (gst_pad_get_parent (pad));
-
-  GST_LOG_OBJECT (dec, "handling query: %" GST_PTR_FORMAT, query);
-
-  switch (GST_QUERY_TYPE (query)) {
-    case GST_QUERY_POSITION:
-    {
-      GstFormat format;
-      gint64 time, value;
-
-      /* upstream gets a chance first */
-      if ((res = gst_pad_peer_query (dec->sinkpad, query))) {
-        GST_LOG_OBJECT (dec, "returning peer response");
-        break;
-      }
-
-      /* we start from the last seen time */
-      time = dec->priv->last_timestamp_out;
-      /* correct for the segment values */
-      time = gst_segment_to_stream_time (&dec->output_segment,
-          GST_FORMAT_TIME, time);
-
-      GST_LOG_OBJECT (dec,
-          "query %p: our time: %" GST_TIME_FORMAT, query, GST_TIME_ARGS (time));
-
-      /* and convert to the final format */
-      gst_query_parse_position (query, &format, NULL);
-      if (!(res = gst_pad_query_convert (pad, GST_FORMAT_TIME, time,
-                  &format, &value)))
-        break;
-
-      gst_query_set_position (query, format, value);
-
-      GST_LOG_OBJECT (dec,
-          "query %p: we return %" G_GINT64_FORMAT " (format %u)", query, value,
-          format);
-      break;
-    }
-    case GST_QUERY_DURATION:
-    {
-      GstFormat format;
-
-      /* upstream in any case */
-      if ((res = gst_pad_query_default (pad, query)))
-        break;
-
-      gst_query_parse_duration (query, &format, NULL);
-      /* try answering TIME by converting from BYTE if subclass allows  */
-      if (format == GST_FORMAT_TIME && gst_video_decoder_do_byte (dec)) {
-        gint64 value;
-
-        format = GST_FORMAT_BYTES;
-        if (gst_pad_query_peer_duration (dec->sinkpad, &format, &value)) {
-          GST_LOG_OBJECT (dec, "upstream size %" G_GINT64_FORMAT, value);
-          format = GST_FORMAT_TIME;
-          if (gst_pad_query_convert (dec->sinkpad,
-                  GST_FORMAT_BYTES, value, &format, &value)) {
-            gst_query_set_duration (query, GST_FORMAT_TIME, value);
-            res = TRUE;
-          }
-        }
-      }
-      break;
-    }
-    case GST_QUERY_CONVERT:
-    {
-      GstFormat src_fmt, dest_fmt;
-      gint64 src_val, dest_val;
-
-      GST_DEBUG_OBJECT (dec, "convert query");
-
-      gst_query_parse_convert (query, &src_fmt, &src_val, &dest_fmt, &dest_val);
-      GST_OBJECT_LOCK (dec);
-      if (dec->priv->output_state != NULL)
-        res = gst_video_rawvideo_convert (dec->priv->output_state,
-            src_fmt, src_val, &dest_fmt, &dest_val);
-      else
-        res = FALSE;
-      GST_OBJECT_UNLOCK (dec);
-      if (!res)
-        goto error;
-      gst_query_set_convert (query, src_fmt, src_val, dest_fmt, dest_val);
-      break;
-    }
-    case GST_QUERY_LATENCY:
-    {
-      gboolean live;
-      GstClockTime min_latency, max_latency;
-
-      res = gst_pad_peer_query (dec->sinkpad, query);
-      if (res) {
-        gst_query_parse_latency (query, &live, &min_latency, &max_latency);
-        GST_DEBUG_OBJECT (dec, "Peer qlatency: live %d, min %"
-            GST_TIME_FORMAT " max %" GST_TIME_FORMAT, live,
-            GST_TIME_ARGS (min_latency), GST_TIME_ARGS (max_latency));
-
-        GST_OBJECT_LOCK (dec);
-        min_latency += dec->priv->min_latency;
-        if (dec->priv->max_latency == GST_CLOCK_TIME_NONE) {
-          max_latency = GST_CLOCK_TIME_NONE;
-        } else if (max_latency != GST_CLOCK_TIME_NONE) {
-          max_latency += dec->priv->max_latency;
-        }
-        GST_OBJECT_UNLOCK (dec);
-
-        gst_query_set_latency (query, live, min_latency, max_latency);
-      }
-    }
-      break;
-    default:
-      res = gst_pad_query_default (pad, query);
-  }
-  gst_object_unref (dec);
-  return res;
-
-error:
-  GST_ERROR_OBJECT (dec, "query failed");
-  gst_object_unref (dec);
-  return res;
-}
-
-static gboolean
-gst_video_decoder_sink_query (GstPad * pad, GstQuery * query)
-{
-  GstVideoDecoder *decoder;
-  GstVideoDecoderPrivate *priv;
-  gboolean res = FALSE;
-
-  decoder = GST_VIDEO_DECODER (gst_pad_get_parent (pad));
-  priv = decoder->priv;
-
-  GST_LOG_OBJECT (decoder, "handling query: %" GST_PTR_FORMAT, query);
-
-  switch (GST_QUERY_TYPE (query)) {
-    case GST_QUERY_CONVERT:
-    {
-      GstFormat src_fmt, dest_fmt;
-      gint64 src_val, dest_val;
-
-      gst_query_parse_convert (query, &src_fmt, &src_val, &dest_fmt, &dest_val);
-      res =
-          gst_video_encoded_video_convert (priv->bytes_out, priv->time, src_fmt,
-          src_val, &dest_fmt, &dest_val);
-      if (!res)
-        goto error;
-      gst_query_set_convert (query, src_fmt, src_val, dest_fmt, dest_val);
-      break;
-    }
-    default:
-      res = gst_pad_query_default (pad, query);
-      break;
-  }
-done:
-  gst_object_unref (decoder);
-
-  return res;
-error:
-  GST_DEBUG_OBJECT (decoder, "query failed");
-  goto done;
-}
-
-typedef struct _Timestamp Timestamp;
-struct _Timestamp
-{
-  guint64 offset;
-  GstClockTime timestamp;
-  GstClockTime duration;
-};
-
-static void
-timestamp_free (Timestamp * ts)
-{
-  g_slice_free (Timestamp, ts);
-}
-
-static void
-gst_video_decoder_add_timestamp (GstVideoDecoder * decoder, GstBuffer * buffer)
-{
-  GstVideoDecoderPrivate *priv = decoder->priv;
-  Timestamp *ts;
-
-  ts = g_slice_new (Timestamp);
-
-  GST_LOG_OBJECT (decoder,
-      "adding timestamp %" GST_TIME_FORMAT " (offset:%" G_GUINT64_FORMAT ")",
-      GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (buffer)), priv->input_offset);
-
-  ts->offset = priv->input_offset;
-  ts->timestamp = GST_BUFFER_TIMESTAMP (buffer);
-  ts->duration = GST_BUFFER_DURATION (buffer);
-
-  priv->timestamps = g_list_append (priv->timestamps, ts);
-}
-
-static void
-gst_video_decoder_get_timestamp_at_offset (GstVideoDecoder *
-    decoder, guint64 offset, GstClockTime * timestamp, GstClockTime * duration)
-{
-#ifndef GST_DISABLE_GST_DEBUG
-  guint64 got_offset = 0;
-#endif
-  Timestamp *ts;
-  GList *g;
-
-  *timestamp = GST_CLOCK_TIME_NONE;
-  *duration = GST_CLOCK_TIME_NONE;
-
-  g = decoder->priv->timestamps;
-  while (g) {
-    ts = g->data;
-    if (ts->offset <= offset) {
-#ifndef GST_DISABLE_GST_DEBUG
-      got_offset = ts->offset;
-#endif
-      *timestamp = ts->timestamp;
-      *duration = ts->duration;
-      timestamp_free (ts);
-      g = g->next;
-      decoder->priv->timestamps = g_list_remove (decoder->priv->timestamps, ts);
-    } else {
-      break;
-    }
-  }
-
-  GST_LOG_OBJECT (decoder,
-      "got timestamp %" GST_TIME_FORMAT " @ offs %" G_GUINT64_FORMAT
-      " (wanted offset:%" G_GUINT64_FORMAT ")", GST_TIME_ARGS (*timestamp),
-      got_offset, offset);
-}
-
-static void
-gst_video_decoder_clear_queues (GstVideoDecoder * dec)
-{
-  GstVideoDecoderPrivate *priv = dec->priv;
-
-  g_list_foreach (priv->output_queued, (GFunc) gst_mini_object_unref, NULL);
-  g_list_free (priv->output_queued);
-  priv->output_queued = NULL;
-
-  g_list_foreach (priv->gather, (GFunc) gst_mini_object_unref, NULL);
-  g_list_free (priv->gather);
-  priv->gather = NULL;
-  g_list_foreach (priv->decode, (GFunc) gst_video_codec_frame_unref, NULL);
-  g_list_free (priv->decode);
-  priv->decode = NULL;
-  g_list_foreach (priv->parse, (GFunc) gst_mini_object_unref, NULL);
-  g_list_free (priv->parse);
-  priv->parse = NULL;
-  g_list_foreach (priv->parse_gather, (GFunc) gst_video_codec_frame_unref,
-      NULL);
-  g_list_free (priv->parse_gather);
-  priv->parse_gather = NULL;
-  g_list_foreach (priv->frames, (GFunc) gst_video_codec_frame_unref, NULL);
-  g_list_free (priv->frames);
-  priv->frames = NULL;
-}
-
-static void
-gst_video_decoder_reset (GstVideoDecoder * decoder, gboolean full)
-{
-  GstVideoDecoderPrivate *priv = decoder->priv;
-
-  GST_DEBUG_OBJECT (decoder, "reset full %d", full);
-
-  GST_VIDEO_DECODER_STREAM_LOCK (decoder);
-
-  if (full) {
-    gst_segment_init (&decoder->input_segment, GST_FORMAT_UNDEFINED);
-    gst_segment_init (&decoder->output_segment, GST_FORMAT_UNDEFINED);
-    gst_video_decoder_clear_queues (decoder);
-    priv->error_count = 0;
-    priv->max_errors = GST_VIDEO_DECODER_MAX_ERRORS;
-    if (priv->input_state)
-      gst_video_codec_state_unref (priv->input_state);
-    priv->input_state = NULL;
-    GST_OBJECT_LOCK (decoder);
-    if (priv->output_state)
-      gst_video_codec_state_unref (priv->output_state);
-    priv->output_state = NULL;
-
-    priv->qos_frame_duration = 0;
-    GST_OBJECT_UNLOCK (decoder);
-
-    priv->min_latency = 0;
-    priv->max_latency = 0;
-  }
-
-  priv->discont = TRUE;
-
-  priv->base_timestamp = GST_CLOCK_TIME_NONE;
-  priv->last_timestamp_in = GST_CLOCK_TIME_NONE;
-  priv->last_timestamp_out = GST_CLOCK_TIME_NONE;
-  priv->last_out_frame_number = (guint) (-1);
-  priv->reordered_output = FALSE;
-  priv->reordered_input = FALSE;
-
-  priv->input_offset = 0;
-  priv->frame_offset = 0;
-  gst_adapter_clear (priv->input_adapter);
-  gst_adapter_clear (priv->output_adapter);
-  g_list_foreach (priv->timestamps, (GFunc) timestamp_free, NULL);
-  g_list_free (priv->timestamps);
-  priv->timestamps = NULL;
-
-  if (priv->current_frame) {
-    gst_video_codec_frame_unref (priv->current_frame);
-    priv->current_frame = NULL;
-  }
-
-  priv->dropped = 0;
-  priv->processed = 0;
-
-  priv->decode_frame_number = 0;
-  priv->base_picture_number = 0;
-
-  g_list_foreach (priv->frames, (GFunc) gst_video_codec_frame_unref, NULL);
-  g_list_free (priv->frames);
-  priv->frames = NULL;
-
-  priv->bytes_out = 0;
-  priv->time = 0;
-
-  GST_OBJECT_LOCK (decoder);
-  priv->earliest_time = GST_CLOCK_TIME_NONE;
-  priv->proportion = 0.5;
-  GST_OBJECT_UNLOCK (decoder);
-
-  priv->reorder_idx_out = priv->reorder_idx_in = 0;
-
-  GST_VIDEO_DECODER_STREAM_UNLOCK (decoder);
-}
-
-static GstFlowReturn
-gst_video_decoder_chain_forward (GstVideoDecoder * decoder,
-    GstBuffer * buf, gboolean at_eos)
-{
-  GstVideoDecoderPrivate *priv;
-  GstVideoDecoderClass *klass;
-  GstFlowReturn ret = GST_FLOW_OK;
-
-  klass = GST_VIDEO_DECODER_GET_CLASS (decoder);
-  priv = decoder->priv;
-
-  g_return_val_if_fail (priv->packetized || klass->parse, GST_FLOW_ERROR);
-
-  if (priv->current_frame == NULL)
-    priv->current_frame = gst_video_decoder_new_frame (decoder);
-
-  if (GST_BUFFER_TIMESTAMP_IS_VALID (buf) && !priv->packetized) {
-    gst_video_decoder_add_timestamp (decoder, buf);
-  }
-  priv->input_offset += GST_BUFFER_SIZE (buf);
-
-  if (priv->packetized) {
-    if (!GST_BUFFER_FLAG_IS_SET (buf, GST_BUFFER_FLAG_DELTA_UNIT)) {
-      GST_VIDEO_CODEC_FRAME_SET_SYNC_POINT (priv->current_frame);
-    }
-
-    priv->current_frame->input_buffer = buf;
-
-    if (decoder->input_segment.rate < 0.0) {
-      priv->parse_gather =
-          g_list_prepend (priv->parse_gather, priv->current_frame);
-    } else {
-      ret = gst_video_decoder_decode_frame (decoder, priv->current_frame);
-    }
-    priv->current_frame = NULL;
-  } else {
-    gst_adapter_push (priv->input_adapter, buf);
-
-    ret = gst_video_decoder_parse_available (decoder, at_eos);
-  }
-
-  if (ret == GST_VIDEO_DECODER_FLOW_NEED_DATA)
-    return GST_FLOW_OK;
-
-  return ret;
-}
-
-static GstFlowReturn
-gst_video_decoder_flush_decode (GstVideoDecoder * dec)
-{
-  GstVideoDecoderPrivate *priv = dec->priv;
-  GstFlowReturn res = GST_FLOW_OK;
-  GList *walk;
-
-  GST_DEBUG_OBJECT (dec, "flushing buffers to decode");
-
-  /* clear buffer and decoder state */
-  gst_video_decoder_flush (dec, FALSE);
-
-  walk = priv->decode;
-  while (walk) {
-    GList *next;
-    GstVideoCodecFrame *frame = (GstVideoCodecFrame *) (walk->data);
-
-    GST_DEBUG_OBJECT (dec, "decoding frame %p buffer %p, ts %" GST_TIME_FORMAT,
-        frame, frame->input_buffer,
-        GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (frame->input_buffer)));
-
-    next = walk->next;
-
-    priv->decode = g_list_delete_link (priv->decode, walk);
-
-    /* decode buffer, resulting data prepended to queue */
-    res = gst_video_decoder_decode_frame (dec, frame);
-    if (res != GST_FLOW_OK)
-      break;
-
-    walk = next;
-  }
-
-  return res;
-}
-
-/* gst_video_decoder_flush_parse is called from the
- * chain_reverse() function when a buffer containing
- * a DISCONT - indicating that reverse playback
- * looped back to the next data block, and therefore
- * all available data should be fed through the
- * decoder and frames gathered for reversed output
- */
-static GstFlowReturn
-gst_video_decoder_flush_parse (GstVideoDecoder * dec, gboolean at_eos)
-{
-  GstVideoDecoderPrivate *priv = dec->priv;
-  GstFlowReturn res = GST_FLOW_OK;
-  GList *walk;
-
-  GST_DEBUG_OBJECT (dec, "flushing buffers to parsing");
-
-  /* Reverse the gather list, and prepend it to the parse list,
-   * then flush to parse whatever we can */
-  priv->gather = g_list_reverse (priv->gather);
-  priv->parse = g_list_concat (priv->gather, priv->parse);
-  priv->gather = NULL;
-
-  /* clear buffer and decoder state */
-  gst_video_decoder_flush (dec, FALSE);
-
-  walk = priv->parse;
-  while (walk) {
-    GstBuffer *buf = GST_BUFFER_CAST (walk->data);
-    GList *next = walk->next;
-
-    GST_DEBUG_OBJECT (dec, "parsing buffer %p, ts %" GST_TIME_FORMAT,
-        buf, GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (buf)));
-
-    /* parse buffer, resulting frames prepended to parse_gather queue */
-    gst_buffer_ref (buf);
-    res = gst_video_decoder_chain_forward (dec, buf, at_eos);
-
-    /* if we generated output, we can discard the buffer, else we
-     * keep it in the queue */
-    if (priv->parse_gather) {
-      GST_DEBUG_OBJECT (dec, "parsed buffer to %p", priv->parse_gather->data);
-      priv->parse = g_list_delete_link (priv->parse, walk);
-      gst_buffer_unref (buf);
-    } else {
-      GST_DEBUG_OBJECT (dec, "buffer did not decode, keeping");
-    }
-    walk = next;
-  }
-
-  /* now we can process frames. Start by moving each frame from the parse_gather
-   * to the decode list, reverse the order as we go, and stopping when/if we
-   * copy a keyframe. */
-  GST_DEBUG_OBJECT (dec, "checking parsed frames for a keyframe to decode");
-  walk = priv->parse_gather;
-  while (walk) {
-    GstVideoCodecFrame *frame = (GstVideoCodecFrame *) (walk->data);
-
-    /* remove from the gather list */
-    priv->parse_gather = g_list_remove_link (priv->parse_gather, walk);
-
-    /* move it to the front of the decode queue */
-    priv->decode = g_list_concat (walk, priv->decode);
-
-    /* if we copied a keyframe, flush and decode the decode queue */
-    if (GST_VIDEO_CODEC_FRAME_IS_SYNC_POINT (frame)) {
-      GST_DEBUG_OBJECT (dec, "found keyframe %p with PTS %" GST_TIME_FORMAT,
-          frame, GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (frame->input_buffer)));
-      res = gst_video_decoder_flush_decode (dec);
-      if (res != GST_FLOW_OK)
-        goto done;
-    }
-
-    walk = priv->parse_gather;
-  }
-
-  /* now send queued data downstream */
-  walk = priv->output_queued;
-  while (walk) {
-    GstBuffer *buf = GST_BUFFER_CAST (walk->data);
-
-    if (G_LIKELY (res == GST_FLOW_OK)) {
-      /* avoid stray DISCONT from forward processing,
-       * which have no meaning in reverse pushing */
-      GST_BUFFER_FLAG_UNSET (buf, GST_BUFFER_FLAG_DISCONT);
-
-      /* Last chance to calculate a timestamp as we loop backwards
-       * through the list */
-      if (GST_BUFFER_TIMESTAMP (buf) != GST_CLOCK_TIME_NONE)
-        priv->last_timestamp_out = GST_BUFFER_TIMESTAMP (buf);
-      else if (priv->last_timestamp_out != GST_CLOCK_TIME_NONE &&
-          GST_BUFFER_DURATION (buf) != GST_CLOCK_TIME_NONE) {
-        GST_BUFFER_TIMESTAMP (buf) =
-            priv->last_timestamp_out - GST_BUFFER_DURATION (buf);
-        priv->last_timestamp_out = GST_BUFFER_TIMESTAMP (buf);
-        GST_LOG_OBJECT (dec,
-            "Calculated TS %" GST_TIME_FORMAT " working backwards. Duration %"
-            GST_TIME_FORMAT, GST_TIME_ARGS (priv->last_timestamp_out),
-            GST_TIME_ARGS (GST_BUFFER_DURATION (buf)));
-      }
-
-      res = gst_video_decoder_clip_and_push_buf (dec, buf);
-    } else {
-      gst_buffer_unref (buf);
-    }
-
-    priv->output_queued =
-        g_list_delete_link (priv->output_queued, priv->output_queued);
-    walk = priv->output_queued;
-  }
-
-done:
-  return res;
-}
-
-static GstFlowReturn
-gst_video_decoder_chain_reverse (GstVideoDecoder * dec, GstBuffer * buf)
-{
-  GstVideoDecoderPrivate *priv = dec->priv;
-  GstFlowReturn result = GST_FLOW_OK;
-
-  /* if we have a discont, move buffers to the decode list */
-  if (!buf || GST_BUFFER_IS_DISCONT (buf)) {
-    GST_DEBUG_OBJECT (dec, "received discont");
-
-    /* parse and decode stuff in the gather and parse queues */
-    gst_video_decoder_flush_parse (dec, FALSE);
-  }
-
-  if (G_LIKELY (buf)) {
-    GST_DEBUG_OBJECT (dec, "gathering buffer %p of size %u, "
-        "time %" GST_TIME_FORMAT ", dur %" GST_TIME_FORMAT, buf,
-        GST_BUFFER_SIZE (buf), GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (buf)),
-        GST_TIME_ARGS (GST_BUFFER_DURATION (buf)));
-
-    /* add buffer to gather queue */
-    priv->gather = g_list_prepend (priv->gather, buf);
-  }
-
-  return result;
-}
-
-static GstFlowReturn
-gst_video_decoder_chain (GstPad * pad, GstBuffer * buf)
-{
-  GstVideoDecoder *decoder;
-  GstFlowReturn ret = GST_FLOW_OK;
-
-  decoder = GST_VIDEO_DECODER (GST_PAD_PARENT (pad));
-
-  GST_LOG_OBJECT (decoder,
-      "chain %" GST_TIME_FORMAT " duration %" GST_TIME_FORMAT " size %d",
-      GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (buf)),
-      GST_TIME_ARGS (GST_BUFFER_DURATION (buf)), GST_BUFFER_SIZE (buf));
-
-  GST_VIDEO_DECODER_STREAM_LOCK (decoder);
-
-  /* NOTE:
-   * requiring the pad to be negotiated makes it impossible to use
-   * oggdemux or filesrc ! decoder */
-
-  if (decoder->input_segment.format == GST_FORMAT_UNDEFINED) {
-    GstEvent *event;
-
-    GST_WARNING_OBJECT (decoder,
-        "Received buffer without a new-segment. "
-        "Assuming timestamps start from 0.");
-
-    gst_segment_set_newsegment_full (&decoder->input_segment, FALSE, 1.0, 1.0,
-        GST_FORMAT_TIME, 0, GST_CLOCK_TIME_NONE, 0);
-
-    event = gst_event_new_new_segment (FALSE, 1.0, GST_FORMAT_TIME, 0,
-        GST_CLOCK_TIME_NONE, 0);
-
-    decoder->priv->current_frame_events =
-        g_list_prepend (decoder->priv->current_frame_events, event);
-  }
-
-  if (decoder->input_segment.rate > 0.0)
-    ret = gst_video_decoder_chain_forward (decoder, buf, FALSE);
-  else
-    ret = gst_video_decoder_chain_reverse (decoder, buf);
-
-  GST_VIDEO_DECODER_STREAM_UNLOCK (decoder);
-  return ret;
-}
-
-static GstStateChangeReturn
-gst_video_decoder_change_state (GstElement * element, GstStateChange transition)
-{
-  GstVideoDecoder *decoder;
-  GstVideoDecoderClass *decoder_class;
-  GstStateChangeReturn ret;
-
-  decoder = GST_VIDEO_DECODER (element);
-  decoder_class = GST_VIDEO_DECODER_GET_CLASS (element);
-
-  switch (transition) {
-    case GST_STATE_CHANGE_NULL_TO_READY:
-      /* open device/library if needed */
-      if (decoder_class->open && !decoder_class->open (decoder))
-        goto open_failed;
-      break;
-    case GST_STATE_CHANGE_READY_TO_PAUSED:
-      /* Initialize device/library if needed */
-      if (decoder_class->start && !decoder_class->start (decoder))
-        goto start_failed;
-      break;
-    default:
-      break;
-  }
-
-  ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
-
-  switch (transition) {
-    case GST_STATE_CHANGE_PAUSED_TO_READY:
-      if (decoder_class->stop && !decoder_class->stop (decoder))
-        goto stop_failed;
-
-      GST_VIDEO_DECODER_STREAM_LOCK (decoder);
-      gst_video_decoder_reset (decoder, TRUE);
-      g_list_foreach (decoder->priv->current_frame_events,
-          (GFunc) gst_event_unref, NULL);
-      g_list_free (decoder->priv->current_frame_events);
-      decoder->priv->current_frame_events = NULL;
-      GST_VIDEO_DECODER_STREAM_UNLOCK (decoder);
-      break;
-    case GST_STATE_CHANGE_READY_TO_NULL:
-      /* close device/library if needed */
-      if (decoder_class->close && !decoder_class->close (decoder))
-        goto close_failed;
-      break;
-    default:
-      break;
-  }
-
-  return ret;
-
-  /* Errors */
-open_failed:
-  {
-    GST_ELEMENT_ERROR (decoder, LIBRARY, INIT, (NULL),
-        ("Failed to open decoder"));
-    return GST_STATE_CHANGE_FAILURE;
-  }
-
-start_failed:
-  {
-    GST_ELEMENT_ERROR (decoder, LIBRARY, INIT, (NULL),
-        ("Failed to start decoder"));
-    return GST_STATE_CHANGE_FAILURE;
-  }
-
-stop_failed:
-  {
-    GST_ELEMENT_ERROR (decoder, LIBRARY, INIT, (NULL),
-        ("Failed to stop decoder"));
-    return GST_STATE_CHANGE_FAILURE;
-  }
-
-close_failed:
-  {
-    GST_ELEMENT_ERROR (decoder, LIBRARY, INIT, (NULL),
-        ("Failed to close decoder"));
-    return GST_STATE_CHANGE_FAILURE;
-  }
-}
-
-static GstVideoCodecFrame *
-gst_video_decoder_new_frame (GstVideoDecoder * decoder)
-{
-  GstVideoDecoderPrivate *priv = decoder->priv;
-  GstVideoCodecFrame *frame;
-
-  frame = g_slice_new0 (GstVideoCodecFrame);
-
-  frame->ref_count = 1;
-
-  GST_VIDEO_DECODER_STREAM_LOCK (decoder);
-  frame->system_frame_number = priv->system_frame_number;
-  priv->system_frame_number++;
-  frame->decode_frame_number = priv->decode_frame_number;
-  priv->decode_frame_number++;
-
-  frame->dts = GST_CLOCK_TIME_NONE;
-  frame->pts = GST_CLOCK_TIME_NONE;
-  frame->duration = GST_CLOCK_TIME_NONE;
-  frame->events = priv->current_frame_events;
-  priv->current_frame_events = NULL;
-  GST_VIDEO_DECODER_STREAM_UNLOCK (decoder);
-
-  GST_LOG_OBJECT (decoder, "Created new frame %p (sfn:%d)",
-      frame, frame->system_frame_number);
-
-  return frame;
-}
-
-static void
-gst_video_decoder_prepare_finish_frame (GstVideoDecoder *
-    decoder, GstVideoCodecFrame * frame, gboolean dropping)
-{
-  GstVideoDecoderPrivate *priv = decoder->priv;
-  GList *l, *events = NULL;
-  GstClockTime reorder_pts;
-
-#ifndef GST_DISABLE_GST_DEBUG
-  GST_LOG_OBJECT (decoder, "n %d in %d out %d",
-      g_list_length (priv->frames),
-      gst_adapter_available (priv->input_adapter),
-      gst_adapter_available (priv->output_adapter));
-#endif
-
-  reorder_pts = priv->incoming_timestamps[priv->reorder_idx_out];
-  priv->reorder_idx_out =
-      (priv->reorder_idx_out + 1) % MAX_DTS_PTS_REORDER_DEPTH;
-
-  if (!priv->reordered_output && frame->system_frame_number &&
-      priv->last_out_frame_number != (guint) (-1) &&
-      frame->system_frame_number != (priv->last_out_frame_number + 1)) {
-    GST_DEBUG_OBJECT (decoder, "Detected reordered output");
-    priv->reordered_output = TRUE;
-  }
-
-  GST_LOG_OBJECT (decoder,
-      "finish frame %p (#%d) sync:%d pts:%" GST_TIME_FORMAT " dts:%"
-      GST_TIME_FORMAT " reorder_pts:%" GST_TIME_FORMAT,
-      frame, frame->system_frame_number,
-      GST_VIDEO_CODEC_FRAME_IS_SYNC_POINT (frame), GST_TIME_ARGS (frame->pts),
-      GST_TIME_ARGS (frame->dts), GST_TIME_ARGS (reorder_pts));
-
-  /* Push all pending events that arrived before this frame */
-  for (l = priv->frames; l; l = l->next) {
-    GstVideoCodecFrame *tmp = l->data;
-
-    if (tmp->events) {
-      events = g_list_concat (events, tmp->events);
-      tmp->events = NULL;
-    }
-
-    if (tmp == frame)
-      break;
-  }
-
-  for (l = g_list_last (events); l; l = g_list_previous (l)) {
-    GST_LOG_OBJECT (decoder, "pushing %s event", GST_EVENT_TYPE_NAME (l->data));
-    gst_video_decoder_push_event (decoder, l->data);
-  }
-  g_list_free (events);
-
-  /* Check if the data should not be displayed. For example altref/invisible
-   * frame in vp8. In this case we should not update the timestamps. */
-  if (GST_VIDEO_CODEC_FRAME_IS_DECODE_ONLY (frame))
-    return;
-
-  /* If the frame is meant to be output but we don't have an output_buffer
-   * we have a problem :) */
-  if (G_UNLIKELY ((frame->output_buffer == NULL) && !dropping))
-    goto no_output_buffer;
-
-  if (GST_CLOCK_TIME_IS_VALID (frame->pts)) {
-    if (frame->pts != priv->base_timestamp) {
-      GST_DEBUG_OBJECT (decoder,
-          "sync timestamp %" GST_TIME_FORMAT " diff %" GST_TIME_FORMAT,
-          GST_TIME_ARGS (frame->pts),
-          GST_TIME_ARGS (frame->pts - decoder->output_segment.start));
-      priv->base_timestamp = frame->pts;
-      priv->base_picture_number = frame->decode_frame_number;
-    }
-  }
-
-  if (frame->duration == GST_CLOCK_TIME_NONE) {
-    frame->duration = gst_video_decoder_get_frame_duration (decoder, frame);
-    GST_LOG_OBJECT (decoder,
-        "Guessing duration %" GST_TIME_FORMAT " for frame...",
-        GST_TIME_ARGS (frame->duration));
-  }
-
-  if (frame->pts == GST_CLOCK_TIME_NONE) {
-    /* Last ditch timestamp guess: Just add the duration to the previous
-     * frame */
-    if (priv->last_timestamp_out != GST_CLOCK_TIME_NONE &&
-        frame->duration != GST_CLOCK_TIME_NONE) {
-      frame->pts = priv->last_timestamp_out + frame->duration;
-      GST_LOG_OBJECT (decoder,
-          "Guessing timestamp %" GST_TIME_FORMAT " for frame...",
-          GST_TIME_ARGS (frame->pts));
-    }
-  }
-
-  /* Fix buffers that came in with DTS and were reordered */
-  if (!priv->reordered_input && priv->reordered_output
-      && GST_CLOCK_TIME_IS_VALID (reorder_pts)) {
-    GST_DEBUG_OBJECT (decoder,
-        "Correcting PTS, input buffers had DTS on their timestamps");
-    frame->pts = reorder_pts;
-  }
-
-  if (GST_CLOCK_TIME_IS_VALID (priv->last_timestamp_out)) {
-    if (frame->pts < priv->last_timestamp_out) {
-      GST_WARNING_OBJECT (decoder,
-          "decreasing timestamp (%" GST_TIME_FORMAT " < %"
-          GST_TIME_FORMAT ")",
-          GST_TIME_ARGS (frame->pts), GST_TIME_ARGS (priv->last_timestamp_out));
-      frame->pts = reorder_pts;
-    }
-  }
-
-  if (GST_CLOCK_TIME_IS_VALID (frame->pts)) {
-    priv->last_timestamp_out = frame->pts;
-    priv->last_out_frame_number = frame->system_frame_number;
-  }
-
-  return;
-
-  /* ERRORS */
-no_output_buffer:
-  {
-    GST_ERROR_OBJECT (decoder, "No buffer to output !");
-  }
-}
-
-static void
-gst_video_decoder_release_frame (GstVideoDecoder * dec,
-    GstVideoCodecFrame * frame)
-{
-  GList *link;
-
-  /* unref once from the list */
-  link = g_list_find (dec->priv->frames, frame);
-  if (link) {
-    gst_video_codec_frame_unref (frame);
-    dec->priv->frames = g_list_delete_link (dec->priv->frames, link);
-  }
-
-  /* unref because this function takes ownership */
-  gst_video_codec_frame_unref (frame);
-}
-
-/**
- * gst_video_decoder_drop_frame:
- * @dec: a #GstVideoDecoder
- * @frame: (transfer full): the #GstVideoCodecFrame to drop
- *
- * Similar to gst_video_decoder_finish_frame(), but drops @frame in any
- * case and posts a QoS message with the frame's details on the bus.
- * In any case, the frame is considered finished and released.
- *
- * Returns: a #GstFlowReturn, usually GST_FLOW_OK.
- *
- * Since: 0.10.37
- */
-GstFlowReturn
-gst_video_decoder_drop_frame (GstVideoDecoder * dec, GstVideoCodecFrame * frame)
-{
-  GstClockTime stream_time, jitter, earliest_time, qostime, timestamp;
-  GstSegment *segment;
-  GstMessage *qos_msg;
-  gdouble proportion;
-
-  GST_LOG_OBJECT (dec, "drop frame %p", frame);
-
-  GST_VIDEO_DECODER_STREAM_LOCK (dec);
-
-  gst_video_decoder_prepare_finish_frame (dec, frame, TRUE);
-
-  GST_DEBUG_OBJECT (dec, "dropping frame %" GST_TIME_FORMAT,
-      GST_TIME_ARGS (frame->pts));
-
-  dec->priv->dropped++;
-
-  /* post QoS message */
-  GST_OBJECT_LOCK (dec);
-  proportion = dec->priv->proportion;
-  earliest_time = dec->priv->earliest_time;
-  GST_OBJECT_UNLOCK (dec);
-
-  timestamp = frame->pts;
-  segment = &dec->output_segment;
-  stream_time =
-      gst_segment_to_stream_time (segment, GST_FORMAT_TIME, timestamp);
-  qostime = gst_segment_to_running_time (segment, GST_FORMAT_TIME, timestamp);
-  jitter = GST_CLOCK_DIFF (qostime, earliest_time);
-  qos_msg =
-      gst_message_new_qos (GST_OBJECT_CAST (dec), FALSE, qostime, stream_time,
-      timestamp, GST_CLOCK_TIME_NONE);
-  gst_message_set_qos_values (qos_msg, jitter, proportion, 1000000);
-  gst_message_set_qos_stats (qos_msg, GST_FORMAT_BUFFERS,
-      dec->priv->processed, dec->priv->dropped);
-  gst_element_post_message (GST_ELEMENT_CAST (dec), qos_msg);
-
-  /* now free the frame */
-  gst_video_decoder_release_frame (dec, frame);
-
-  GST_VIDEO_DECODER_STREAM_UNLOCK (dec);
-
-  return GST_FLOW_OK;
-}
-
-/**
- * gst_video_decoder_finish_frame:
- * @decoder: a #GstVideoDecoder
- * @frame: (transfer full): a decoded #GstVideoCodecFrame
- *
- * @frame should have a valid decoded data buffer, whose metadata fields
- * are then appropriately set according to frame data and pushed downstream.
- * If no output data is provided, @frame is considered skipped.
- * In any case, the frame is considered finished and released.
- *
- * Returns: a #GstFlowReturn resulting from sending data downstream
- *
- * Since: 0.10.37
- */
-GstFlowReturn
-gst_video_decoder_finish_frame (GstVideoDecoder * decoder,
-    GstVideoCodecFrame * frame)
-{
-  GstFlowReturn ret = GST_FLOW_OK;
-  GstVideoDecoderPrivate *priv = decoder->priv;
-  GstVideoCodecState *state;
-  GstBuffer *output_buffer;
-
-  GST_LOG_OBJECT (decoder, "finish frame %p", frame);
-
-  GST_VIDEO_DECODER_STREAM_LOCK (decoder);
-
-  if (G_UNLIKELY (priv->output_state_changed))
-    gst_video_decoder_negotiate (decoder);
-
-  state = priv->output_state;
-
-  gst_video_decoder_prepare_finish_frame (decoder, frame, FALSE);
-  priv->processed++;
-
-  /* no buffer data means this frame is skipped */
-  if (!frame->output_buffer || GST_VIDEO_CODEC_FRAME_IS_DECODE_ONLY (frame)) {
-    GST_DEBUG_OBJECT (decoder, "skipping frame %" GST_TIME_FORMAT,
-        GST_TIME_ARGS (frame->pts));
-    goto done;
-  }
-
-  /* A reference always needs to be owned by the frame on the buffer.
-   * For that reason, we use a complete sub-buffer (zero-cost) to push
-   * downstream.
-   * The original buffer will be free-ed only when downstream AND the
-   * current implementation are done with the frame. */
-  output_buffer =
-      gst_buffer_create_sub (frame->output_buffer, 0,
-      GST_BUFFER_SIZE (frame->output_buffer));
-
-  GST_BUFFER_FLAG_UNSET (output_buffer, GST_BUFFER_FLAG_DELTA_UNIT);
-  if (GST_VIDEO_INFO_IS_INTERLACED (&state->info)) {
-    if (GST_VIDEO_CODEC_FRAME_FLAG_IS_SET (frame,
-            GST_VIDEO_CODEC_FRAME_FLAG_TFF)) {
-      GST_BUFFER_FLAG_SET (output_buffer, GST_VIDEO_BUFFER_TFF);
-    } else {
-      GST_BUFFER_FLAG_UNSET (output_buffer, GST_VIDEO_BUFFER_TFF);
-    }
-    if (GST_VIDEO_CODEC_FRAME_FLAG_IS_SET (frame,
-            GST_VIDEO_CODEC_FRAME_FLAG_RFF)) {
-      GST_BUFFER_FLAG_SET (output_buffer, GST_VIDEO_BUFFER_RFF);
-    } else {
-      GST_BUFFER_FLAG_UNSET (output_buffer, GST_VIDEO_BUFFER_RFF);
-    }
-    if (GST_VIDEO_CODEC_FRAME_FLAG_IS_SET (frame,
-            GST_VIDEO_CODEC_FRAME_FLAG_ONEFIELD)) {
-      GST_BUFFER_FLAG_SET (output_buffer, GST_VIDEO_BUFFER_ONEFIELD);
-    } else {
-      GST_BUFFER_FLAG_UNSET (output_buffer, GST_VIDEO_BUFFER_ONEFIELD);
-    }
-  }
-
-  GST_BUFFER_TIMESTAMP (output_buffer) = frame->pts;
-  GST_BUFFER_DURATION (output_buffer) = frame->duration;
-
-  GST_BUFFER_OFFSET (output_buffer) = GST_BUFFER_OFFSET_NONE;
-  GST_BUFFER_OFFSET_END (output_buffer) = GST_BUFFER_OFFSET_NONE;
-
-  if (priv->discont) {
-    GST_BUFFER_FLAG_SET (output_buffer, GST_BUFFER_FLAG_DISCONT);
-    priv->discont = FALSE;
-  }
-
-  if (decoder->output_segment.rate < 0.0) {
-    GST_LOG_OBJECT (decoder, "queued frame");
-    priv->output_queued = g_list_prepend (priv->output_queued, output_buffer);
-  } else {
-    ret = gst_video_decoder_clip_and_push_buf (decoder, output_buffer);
-  }
-
-done:
-  gst_video_decoder_release_frame (decoder, frame);
-  GST_VIDEO_DECODER_STREAM_UNLOCK (decoder);
-  return ret;
-}
-
-
-/* With stream lock, takes the frame reference */
-static GstFlowReturn
-gst_video_decoder_clip_and_push_buf (GstVideoDecoder * decoder, GstBuffer * buf)
-{
-  GstFlowReturn ret = GST_FLOW_OK;
-  GstVideoDecoderPrivate *priv = decoder->priv;
-  gint64 start, stop;
-  gint64 cstart, cstop;
-  GstSegment *segment;
-  GstClockTime duration;
-
-  /* Check for clipping */
-  start = GST_BUFFER_TIMESTAMP (buf);
-  duration = GST_BUFFER_DURATION (buf);
-
-  stop = GST_CLOCK_TIME_NONE;
-
-  if (GST_CLOCK_TIME_IS_VALID (start) && GST_CLOCK_TIME_IS_VALID (duration)) {
-    stop = start + duration;
-  }
-
-  segment = &decoder->output_segment;
-  if (gst_segment_clip (segment, GST_FORMAT_TIME, start, stop, &cstart, &cstop)) {
-
-    GST_BUFFER_TIMESTAMP (buf) = cstart;
-
-    if (stop != GST_CLOCK_TIME_NONE)
-      GST_BUFFER_DURATION (buf) = cstop - cstart;
-
-    GST_LOG_OBJECT (decoder,
-        "accepting buffer inside segment: %" GST_TIME_FORMAT " %"
-        GST_TIME_FORMAT " seg %" GST_TIME_FORMAT " to %" GST_TIME_FORMAT
-        " time %" GST_TIME_FORMAT,
-        GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (buf)),
-        GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (buf) +
-            GST_BUFFER_DURATION (buf)),
-        GST_TIME_ARGS (segment->start), GST_TIME_ARGS (segment->stop),
-        GST_TIME_ARGS (segment->time));
-  } else {
-    GST_LOG_OBJECT (decoder,
-        "dropping buffer outside segment: %" GST_TIME_FORMAT
-        " %" GST_TIME_FORMAT
-        " seg %" GST_TIME_FORMAT " to %" GST_TIME_FORMAT
-        " time %" GST_TIME_FORMAT,
-        GST_TIME_ARGS (start), GST_TIME_ARGS (stop),
-        GST_TIME_ARGS (segment->start),
-        GST_TIME_ARGS (segment->stop), GST_TIME_ARGS (segment->time));
-    gst_buffer_unref (buf);
-    goto done;
-  }
-
-  /* update rate estimate */
-  priv->bytes_out += GST_BUFFER_SIZE (buf);
-  if (GST_CLOCK_TIME_IS_VALID (duration)) {
-    priv->time += duration;
-  } else {
-    /* FIXME : Use difference between current and previous outgoing
-     * timestamp, and relate to difference between current and previous
-     * bytes */
-    /* better none than nothing valid */
-    priv->time = GST_CLOCK_TIME_NONE;
-  }
-
-  gst_buffer_set_caps (buf, GST_PAD_CAPS (decoder->srcpad));
-
-  GST_LOG_OBJECT (decoder, "pushing buffer %p of size %u ts %" GST_TIME_FORMAT
-      ", duration %" GST_TIME_FORMAT, buf, GST_BUFFER_SIZE (buf),
-      GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (buf)),
-      GST_TIME_ARGS (GST_BUFFER_DURATION (buf)));
-
-  /* we got data, so note things are looking up again, reduce
-   * the error count, if there is one */
-  if (G_UNLIKELY (priv->error_count))
-    priv->error_count = 0;
-
-  ret = gst_pad_push (decoder->srcpad, buf);
-
-done:
-  return ret;
-}
-
-/**
- * gst_video_decoder_add_to_frame:
- * @decoder: a #GstVideoDecoder
- * @n_bytes: the number of bytes to add
- *
- * Removes next @n_bytes of input data and adds it to currently parsed frame.
- *
- * Since: 0.10.37
- */
-void
-gst_video_decoder_add_to_frame (GstVideoDecoder * decoder, int n_bytes)
-{
-  GstVideoDecoderPrivate *priv = decoder->priv;
-  GstBuffer *buf;
-
-  GST_LOG_OBJECT (decoder, "add %d bytes to frame", n_bytes);
-
-  if (n_bytes == 0)
-    return;
-
-  GST_VIDEO_DECODER_STREAM_LOCK (decoder);
-  if (gst_adapter_available (priv->output_adapter) == 0) {
-    priv->frame_offset =
-        priv->input_offset - gst_adapter_available (priv->input_adapter);
-  }
-  buf = gst_adapter_take_buffer (priv->input_adapter, n_bytes);
-
-  gst_adapter_push (priv->output_adapter, buf);
-  GST_VIDEO_DECODER_STREAM_UNLOCK (decoder);
-}
-
-static guint64
-gst_video_decoder_get_frame_duration (GstVideoDecoder * decoder,
-    GstVideoCodecFrame * frame)
-{
-  GstVideoCodecState *state = decoder->priv->output_state;
-  gint fields;
-
-  /* it's possible that we don't have a state yet when we are dropping the
-   * initial buffers */
-  if (state == NULL)
-    return GST_CLOCK_TIME_NONE;
-
-  if (state->info.fps_d == 0 || state->info.fps_n == 0) {
-    return GST_CLOCK_TIME_NONE;
-  }
-
-  if (GST_VIDEO_CODEC_FRAME_FLAG_IS_SET (frame, GST_VIDEO_CODEC_FRAME_FLAG_RFF))
-    fields = 3;
-  else if (GST_VIDEO_CODEC_FRAME_FLAG_IS_SET (frame,
-          GST_VIDEO_CODEC_FRAME_FLAG_ONEFIELD))
-    fields = 1;
-  else
-    fields = 2;
-
-  return gst_util_uint64_scale (fields * GST_SECOND, state->info.fps_d,
-      state->info.fps_n * 2);
-}
-
-/**
- * gst_video_decoder_have_frame:
- * @decoder: a #GstVideoDecoder
- *
- * Gathers all data collected for currently parsed frame, gathers corresponding
- * metadata and passes it along for further processing, i.e. @handle_frame.
- *
- * Returns: a #GstFlowReturn
- *
- * Since: 0.10.37
- */
-GstFlowReturn
-gst_video_decoder_have_frame (GstVideoDecoder * decoder)
-{
-  GstVideoDecoderPrivate *priv = decoder->priv;
-  GstBuffer *buffer;
-  int n_available;
-  GstClockTime timestamp;
-  GstClockTime duration;
-  GstFlowReturn ret = GST_FLOW_OK;
-
-  GST_LOG_OBJECT (decoder, "have_frame");
-
-  GST_VIDEO_DECODER_STREAM_LOCK (decoder);
-
-  n_available = gst_adapter_available (priv->output_adapter);
-  if (n_available) {
-    buffer = gst_adapter_take_buffer (priv->output_adapter, n_available);
-  } else {
-    buffer = gst_buffer_new_and_alloc (0);
-  }
-
-  priv->current_frame->input_buffer = buffer;
-
-  gst_video_decoder_get_timestamp_at_offset (decoder,
-      priv->frame_offset, &timestamp, &duration);
-
-  GST_BUFFER_TIMESTAMP (buffer) = timestamp;
-  GST_BUFFER_DURATION (buffer) = duration;
-
-  GST_LOG_OBJECT (decoder, "collected frame size %d, "
-      "ts %" GST_TIME_FORMAT ", dur %" GST_TIME_FORMAT,
-      n_available, GST_TIME_ARGS (timestamp), GST_TIME_ARGS (duration));
-
-  /* In reverse playback, just capture and queue frames for later processing */
-  if (decoder->output_segment.rate < 0.0) {
-    priv->parse_gather =
-        g_list_prepend (priv->parse_gather, priv->current_frame);
-  } else {
-    /* Otherwise, decode the frame, which gives away our ref */
-    ret = gst_video_decoder_decode_frame (decoder, priv->current_frame);
-  }
-  /* Current frame is gone now, either way */
-  priv->current_frame = NULL;
-
-  GST_VIDEO_DECODER_STREAM_UNLOCK (decoder);
-
-  return ret;
-}
-
-/* Pass the frame in priv->current_frame through the
- * handle_frame() callback for decoding and passing to gvd_finish_frame(), 
- * or dropping by passing to gvd_drop_frame() */
-static GstFlowReturn
-gst_video_decoder_decode_frame (GstVideoDecoder * decoder,
-    GstVideoCodecFrame * frame)
-{
-  GstVideoDecoderPrivate *priv = decoder->priv;
-  GstVideoDecoderClass *decoder_class;
-  GstFlowReturn ret = GST_FLOW_OK;
-
-  decoder_class = GST_VIDEO_DECODER_GET_CLASS (decoder);
-
-  /* FIXME : This should only have to be checked once (either the subclass has an 
-   * implementation, or it doesn't) */
-  g_return_val_if_fail (decoder_class->handle_frame != NULL, GST_FLOW_ERROR);
-
-  frame->distance_from_sync = priv->distance_from_sync;
-  priv->distance_from_sync++;
-  frame->pts = GST_BUFFER_TIMESTAMP (frame->input_buffer);
-  frame->duration = GST_BUFFER_DURATION (frame->input_buffer);
-
-  /* For keyframes, DTS = PTS */
-  if (GST_VIDEO_CODEC_FRAME_IS_SYNC_POINT (frame))
-    frame->dts = frame->pts;
-
-  GST_LOG_OBJECT (decoder, "pts %" GST_TIME_FORMAT, GST_TIME_ARGS (frame->pts));
-  GST_LOG_OBJECT (decoder, "dts %" GST_TIME_FORMAT, GST_TIME_ARGS (frame->dts));
-  GST_LOG_OBJECT (decoder, "dist %d", frame->distance_from_sync);
-
-  gst_video_codec_frame_ref (frame);
-  priv->frames = g_list_append (priv->frames, frame);
-
-  if (g_list_length (priv->frames) > 10) {
-    GST_WARNING_OBJECT (decoder, "decoder frame list getting long: %d frames,"
-        "possible internal leaking?", g_list_length (priv->frames));
-  }
-
-  frame->deadline =
-      gst_segment_to_running_time (&decoder->input_segment, GST_FORMAT_TIME,
-      frame->pts);
-
-  /* Store pts */
-  if (GST_CLOCK_TIME_IS_VALID (frame->pts)
-      && GST_CLOCK_TIME_IS_VALID (priv->last_timestamp_in)
-      && frame->pts < priv->last_timestamp_in) {
-    GST_DEBUG_OBJECT (decoder, "Incoming timestamps are out of order");
-    priv->reordered_input = TRUE;
-  }
-  priv->last_timestamp_in = frame->pts;
-  priv->incoming_timestamps[priv->reorder_idx_in] = frame->pts;
-  priv->reorder_idx_in = (priv->reorder_idx_in + 1) % MAX_DTS_PTS_REORDER_DEPTH;
-
-  /* do something with frame */
-  ret = decoder_class->handle_frame (decoder, frame);
-  if (ret != GST_FLOW_OK)
-    GST_DEBUG_OBJECT (decoder, "flow error %s", gst_flow_get_name (ret));
-
-  /* the frame has either been added to parse_gather or sent to
-     handle frame so there is no need to unref it */
-  return ret;
-}
-
-
-/**
- * gst_video_decoder_get_output_state:
- * @decoder: a #GstVideoDecoder
- *
- * Get the #GstVideoCodecState currently describing the output stream.
- *
- * Returns: (transfer full): #GstVideoCodecState describing format of video data.
- *
- * Since: 0.10.37
- */
-GstVideoCodecState *
-gst_video_decoder_get_output_state (GstVideoDecoder * decoder)
-{
-  GstVideoCodecState *state = NULL;
-
-  GST_OBJECT_LOCK (decoder);
-  if (decoder->priv->output_state)
-    state = gst_video_codec_state_ref (decoder->priv->output_state);
-  GST_OBJECT_UNLOCK (decoder);
-
-  return state;
-}
-
-/**
- * gst_video_decoder_set_output_state:
- * @decoder: a #GstVideoDecoder
- * @fmt: a #GstVideoFormat
- * @width: The width in pixels
- * @height: The height in pixels
- * @reference: (allow-none) (transfer none): An optional reference #GstVideoCodecState
- *
- * Creates a new #GstVideoCodecState with the specified @fmt, @width and @height
- * as the output state for the decoder.
- * Any previously set output state on @decoder will be replaced by the newly
- * created one.
- *
- * If the subclass wishes to copy over existing fields (like pixel aspec ratio,
- * or framerate) from an existing #GstVideoCodecState, it can be provided as a
- * @reference.
- *
- * If the subclass wishes to override some fields from the output state (like
- * pixel-aspect-ratio or framerate) it can do so on the returned #GstVideoCodecState.
- *
- * The new output state will only take effect (set on pads and buffers) starting
- * from the next call to #gst_video_decoder_finish_frame().
- *
- * Returns: (transfer full): the newly configured output state.
- *
- * Since: 0.10.37
- */
-GstVideoCodecState *
-gst_video_decoder_set_output_state (GstVideoDecoder * decoder,
-    GstVideoFormat fmt, guint width, guint height,
-    GstVideoCodecState * reference)
-{
-  GstVideoDecoderPrivate *priv = decoder->priv;
-  GstVideoCodecState *state;
-
-  GST_DEBUG_OBJECT (decoder, "fmt:%d, width:%d, height:%d, reference:%p",
-      fmt, width, height, reference);
-
-  /* Create the new output state */
-  state = _new_output_state (fmt, width, height, reference);
-
-  GST_VIDEO_DECODER_STREAM_LOCK (decoder);
-
-  GST_OBJECT_LOCK (decoder);
-  /* Replace existing output state by new one */
-  if (priv->output_state)
-    gst_video_codec_state_unref (priv->output_state);
-  priv->output_state = gst_video_codec_state_ref (state);
-
-  if (priv->output_state != NULL && priv->output_state->info.fps_n > 0) {
-    priv->qos_frame_duration =
-        gst_util_uint64_scale (GST_SECOND, priv->output_state->info.fps_d,
-        priv->output_state->info.fps_n);
-  } else {
-    priv->qos_frame_duration = 0;
-  }
-  priv->output_state_changed = TRUE;
-  GST_OBJECT_UNLOCK (decoder);
-
-  GST_VIDEO_DECODER_STREAM_UNLOCK (decoder);
-
-  return state;
-}
-
-
-/**
- * gst_video_decoder_get_oldest_frame:
- * @decoder: a #GstVideoDecoder
- *
- * Get the oldest pending unfinished #GstVideoCodecFrame
- *
- * Returns: (transfer full): oldest pending unfinished #GstVideoCodecFrame.
- *
- * Since: 0.10.37
- */
-GstVideoCodecFrame *
-gst_video_decoder_get_oldest_frame (GstVideoDecoder * decoder)
-{
-  GstVideoCodecFrame *frame = NULL;
-
-  GST_VIDEO_DECODER_STREAM_LOCK (decoder);
-  if (decoder->priv->frames)
-    frame = gst_video_codec_frame_ref (decoder->priv->frames->data);
-  GST_VIDEO_DECODER_STREAM_UNLOCK (decoder);
-
-  return (GstVideoCodecFrame *) frame;
-}
-
-/**
- * gst_video_decoder_get_frame:
- * @decoder: a #GstVideoDecoder
- * @frame_number: system_frame_number of a frame
- *
- * Get a pending unfinished #GstVideoCodecFrame
- * 
- * Returns: (transfer full): pending unfinished #GstVideoCodecFrame identified by @frame_number.
- *
- * Since: 0.10.37
- */
-GstVideoCodecFrame *
-gst_video_decoder_get_frame (GstVideoDecoder * decoder, int frame_number)
-{
-  GList *g;
-  GstVideoCodecFrame *frame = NULL;
-
-  GST_DEBUG_OBJECT (decoder, "frame_number : %d", frame_number);
-
-  GST_VIDEO_DECODER_STREAM_LOCK (decoder);
-  for (g = decoder->priv->frames; g; g = g->next) {
-    GstVideoCodecFrame *tmp = g->data;
-
-    if (tmp->system_frame_number == frame_number) {
-      frame = gst_video_codec_frame_ref (tmp);
-      break;
-    }
-  }
-  GST_VIDEO_DECODER_STREAM_UNLOCK (decoder);
-
-  return frame;
-}
-
-/**
- * gst_video_decoder_get_frames:
- * @decoder: a #GstVideoDecoder
- *
- * Get all pending unfinished #GstVideoCodecFrame
- * 
- * Returns: (transfer full) (element-type GstVideoCodecFrame): pending unfinished #GstVideoCodecFrame.
- */
-GList *
-gst_video_decoder_get_frames (GstVideoDecoder * decoder)
-{
-  GList *frames;
-
-  GST_VIDEO_DECODER_STREAM_LOCK (decoder);
-  frames = g_list_copy (decoder->priv->frames);
-  g_list_foreach (frames, (GFunc) gst_video_codec_frame_ref, NULL);
-  GST_VIDEO_DECODER_STREAM_UNLOCK (decoder);
-
-  return frames;
-}
-
-/**
- * gst_video_decoder_negotiate:
- * @decoder: a #GstVideoDecoder
- *
- * Negotiate with downstreame elements to currently configured #GstVideoCodecState.
- *
- * Returns: #TRUE if the caps were accepted downstream, else #FALSE.
- *
- * Since: 0.10.37
- */
-gboolean
-gst_video_decoder_negotiate (GstVideoDecoder * decoder)
-{
-  GstVideoCodecState *state = decoder->priv->output_state;
-  gboolean ret;
-
-  g_return_val_if_fail (GST_VIDEO_INFO_WIDTH (&state->info) != 0, FALSE);
-  g_return_val_if_fail (GST_VIDEO_INFO_HEIGHT (&state->info) != 0, FALSE);
-
-  GST_VIDEO_DECODER_STREAM_LOCK (decoder);
-
-  GST_DEBUG_OBJECT (decoder, "output_state par %d/%d fps %d/%d",
-      state->info.par_n, state->info.par_d,
-      state->info.fps_n, state->info.fps_d);
-
-  if (state->caps == NULL)
-    state->caps = gst_video_info_to_caps (&state->info);
-
-  GST_DEBUG_OBJECT (decoder, "setting caps %" GST_PTR_FORMAT, state->caps);
-
-  ret = gst_pad_set_caps (decoder->srcpad, state->caps);
-  decoder->priv->output_state_changed = FALSE;
-
-  GST_VIDEO_DECODER_STREAM_UNLOCK (decoder);
-
-  return ret;
-}
-
-/**
- * gst_video_decoder_alloc_output_buffer:
- * @decoder: a #GstVideoDecoder
- *
- * Helper function that uses @gst_pad_alloc_buffer_and_set_caps()
- * to allocate a buffer to hold a video frame for @decoder's
- * current #GstVideoCodecState.
- *
- * Returns: (transfer full): allocated buffer
- *
- * Since: 0.10.37
- */
-GstBuffer *
-gst_video_decoder_alloc_output_buffer (GstVideoDecoder * decoder)
-{
-  GstBuffer *buffer = NULL;
-  GstFlowReturn flow_ret;
-  GstVideoCodecState *state = decoder->priv->output_state;
-  int num_bytes = GST_VIDEO_INFO_SIZE (&state->info);
-
-  GST_DEBUG ("alloc src buffer caps=%" GST_PTR_FORMAT,
-      GST_PAD_CAPS (decoder->srcpad));
-
-  GST_VIDEO_DECODER_STREAM_LOCK (decoder);
-  if (G_UNLIKELY (decoder->priv->output_state_changed))
-    gst_video_decoder_negotiate (decoder);
-
-  flow_ret =
-      gst_pad_alloc_buffer_and_set_caps (decoder->srcpad,
-      GST_BUFFER_OFFSET_NONE, num_bytes, GST_PAD_CAPS (decoder->srcpad),
-      &buffer);
-
-  GST_DEBUG ("alloc returned %d buffer %" GST_PTR_FORMAT, flow_ret, buffer);
-
-  /* TODO need to check that the buffer size matches and properly attempt
-   * a renegotiation if the videodecoder is able to handle it */
-  if (flow_ret != GST_FLOW_OK || GST_BUFFER_SIZE (buffer) != num_bytes ||
-      !gst_caps_is_equal_fixed (GST_PAD_CAPS (decoder->srcpad),
-          GST_BUFFER_CAPS (buffer))) {
-    buffer = gst_buffer_new_and_alloc (num_bytes);
-    gst_buffer_set_caps (buffer, GST_PAD_CAPS (decoder->srcpad));
-  }
-
-  GST_VIDEO_DECODER_STREAM_UNLOCK (decoder);
-
-  return buffer;
-}
-
-/**
- * gst_video_decoder_alloc_output_frame:
- * @decoder: a #GstVideoDecoder
- * @frame: a #GstVideoCodecFrame
- *
- * Helper function that uses @gst_pad_alloc_buffer_and_set_caps()
- * to allocate a buffer to hold a video frame for @decoder's
- * current #GstVideoCodecState.  Subclass should already have configured video state
- * and set src pad caps.
- *
- * Returns: result from pad alloc call
- *
- * Since: 0.10.37
- */
-GstFlowReturn
-gst_video_decoder_alloc_output_frame (GstVideoDecoder *
-    decoder, GstVideoCodecFrame * frame)
-{
-  GstFlowReturn flow_ret;
-  GstVideoCodecState *state;
-  int num_bytes;
-
-  g_return_val_if_fail (frame->output_buffer == NULL, GST_FLOW_ERROR);
-
-  GST_VIDEO_DECODER_STREAM_LOCK (decoder);
-
-  state = decoder->priv->output_state;
-  if (state == NULL) {
-    g_warning ("Output state should be set before allocating frame");
-    goto error;
-  }
-  num_bytes = GST_VIDEO_INFO_SIZE (&state->info);
-  if (num_bytes == 0) {
-    g_warning ("Frame size should not be 0");
-    goto error;
-  }
-
-  if (G_UNLIKELY (decoder->priv->output_state_changed))
-    gst_video_decoder_negotiate (decoder);
-
-  g_return_val_if_fail (GST_PAD_CAPS (decoder->srcpad) != NULL, GST_FLOW_ERROR);
-
-  GST_LOG_OBJECT (decoder, "alloc buffer size %d", num_bytes);
-
-  flow_ret =
-      gst_pad_alloc_buffer_and_set_caps (decoder->srcpad,
-      GST_BUFFER_OFFSET_NONE, num_bytes, GST_PAD_CAPS (decoder->srcpad),
-      &frame->output_buffer);
-
-  if (flow_ret != GST_FLOW_OK) {
-    GST_WARNING_OBJECT (decoder, "failed to get buffer %s",
-        gst_flow_get_name (flow_ret));
-  }
-
-  GST_VIDEO_DECODER_STREAM_UNLOCK (decoder);
-
-  return flow_ret;
-
-error:
-  GST_VIDEO_DECODER_STREAM_UNLOCK (decoder);
-  return GST_FLOW_ERROR;
-}
-
-/**
- * gst_video_decoder_get_max_decode_time:
- * @decoder: a #GstVideoDecoder
- * @frame: a #GstVideoCodecFrame
- *
- * Determines maximum possible decoding time for @frame that will
- * allow it to decode and arrive in time (as determined by QoS events).
- * In particular, a negative result means decoding in time is no longer possible
- * and should therefore occur as soon/skippy as possible.
- *
- * Returns: max decoding time.
- *
- * Since: 0.10.37
- */
-GstClockTimeDiff
-gst_video_decoder_get_max_decode_time (GstVideoDecoder *
-    decoder, GstVideoCodecFrame * frame)
-{
-  GstClockTimeDiff deadline;
-  GstClockTime earliest_time;
-
-  GST_OBJECT_LOCK (decoder);
-  earliest_time = decoder->priv->earliest_time;
-  if (GST_CLOCK_TIME_IS_VALID (earliest_time)
-      && GST_CLOCK_TIME_IS_VALID (frame->deadline))
-    deadline = GST_CLOCK_DIFF (earliest_time, frame->deadline);
-  else
-    deadline = G_MAXINT64;
-
-  GST_LOG_OBJECT (decoder, "earliest %" GST_TIME_FORMAT
-      ", frame deadline %" GST_TIME_FORMAT ", deadline %" GST_TIME_FORMAT,
-      GST_TIME_ARGS (earliest_time), GST_TIME_ARGS (frame->deadline),
-      GST_TIME_ARGS (deadline));
-
-  GST_OBJECT_UNLOCK (decoder);
-
-  return deadline;
-}
-
-/**
- * gst_video_decoder_get_qos_proportion:
- * @decoder: a #GstVideoDecoder
- *     current QoS proportion, or %NULL
- *
- * Returns: The current QoS proportion.
- *
- * Since: 1.0.3
- */
-gdouble
-gst_video_decoder_get_qos_proportion (GstVideoDecoder * decoder)
-{
-  gdouble proportion;
-
-  g_return_val_if_fail (GST_IS_VIDEO_DECODER (decoder), 1.0);
-
-  GST_OBJECT_LOCK (decoder);
-  proportion = decoder->priv->proportion;
-  GST_OBJECT_UNLOCK (decoder);
-
-  return proportion;
-}
-
-GstFlowReturn
-_gst_video_decoder_error (GstVideoDecoder * dec, gint weight,
-    GQuark domain, gint code, gchar * txt, gchar * dbg, const gchar * file,
-    const gchar * function, gint line)
-{
-  if (txt)
-    GST_WARNING_OBJECT (dec, "error: %s", txt);
-  if (dbg)
-    GST_WARNING_OBJECT (dec, "error: %s", dbg);
-  dec->priv->error_count += weight;
-  dec->priv->discont = TRUE;
-  if (dec->priv->max_errors < dec->priv->error_count) {
-    gst_element_message_full (GST_ELEMENT (dec), GST_MESSAGE_ERROR,
-        domain, code, txt, dbg, file, function, line);
-    return GST_FLOW_ERROR;
-  } else {
-    g_free (txt);
-    g_free (dbg);
-    return GST_FLOW_OK;
-  }
-}
-
-/**
- * gst_video_decoder_set_max_errors:
- * @dec: a #GstVideoDecoder
- * @num: max tolerated errors
- *
- * Sets numbers of tolerated decoder errors, where a tolerated one is then only
- * warned about, but more than tolerated will lead to fatal error.  Default
- * is set to GST_VIDEO_DECODER_MAX_ERRORS.
- *
- * Since: 0.10.37
- */
-void
-gst_video_decoder_set_max_errors (GstVideoDecoder * dec, gint num)
-{
-  g_return_if_fail (GST_IS_VIDEO_DECODER (dec));
-
-  dec->priv->max_errors = num;
-}
-
-/**
- * gst_video_decoder_get_max_errors:
- * @dec: a #GstVideoDecoder
- *
- * Returns: currently configured decoder tolerated error count.
- *
- * Since: 0.10.37
- */
-gint
-gst_video_decoder_get_max_errors (GstVideoDecoder * dec)
-{
-  g_return_val_if_fail (GST_IS_VIDEO_DECODER (dec), 0);
-
-  return dec->priv->max_errors;
-}
-
-/**
- * gst_video_decoder_set_packetized:
- * @decoder: a #GstVideoDecoder
- * @packetized: whether the input data should be considered as packetized.
- *
- * Allows baseclass to consider input data as packetized or not. If the
- * input is packetized, then the @parse method will not be called.
- *
- * Since: 0.10.37
- */
-void
-gst_video_decoder_set_packetized (GstVideoDecoder * decoder,
-    gboolean packetized)
-{
-  decoder->priv->packetized = packetized;
-}
-
-/**
- * gst_video_decoder_get_packetized:
- * @decoder: a #GstVideoDecoder
- *
- * Queries whether input data is considered packetized or not by the
- * base class.
- *
- * Returns: TRUE if input data is considered packetized.
- *
- * Since: 0.10.37
- */
-gboolean
-gst_video_decoder_get_packetized (GstVideoDecoder * decoder)
-{
-  return decoder->priv->packetized;
-}
-
-/**
- * gst_video_decoder_set_estimate_rate:
- * @dec: a #GstVideoDecoder
- * @enabled: whether to enable byte to time conversion
- *
- * Allows baseclass to perform byte to time estimated conversion.
- *
- * Since: 0.10.37
- */
-void
-gst_video_decoder_set_estimate_rate (GstVideoDecoder * dec, gboolean enabled)
-{
-  g_return_if_fail (GST_IS_VIDEO_DECODER (dec));
-
-  dec->priv->do_estimate_rate = enabled;
-}
-
-/**
- * gst_video_decoder_get_estimate_rate:
- * @dec: a #GstVideoDecoder
- *
- * Returns: currently configured byte to time conversion setting
- *
- * Since: 0.10.37
- */
-gboolean
-gst_video_decoder_get_estimate_rate (GstVideoDecoder * dec)
-{
-  g_return_val_if_fail (GST_IS_VIDEO_DECODER (dec), 0);
-
-  return dec->priv->do_estimate_rate;
-}
-
-/**
- * gst_video_decoder_set_latency:
- * @decoder: a #GstVideoDecoder
- * @min_latency: minimum latency
- * @max_latency: maximum latency
- *
- * Lets #GstVideoDecoder sub-classes tell the baseclass what the decoder
- * latency is. Will also post a LATENCY message on the bus so the pipeline
- * can reconfigure its global latency.
- *
- * Since: 0.10.37
- */
-void
-gst_video_decoder_set_latency (GstVideoDecoder * decoder,
-    GstClockTime min_latency, GstClockTime max_latency)
-{
-  g_return_if_fail (GST_CLOCK_TIME_IS_VALID (min_latency));
-  g_return_if_fail (max_latency >= min_latency);
-
-  GST_OBJECT_LOCK (decoder);
-  decoder->priv->min_latency = min_latency;
-  decoder->priv->max_latency = max_latency;
-  GST_OBJECT_UNLOCK (decoder);
-
-  gst_element_post_message (GST_ELEMENT_CAST (decoder),
-      gst_message_new_latency (GST_OBJECT_CAST (decoder)));
-}
-
-/**
- * gst_video_decoder_get_latency:
- * @decoder: a #GstVideoDecoder
- * @min_latency: (out) (allow-none): address of variable in which to store the
- *     configured minimum latency, or %NULL
- * @max_latency: (out) (allow-none): address of variable in which to store the
- *     configured mximum latency, or %NULL
- *
- * Query the configured decoder latency. Results will be returned via
- * @min_latency and @max_latency.
- *
- * Since: 0.10.37
- */
-void
-gst_video_decoder_get_latency (GstVideoDecoder * decoder,
-    GstClockTime * min_latency, GstClockTime * max_latency)
-{
-  GST_OBJECT_LOCK (decoder);
-  if (min_latency)
-    *min_latency = decoder->priv->min_latency;
-  if (max_latency)
-    *max_latency = decoder->priv->max_latency;
-  GST_OBJECT_UNLOCK (decoder);
-}
diff -Nru gstreamer-vaapi-0.5.10/ext/videoutils/gst-libs/gst/video/gstvideodecoder.h gstreamer-vaapi-0.6.0/ext/videoutils/gst-libs/gst/video/gstvideodecoder.h
--- gstreamer-vaapi-0.5.10/ext/videoutils/gst-libs/gst/video/gstvideodecoder.h	2015-02-03 08:39:48.000000000 +0000
+++ gstreamer-vaapi-0.6.0/ext/videoutils/gst-libs/gst/video/gstvideodecoder.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,374 +0,0 @@
-/* GStreamer
- * Copyright (C) 2008 David Schleef <ds@schleef.org>
- * Copyright (C) 2011 Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>.
- * Copyright (C) 2011 Nokia Corporation. All rights reserved.
- *   Contact: Stefan Kost <stefan.kost@nokia.com>
- * Copyright (C) 2012 Collabora Ltd.
- *	Author : Edward Hervey <edward@collabora.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef _GST_VIDEO_DECODER_H_
-#define _GST_VIDEO_DECODER_H_
-
-#include <gst/base/gstadapter.h>
-#include <gst/video/gstvideoutils.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_VIDEO_DECODER \
-  (gst_video_decoder_get_type())
-#define GST_VIDEO_DECODER(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_VIDEO_DECODER,GstVideoDecoder))
-#define GST_VIDEO_DECODER_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_VIDEO_DECODER,GstVideoDecoderClass))
-#define GST_VIDEO_DECODER_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS((obj),GST_TYPE_VIDEO_DECODER,GstVideoDecoderClass))
-#define GST_IS_VIDEO_DECODER(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_VIDEO_DECODER))
-#define GST_IS_VIDEO_DECODER_CLASS(obj) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_VIDEO_DECODER))
-
-/**
- * GST_VIDEO_DECODER_SINK_NAME:
- *
- * The name of the templates for the sink pad.
- *
- * Since: 0.10.37
- */
-#define GST_VIDEO_DECODER_SINK_NAME    "sink"
-/**
- * GST_VIDEO_DECODER_SRC_NAME:
- *
- * The name of the templates for the source pad.
- *
- * Since: 0.10.37
- */
-#define GST_VIDEO_DECODER_SRC_NAME     "src"
-
-/**
- * GST_VIDEO_DECODER_SRC_PAD:
- * @obj: a #GstVideoDecoder
- *
- * Gives the pointer to the source #GstPad object of the element.
- *
- * Since: 0.10.37
- */
-#define GST_VIDEO_DECODER_SRC_PAD(obj)         (((GstVideoDecoder *) (obj))->srcpad)
-
-/**
- * GST_VIDEO_DECODER_SINK_PAD:
- * @obj: a #GstVideoDecoder
- *
- * Gives the pointer to the sink #GstPad object of the element.
- *
- * Since: 0.10.37
- */
-#define GST_VIDEO_DECODER_SINK_PAD(obj)        (((GstVideoDecoder *) (obj))->sinkpad)
-/**
- * GST_VIDEO_DECODER_FLOW_NEED_DATA:
- *
- * Returned while parsing to indicate more data is needed.
- *
- * Since: 0.10.37
- **/
-#define GST_VIDEO_DECODER_FLOW_NEED_DATA GST_FLOW_CUSTOM_SUCCESS
-
-/**
- * GST_VIDEO_DECODER_FLOW_DROPPED:
- *
- * Returned when the event/buffer should be dropped.
- *
- * Since: 0.10.37
- */
-#define GST_VIDEO_DECODER_FLOW_DROPPED GST_FLOW_CUSTOM_SUCCESS_1
-
-/**
- * GST_VIDEO_DECODER_INPUT_SEGMENT:
- * @obj: base decoder instance
- *
- * Gives the segment of the element.
- *
- * Since: 0.10.37
- */
-#define GST_VIDEO_DECODER_INPUT_SEGMENT(obj)     (GST_VIDEO_DECODER_CAST (obj)->input_segment)
-
-/**
- * GST_VIDEO_DECODER_OUTPUT_SEGMENT:
- * @obj: base decoder instance
- *
- * Gives the segment of the element.
- *
- * Since: 0.10.37
- */
-#define GST_VIDEO_DECODER_OUTPUT_SEGMENT(obj)     (GST_VIDEO_DECODER_CAST (obj)->output_segment)
-
-/**
- * GST_VIDEO_DECODER_STREAM_LOCK:
- * @decoder: video decoder instance
- *
- * Obtain a lock to protect the decoder function from concurrent access.
- *
- * Since: 0.10.37
- */
-#define GST_VIDEO_DECODER_STREAM_LOCK(decoder) g_static_rec_mutex_lock (&GST_VIDEO_DECODER (decoder)->stream_lock)
-
-/**
- * GST_VIDEO_DECODER_STREAM_UNLOCK:
- * @decoder: video decoder instance
- *
- * Release the lock that protects the decoder function from concurrent access.
- *
- * Since: 0.10.37
- */
-#define GST_VIDEO_DECODER_STREAM_UNLOCK(decoder) g_static_rec_mutex_unlock (&GST_VIDEO_DECODER (decoder)->stream_lock)
-
-typedef struct _GstVideoDecoder GstVideoDecoder;
-typedef struct _GstVideoDecoderClass GstVideoDecoderClass;
-typedef struct _GstVideoDecoderPrivate GstVideoDecoderPrivate;
-
-
-/* do not use this one, use macro below */
-GstFlowReturn _gst_video_decoder_error (GstVideoDecoder *dec, gint weight,
-                                             GQuark domain, gint code,
-                                             gchar *txt, gchar *debug,
-                                             const gchar *file, const gchar *function,
-                                             gint line);
-
-/**
- * GST_VIDEO_DECODER_ERROR:
- * @el:     the base video decoder element that generates the error
- * @weight: element defined weight of the error, added to error count
- * @domain: like CORE, LIBRARY, RESOURCE or STREAM (see #gstreamer-GstGError)
- * @code:   error code defined for that domain (see #gstreamer-GstGError)
- * @text:   the message to display (format string and args enclosed in
- *          parentheses)
- * @debug:  debugging information for the message (format string and args
- *          enclosed in parentheses)
- * @ret:    variable to receive return value
- *
- * Utility function that video decoder elements can use in case they encountered
- * a data processing error that may be fatal for the current "data unit" but
- * need not prevent subsequent decoding.  Such errors are counted and if there
- * are too many, as configured in the context's max_errors, the pipeline will
- * post an error message and the application will be requested to stop further
- * media processing.  Otherwise, it is considered a "glitch" and only a warning
- * is logged. In either case, @ret is set to the proper value to
- * return to upstream/caller (indicating either GST_FLOW_ERROR or GST_FLOW_OK).
- *
- * Since: 0.10.37
- */
-#define GST_VIDEO_DECODER_ERROR(el, w, domain, code, text, debug, ret) \
-G_STMT_START {                                                              \
-  gchar *__txt = _gst_element_error_printf text;                            \
-  gchar *__dbg = _gst_element_error_printf debug;                           \
-  GstVideoDecoder *dec = GST_VIDEO_DECODER (el);                   \
-  ret = _gst_video_decoder_error (dec, w, GST_ ## domain ## _ERROR,    \
-      GST_ ## domain ## _ERROR_ ## code, __txt, __dbg, __FILE__,            \
-      GST_FUNCTION, __LINE__);                                              \
-} G_STMT_END
-
-/**
- * GST_VIDEO_DECODER_MAX_ERRORS:
- *
- * Default maximum number of errors tolerated before signaling error.
- *
- * Since: 0.10.37
- */
-#define GST_VIDEO_DECODER_MAX_ERRORS     10
-
-
-/**
- * GstVideoDecoder:
- *
- * The opaque #GstVideoDecoder data structure.
- *
- * Since: 0.10.37
- */
-struct _GstVideoDecoder
-{
-  /*< private >*/
-  GstElement     element;
-
-  /*< protected >*/
-  GstPad         *sinkpad;
-  GstPad         *srcpad;
-
-  /* protects all data processing, i.e. is locked
-   * in the chain function, finish_frame and when
-   * processing serialized events */
-  GStaticRecMutex stream_lock;
-
-  /* MT-protected (with STREAM_LOCK) */
-  GstSegment      input_segment;
-  GstSegment      output_segment;
-
-  GstVideoDecoderPrivate *priv;
-
-  /*< private >*/
-  gpointer        _gst_reserved[GST_PADDING_LARGE];
-};
-
-/**
- * GstVideoDecoderClass:
- * @open:           Optional.
- *                  Called when the element changes to GST_STATE_READY.
- *                  Allows opening external resources.
- * @close:          Optional.
- *                  Called when the element changes to GST_STATE_NULL.
- *                  Allows closing external resources.
- * @start:          Optional.
- *                  Called when the element starts processing.
- *                  Allows opening external resources.
- * @stop:           Optional.
- *                  Called when the element stops processing.
- *                  Allows closing external resources.
- * @set_format:     Notifies subclass of incoming data format (caps).
- * @parse:          Required for non-packetized input.
- *                  Allows chopping incoming data into manageable units (frames)
- *                  for subsequent decoding.
- * @reset:          Optional.
- *                  Allows subclass (decoder) to perform post-seek semantics reset.
- * @handle_frame:   Provides input data frame to subclass.
- * @finish:         Optional.
- *                  Called to request subclass to dispatch any pending remaining
- *                  data (e.g. at EOS).
- * @sink_event:     Optional.
- *                  Event handler on the sink pad. This function should return
- *                  TRUE if the event was handled and should be discarded
- *                  (i.e. not unref'ed).
- * @src_event:      Optional.
- *                  Event handler on the source pad. This function should return
- *                  TRUE if the event was handled and should be discarded
- *                  (i.e. not unref'ed).
- *
- * Subclasses can override any of the available virtual methods or not, as
- * needed. At minimum @handle_frame needs to be overridden, and @set_format
- * and likely as well.  If non-packetized input is supported or expected,
- * @parse needs to be overridden as well.
- *
- * Since: 0.10.37
- */
-struct _GstVideoDecoderClass
-{
-  /*< private >*/
-  GstElementClass element_class;
-
-  /*< public >*/
-  gboolean      (*open)           (GstVideoDecoder *decoder);
-
-  gboolean      (*close)          (GstVideoDecoder *decoder);
-
-  gboolean      (*start)          (GstVideoDecoder *decoder);
-
-  gboolean      (*stop)           (GstVideoDecoder *decoder);
-
-  GstFlowReturn (*parse)          (GstVideoDecoder *decoder,
-				   GstVideoCodecFrame *frame,
-				   GstAdapter *adapter,
-				   gboolean at_eos);
-
-  gboolean      (*set_format)     (GstVideoDecoder *decoder,
-				   GstVideoCodecState * state);
-
-  gboolean      (*reset)          (GstVideoDecoder *decoder,
-				   gboolean hard);
-
-  GstFlowReturn (*finish)         (GstVideoDecoder *decoder);
-
-  GstFlowReturn (*handle_frame)   (GstVideoDecoder *decoder,
-				   GstVideoCodecFrame *frame);
-
-  gboolean      (*sink_event)     (GstVideoDecoder *decoder,
-				   GstEvent *event);
-
-  gboolean      (*src_event)      (GstVideoDecoder *decoder,
-				   GstEvent *event);
-
-
-  /*< private >*/
-  gpointer       _gst_reserved[GST_PADDING_LARGE];
-};
-
-GType    gst_video_decoder_get_type (void);
-
-/* Context parameters */
-void     gst_video_decoder_set_packetized (GstVideoDecoder * decoder,
-					   gboolean packetized);
-
-gboolean gst_video_decoder_get_packetized (GstVideoDecoder * decoder);
-
-void     gst_video_decoder_set_estimate_rate (GstVideoDecoder * dec,
-					      gboolean          enabled);
-
-gint     gst_video_decoder_get_estimate_rate (GstVideoDecoder * dec);
-
-void     gst_video_decoder_set_max_errors (GstVideoDecoder * dec,
-					   gint              num);
-
-gint     gst_video_decoder_get_max_errors (GstVideoDecoder * dec);
-
-void     gst_video_decoder_set_latency (GstVideoDecoder *decoder,
-					GstClockTime min_latency,
-					GstClockTime max_latency);
-void     gst_video_decoder_get_latency (GstVideoDecoder *decoder,
-					GstClockTime *min_latency,
-					GstClockTime *max_latency);
-
-
-/* Object methods */
-
-GstVideoCodecFrame *gst_video_decoder_get_frame        (GstVideoDecoder *decoder,
-						        int frame_number);
-
-GstVideoCodecFrame *gst_video_decoder_get_oldest_frame (GstVideoDecoder *decoder);
-
-GList *             gst_video_decoder_get_frames       (GstVideoDecoder *decoder);
-
-/* Parsing related methods */
-void           gst_video_decoder_add_to_frame     (GstVideoDecoder *decoder,
-						   int n_bytes);
-GstFlowReturn  gst_video_decoder_have_frame       (GstVideoDecoder *decoder);
-
-GstBuffer     *gst_video_decoder_alloc_output_buffer (GstVideoDecoder * decoder);
-
-GstFlowReturn  gst_video_decoder_alloc_output_frame  (GstVideoDecoder *decoder,
-						      GstVideoCodecFrame *frame);
-
-GstVideoCodecState *gst_video_decoder_set_output_state (GstVideoDecoder *decoder,
-							GstVideoFormat fmt, guint width, guint height,
-							GstVideoCodecState *reference);
-
-GstVideoCodecState *gst_video_decoder_get_output_state (GstVideoDecoder *decoder);
-
-gboolean         gst_video_decoder_negotiate           (GstVideoDecoder * decoder);
-
-GstClockTimeDiff gst_video_decoder_get_max_decode_time (GstVideoDecoder *decoder,
-							GstVideoCodecFrame *frame);
-
-gdouble          gst_video_decoder_get_qos_proportion (GstVideoDecoder * decoder);
-
-GstFlowReturn    gst_video_decoder_finish_frame (GstVideoDecoder *decoder,
-						 GstVideoCodecFrame *frame);
-
-GstFlowReturn    gst_video_decoder_drop_frame (GstVideoDecoder *dec,
-					       GstVideoCodecFrame *frame);
-
-G_END_DECLS
-
-#endif
-
diff -Nru gstreamer-vaapi-0.5.10/ext/videoutils/gst-libs/gst/video/gstvideoencoder.c gstreamer-vaapi-0.6.0/ext/videoutils/gst-libs/gst/video/gstvideoencoder.c
--- gstreamer-vaapi-0.5.10/ext/videoutils/gst-libs/gst/video/gstvideoencoder.c	2015-02-03 08:39:48.000000000 +0000
+++ gstreamer-vaapi-0.6.0/ext/videoutils/gst-libs/gst/video/gstvideoencoder.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,1712 +0,0 @@
-/* GStreamer
- * Copyright (C) 2008 David Schleef <ds@schleef.org>
- * Copyright (C) 2011 Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>.
- * Copyright (C) 2011 Nokia Corporation. All rights reserved.
- *   Contact: Stefan Kost <stefan.kost@nokia.com>
- * Copyright (C) 2012 Collabora Ltd.
- *	Author : Edward Hervey <edward@collabora.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/**
- * SECTION:gstvideoencoder
- * @short_description: Base class for video encoders
- * @see_also:
- *
- * This base class is for video encoders turning raw video into
- * encoded video data.
- *
- * GstVideoEncoder and subclass should cooperate as follows.
- * <orderedlist>
- * <listitem>
- *   <itemizedlist><title>Configuration</title>
- *   <listitem><para>
- *     Initially, GstVideoEncoder calls @start when the encoder element
- *     is activated, which allows subclass to perform any global setup.
- *   </para></listitem>
- *   <listitem><para>
- *     GstVideoEncoder calls @set_format to inform subclass of the format
- *     of input video data that it is about to receive.  Subclass should
- *     setup for encoding and configure base class as appropriate
- *     (e.g. latency). While unlikely, it might be called more than once,
- *     if changing input parameters require reconfiguration.  Baseclass
- *     will ensure that processing of current configuration is finished.
- *   </para></listitem>
- *   <listitem><para>
- *     GstVideoEncoder calls @stop at end of all processing.
- *   </para></listitem>
- *   </itemizedlist>
- * </listitem>
- * <listitem>
- *   <itemizedlist>
- *   <title>Data processing</title>
- *     <listitem><para>
- *       Base class collects input data and metadata into a frame and hands
- *       this to subclass' @handle_frame.
- *     </para></listitem>
- *     <listitem><para>
- *       If codec processing results in encoded data, subclass should call
- *       @gst_video_encoder_finish_frame to have encoded data pushed
- *       downstream.
- *     </para></listitem>
- *     <listitem><para>
- *       If implemented, baseclass calls subclass @pre_push just prior to
- *       pushing to allow subclasses to modify some metadata on the buffer.
- *       If it returns GST_FLOW_OK, the buffer is pushed downstream.
- *     </para></listitem>
- *     <listitem><para>
- *       GstVideoEncoderClass will handle both srcpad and sinkpad events.
- *       Sink events will be passed to subclass if @event callback has been
- *       provided.
- *     </para></listitem>
- *   </itemizedlist>
- * </listitem>
- * <listitem>
- *   <itemizedlist><title>Shutdown phase</title>
- *   <listitem><para>
- *     GstVideoEncoder class calls @stop to inform the subclass that data
- *     parsing will be stopped.
- *   </para></listitem>
- *   </itemizedlist>
- * </listitem>
- * </orderedlist>
- *
- * Subclass is responsible for providing pad template caps for
- * source and sink pads. The pads need to be named "sink" and "src". It should
- * also be able to provide fixed src pad caps in @getcaps by the time it calls
- * @gst_video_encoder_finish_frame.
- *
- * Things that subclass need to take care of:
- * <itemizedlist>
- *   <listitem><para>Provide pad templates</para></listitem>
- *   <listitem><para>
- *      Provide source pad caps before pushing the first buffer
- *   </para></listitem>
- *   <listitem><para>
- *      Accept data in @handle_frame and provide encoded results to
- *      @gst_video_encoder_finish_frame.
- *   </para></listitem>
- * </itemizedlist>
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-/* TODO
- *
- * * Change _set_output_format() to steal the reference of the provided caps
- * * Calculate actual latency based on input/output timestamp/frame_number
- *   and if it exceeds the recorded one, save it and emit a GST_MESSAGE_LATENCY
- */
-
-/* FIXME 0.11: suppress warnings for deprecated API such as GStaticRecMutex
- * with newer GLib versions (>= 2.31.0) */
-#define GLIB_DISABLE_DEPRECATION_WARNINGS
-
-#include "gstvideoencoder.h"
-#include "gstvideoutils.h"
-
-#include <string.h>
-
-GST_DEBUG_CATEGORY (videoencoder_debug);
-#define GST_CAT_DEFAULT videoencoder_debug
-
-#define GST_VIDEO_ENCODER_GET_PRIVATE(obj)  \
-    (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GST_TYPE_VIDEO_ENCODER, \
-        GstVideoEncoderPrivate))
-
-struct _GstVideoEncoderPrivate
-{
-  guint64 presentation_frame_number;
-  int distance_from_sync;
-
-  /* FIXME : (and introduce a context ?) */
-  gboolean drained;
-  gboolean at_eos;
-
-  gint64 min_latency;
-  gint64 max_latency;
-
-  GList *current_frame_events;
-
-  GList *headers;
-  gboolean new_headers;         /* Whether new headers were just set */
-
-  GList *force_key_unit;        /* List of pending forced keyunits */
-
-  guint32 system_frame_number;
-
-  GList *frames;                /* Protected with OBJECT_LOCK */
-  GstVideoCodecState *input_state;
-  GstVideoCodecState *output_state;
-  gboolean output_state_changed;
-
-  gint64 bytes;
-  gint64 time;
-};
-
-typedef struct _ForcedKeyUnitEvent ForcedKeyUnitEvent;
-struct _ForcedKeyUnitEvent
-{
-  GstClockTime running_time;
-  gboolean pending;             /* TRUE if this was requested already */
-  gboolean all_headers;
-  guint count;
-};
-
-static void
-forced_key_unit_event_free (ForcedKeyUnitEvent * evt)
-{
-  g_slice_free (ForcedKeyUnitEvent, evt);
-}
-
-static ForcedKeyUnitEvent *
-forced_key_unit_event_new (GstClockTime running_time, gboolean all_headers,
-    guint count)
-{
-  ForcedKeyUnitEvent *evt = g_slice_new0 (ForcedKeyUnitEvent);
-
-  evt->running_time = running_time;
-  evt->all_headers = all_headers;
-  evt->count = count;
-
-  return evt;
-}
-
-static void gst_video_encoder_finalize (GObject * object);
-
-static gboolean gst_video_encoder_sink_setcaps (GstPad * pad, GstCaps * caps);
-static GstCaps *gst_video_encoder_sink_getcaps (GstPad * pad);
-static gboolean gst_video_encoder_src_event (GstPad * pad, GstEvent * event);
-static gboolean gst_video_encoder_sink_event (GstPad * pad, GstEvent * event);
-static GstFlowReturn gst_video_encoder_chain (GstPad * pad, GstBuffer * buf);
-static GstStateChangeReturn gst_video_encoder_change_state (GstElement *
-    element, GstStateChange transition);
-static const GstQueryType *gst_video_encoder_get_query_types (GstPad * pad);
-static gboolean gst_video_encoder_src_query (GstPad * pad, GstQuery * query);
-static GstVideoCodecFrame *gst_video_encoder_new_frame (GstVideoEncoder *
-    encoder, GstBuffer * buf, GstClockTime timestamp, GstClockTime duration);
-
-static void
-_do_init (GType object_type)
-{
-  const GInterfaceInfo preset_interface_info = {
-    NULL,                       /* interface_init */
-    NULL,                       /* interface_finalize */
-    NULL                        /* interface_data */
-  };
-
-  g_type_add_interface_static (object_type, GST_TYPE_PRESET,
-      &preset_interface_info);
-}
-
-GST_BOILERPLATE_FULL (GstVideoEncoder, gst_video_encoder,
-    GstElement, GST_TYPE_ELEMENT, _do_init);
-
-static void
-gst_video_encoder_base_init (gpointer g_class)
-{
-  GST_DEBUG_CATEGORY_INIT (videoencoder_debug, "videoencoder", 0,
-      "Base Video Encoder");
-}
-
-static void
-gst_video_encoder_class_init (GstVideoEncoderClass * klass)
-{
-  GObjectClass *gobject_class;
-  GstElementClass *gstelement_class;
-
-  gobject_class = G_OBJECT_CLASS (klass);
-  gstelement_class = GST_ELEMENT_CLASS (klass);
-
-  g_type_class_add_private (klass, sizeof (GstVideoEncoderPrivate));
-
-  gobject_class->finalize = gst_video_encoder_finalize;
-
-  gstelement_class->change_state =
-      GST_DEBUG_FUNCPTR (gst_video_encoder_change_state);
-}
-
-static void
-gst_video_encoder_reset (GstVideoEncoder * encoder)
-{
-  GstVideoEncoderPrivate *priv = encoder->priv;
-  GList *g;
-
-  GST_VIDEO_ENCODER_STREAM_LOCK (encoder);
-
-  priv->presentation_frame_number = 0;
-  priv->distance_from_sync = 0;
-
-  g_list_foreach (priv->force_key_unit, (GFunc) forced_key_unit_event_free,
-      NULL);
-  g_list_free (priv->force_key_unit);
-  priv->force_key_unit = NULL;
-
-  priv->drained = TRUE;
-  priv->min_latency = 0;
-  priv->max_latency = 0;
-
-  g_list_foreach (priv->headers, (GFunc) gst_event_unref, NULL);
-  g_list_free (priv->headers);
-  priv->headers = NULL;
-  priv->new_headers = FALSE;
-
-  g_list_foreach (priv->current_frame_events, (GFunc) gst_event_unref, NULL);
-  g_list_free (priv->current_frame_events);
-  priv->current_frame_events = NULL;
-
-  for (g = priv->frames; g; g = g->next) {
-    gst_video_codec_frame_unref ((GstVideoCodecFrame *) g->data);
-  }
-  g_list_free (priv->frames);
-  priv->frames = NULL;
-
-  priv->bytes = 0;
-  priv->time = 0;
-
-  if (priv->input_state)
-    gst_video_codec_state_unref (priv->input_state);
-  priv->input_state = NULL;
-  if (priv->output_state)
-    gst_video_codec_state_unref (priv->output_state);
-  priv->output_state = NULL;
-
-  GST_VIDEO_ENCODER_STREAM_UNLOCK (encoder);
-}
-
-static void
-gst_video_encoder_init (GstVideoEncoder * encoder, GstVideoEncoderClass * klass)
-{
-  GstVideoEncoderPrivate *priv;
-  GstPadTemplate *pad_template;
-  GstPad *pad;
-
-  GST_DEBUG_OBJECT (encoder, "gst_video_encoder_init");
-
-  priv = encoder->priv = GST_VIDEO_ENCODER_GET_PRIVATE (encoder);
-
-  pad_template =
-      gst_element_class_get_pad_template (GST_ELEMENT_CLASS (klass), "sink");
-  g_return_if_fail (pad_template != NULL);
-
-  encoder->sinkpad = pad = gst_pad_new_from_template (pad_template, "sink");
-
-  gst_pad_set_chain_function (pad, GST_DEBUG_FUNCPTR (gst_video_encoder_chain));
-  gst_pad_set_event_function (pad,
-      GST_DEBUG_FUNCPTR (gst_video_encoder_sink_event));
-  gst_pad_set_setcaps_function (pad,
-      GST_DEBUG_FUNCPTR (gst_video_encoder_sink_setcaps));
-  gst_pad_set_getcaps_function (pad,
-      GST_DEBUG_FUNCPTR (gst_video_encoder_sink_getcaps));
-  gst_element_add_pad (GST_ELEMENT (encoder), encoder->sinkpad);
-
-  pad_template =
-      gst_element_class_get_pad_template (GST_ELEMENT_CLASS (klass), "src");
-  g_return_if_fail (pad_template != NULL);
-
-  encoder->srcpad = pad = gst_pad_new_from_template (pad_template, "src");
-
-  gst_pad_set_query_type_function (pad,
-      GST_DEBUG_FUNCPTR (gst_video_encoder_get_query_types));
-  gst_pad_set_query_function (pad,
-      GST_DEBUG_FUNCPTR (gst_video_encoder_src_query));
-  gst_pad_set_event_function (pad,
-      GST_DEBUG_FUNCPTR (gst_video_encoder_src_event));
-  gst_element_add_pad (GST_ELEMENT (encoder), encoder->srcpad);
-
-  gst_segment_init (&encoder->input_segment, GST_FORMAT_TIME);
-  gst_segment_init (&encoder->output_segment, GST_FORMAT_TIME);
-
-  g_static_rec_mutex_init (&encoder->stream_lock);
-
-  priv->at_eos = FALSE;
-  priv->headers = NULL;
-  priv->new_headers = FALSE;
-
-  gst_video_encoder_reset (encoder);
-}
-
-static gboolean
-gst_video_encoded_video_convert (gint64 bytes, gint64 time,
-    GstFormat src_format, gint64 src_value, GstFormat * dest_format,
-    gint64 * dest_value)
-{
-  gboolean res = FALSE;
-
-  g_return_val_if_fail (dest_format != NULL, FALSE);
-  g_return_val_if_fail (dest_value != NULL, FALSE);
-
-  if (G_UNLIKELY (src_format == *dest_format || src_value == 0 ||
-          src_value == -1)) {
-    if (dest_value)
-      *dest_value = src_value;
-    return TRUE;
-  }
-
-  if (bytes <= 0 || time <= 0) {
-    GST_DEBUG ("not enough metadata yet to convert");
-    goto exit;
-  }
-
-  switch (src_format) {
-    case GST_FORMAT_BYTES:
-      switch (*dest_format) {
-        case GST_FORMAT_TIME:
-          *dest_value = gst_util_uint64_scale (src_value, time, bytes);
-          res = TRUE;
-          break;
-        default:
-          res = FALSE;
-      }
-      break;
-    case GST_FORMAT_TIME:
-      switch (*dest_format) {
-        case GST_FORMAT_BYTES:
-          *dest_value = gst_util_uint64_scale (src_value, bytes, time);
-          res = TRUE;
-          break;
-        default:
-          res = FALSE;
-      }
-      break;
-    default:
-      GST_DEBUG ("unhandled conversion from %d to %d", src_format,
-          *dest_format);
-      res = FALSE;
-  }
-
-exit:
-  return res;
-}
-
-/**
- * gst_video_encoder_set_headers:
- * @encoder: a #GstVideoEncoder
- * @headers: (transfer full) (element-type GstBuffer): a list of #GstBuffer containing the codec header
- *
- * Set the codec headers to be sent downstream whenever requested.
- *
- * Since: 0.10.37
- */
-void
-gst_video_encoder_set_headers (GstVideoEncoder * video_encoder, GList * headers)
-{
-  GST_VIDEO_ENCODER_STREAM_LOCK (video_encoder);
-
-  GST_DEBUG_OBJECT (video_encoder, "new headers %p", headers);
-  if (video_encoder->priv->headers) {
-    g_list_foreach (video_encoder->priv->headers, (GFunc) gst_buffer_unref,
-        NULL);
-    g_list_free (video_encoder->priv->headers);
-  }
-  video_encoder->priv->headers = headers;
-  video_encoder->priv->new_headers = TRUE;
-
-  GST_VIDEO_ENCODER_STREAM_UNLOCK (video_encoder);
-}
-
-static gboolean
-gst_video_encoder_drain (GstVideoEncoder * enc)
-{
-  GstVideoEncoderPrivate *priv;
-  GstVideoEncoderClass *enc_class;
-  gboolean ret = TRUE;
-
-  enc_class = GST_VIDEO_ENCODER_GET_CLASS (enc);
-  priv = enc->priv;
-
-  GST_DEBUG_OBJECT (enc, "draining");
-
-  if (priv->drained) {
-    GST_DEBUG_OBJECT (enc, "already drained");
-    return TRUE;
-  }
-
-  if (enc_class->reset) {
-    GST_DEBUG_OBJECT (enc, "requesting subclass to finish");
-    ret = enc_class->reset (enc, TRUE);
-  }
-  /* everything should be away now */
-  if (priv->frames) {
-    /* not fatal/impossible though if subclass/enc eats stuff */
-    g_list_foreach (priv->frames, (GFunc) gst_video_codec_frame_unref, NULL);
-    g_list_free (priv->frames);
-    priv->frames = NULL;
-  }
-
-  return ret;
-}
-
-static GstVideoCodecState *
-_new_output_state (GstCaps * caps, GstVideoCodecState * reference)
-{
-  GstVideoCodecState *state;
-
-  state = g_slice_new0 (GstVideoCodecState);
-  state->ref_count = 1;
-  gst_video_info_init (&state->info);
-  gst_video_info_set_format (&state->info, GST_VIDEO_FORMAT_ENCODED, 0, 0);
-
-  state->caps = caps;
-
-  if (reference) {
-    GstVideoInfo *tgt, *ref;
-
-    tgt = &state->info;
-    ref = &reference->info;
-
-    /* Copy over extra fields from reference state */
-    tgt->interlace_mode = ref->interlace_mode;
-    tgt->flags = ref->flags;
-    tgt->width = ref->width;
-    tgt->height = ref->height;
-    tgt->chroma_site = ref->chroma_site;
-    tgt->colorimetry = ref->colorimetry;
-    tgt->par_n = ref->par_n;
-    tgt->par_d = ref->par_d;
-    tgt->fps_n = ref->fps_n;
-    tgt->fps_d = ref->fps_d;
-  }
-
-  return state;
-}
-
-static GstVideoCodecState *
-_new_input_state (GstCaps * caps)
-{
-  GstVideoCodecState *state;
-
-  state = g_slice_new0 (GstVideoCodecState);
-  state->ref_count = 1;
-  gst_video_info_init (&state->info);
-  if (G_UNLIKELY (!gst_video_info_from_caps (&state->info, caps)))
-    goto parse_fail;
-  state->caps = gst_caps_ref (caps);
-
-  return state;
-
-parse_fail:
-  {
-    g_slice_free (GstVideoCodecState, state);
-    return NULL;
-  }
-}
-
-static gboolean
-gst_video_encoder_sink_setcaps (GstPad * pad, GstCaps * caps)
-{
-  GstVideoEncoder *encoder;
-  GstVideoEncoderClass *encoder_class;
-  GstVideoCodecState *state;
-  gboolean ret;
-  gboolean samecaps = FALSE;
-
-  encoder = GST_VIDEO_ENCODER (gst_pad_get_parent (pad));
-  encoder_class = GST_VIDEO_ENCODER_GET_CLASS (encoder);
-
-  /* subclass should do something here ... */
-  g_return_val_if_fail (encoder_class->set_format != NULL, FALSE);
-
-  GST_DEBUG_OBJECT (encoder, "setcaps %" GST_PTR_FORMAT, caps);
-
-  state = _new_input_state (caps);
-  if (G_UNLIKELY (!state))
-    goto parse_fail;
-
-  GST_VIDEO_ENCODER_STREAM_LOCK (encoder);
-
-  if (encoder->priv->input_state)
-    samecaps =
-        gst_video_info_is_equal (&state->info,
-        &encoder->priv->input_state->info);
-
-  if (!samecaps) {
-    /* arrange draining pending frames */
-    gst_video_encoder_drain (encoder);
-
-    /* and subclass should be ready to configure format at any time around */
-    ret = encoder_class->set_format (encoder, state);
-    if (ret) {
-      if (encoder->priv->input_state)
-        gst_video_codec_state_unref (encoder->priv->input_state);
-      encoder->priv->input_state = state;
-    } else
-      gst_video_codec_state_unref (state);
-  } else {
-    /* no need to stir things up */
-    GST_DEBUG_OBJECT (encoder,
-        "new video format identical to configured format");
-    gst_video_codec_state_unref (state);
-    ret = TRUE;
-  }
-
-  GST_VIDEO_ENCODER_STREAM_UNLOCK (encoder);
-
-  if (!ret)
-    GST_WARNING_OBJECT (encoder, "rejected caps %" GST_PTR_FORMAT, caps);
-
-  gst_object_unref (encoder);
-
-  return ret;
-
-parse_fail:
-  {
-    GST_WARNING_OBJECT (encoder, "Failed to parse caps");
-    gst_object_unref (encoder);
-    return FALSE;
-  }
-}
-
-/**
- * gst_video_encoder_proxy_getcaps:
- * @enc: a #GstVideoEncoder
- * @caps: initial caps
- *
- * Returns caps that express @caps (or sink template caps if @caps == NULL)
- * restricted to resolution/format/... combinations supported by downstream
- * elements (e.g. muxers).
- *
- * Returns: a #GstCaps owned by caller
- *
- * Since: 0.10.37
- */
-GstCaps *
-gst_video_encoder_proxy_getcaps (GstVideoEncoder * encoder, GstCaps * caps)
-{
-  const GstCaps *templ_caps;
-  GstCaps *allowed;
-  GstCaps *fcaps, *filter_caps;
-  gint i, j;
-
-  /* Allow downstream to specify width/height/framerate/PAR constraints
-   * and forward them upstream for video converters to handle
-   */
-  templ_caps = caps ? caps : gst_pad_get_pad_template_caps (encoder->sinkpad);
-  allowed = gst_pad_get_allowed_caps (encoder->srcpad);
-
-  if (!allowed || gst_caps_is_empty (allowed) || gst_caps_is_any (allowed)) {
-    fcaps = gst_caps_copy (templ_caps);
-    goto done;
-  }
-
-  GST_LOG_OBJECT (encoder, "template caps %" GST_PTR_FORMAT, templ_caps);
-  GST_LOG_OBJECT (encoder, "allowed caps %" GST_PTR_FORMAT, allowed);
-
-  filter_caps = gst_caps_new_empty ();
-
-  for (i = 0; i < gst_caps_get_size (templ_caps); i++) {
-    GQuark q_name =
-        gst_structure_get_name_id (gst_caps_get_structure (templ_caps, i));
-
-    for (j = 0; j < gst_caps_get_size (allowed); j++) {
-      const GstStructure *allowed_s = gst_caps_get_structure (allowed, j);
-      const GValue *val;
-      GstStructure *s;
-
-      s = gst_structure_id_empty_new (q_name);
-      if ((val = gst_structure_get_value (allowed_s, "width")))
-        gst_structure_set_value (s, "width", val);
-      if ((val = gst_structure_get_value (allowed_s, "height")))
-        gst_structure_set_value (s, "height", val);
-      if ((val = gst_structure_get_value (allowed_s, "framerate")))
-        gst_structure_set_value (s, "framerate", val);
-      if ((val = gst_structure_get_value (allowed_s, "pixel-aspect-ratio")))
-        gst_structure_set_value (s, "pixel-aspect-ratio", val);
-
-      gst_caps_merge_structure (filter_caps, s);
-    }
-  }
-
-  fcaps = gst_caps_intersect (filter_caps, templ_caps);
-  gst_caps_unref (filter_caps);
-
-done:
-  gst_caps_replace (&allowed, NULL);
-
-  GST_LOG_OBJECT (encoder, "proxy caps %" GST_PTR_FORMAT, fcaps);
-
-  return fcaps;
-}
-
-static GstCaps *
-gst_video_encoder_sink_getcaps (GstPad * pad)
-{
-  GstVideoEncoder *encoder;
-  GstVideoEncoderClass *klass;
-  GstCaps *caps;
-
-  encoder = GST_VIDEO_ENCODER (gst_pad_get_parent (pad));
-  klass = GST_VIDEO_ENCODER_GET_CLASS (encoder);
-
-  if (klass->getcaps)
-    caps = klass->getcaps (encoder);
-  else
-    caps = gst_video_encoder_proxy_getcaps (encoder, NULL);
-
-  GST_LOG_OBJECT (encoder, "Returning caps %" GST_PTR_FORMAT, caps);
-
-  gst_object_unref (encoder);
-
-  return caps;
-}
-
-static void
-gst_video_encoder_finalize (GObject * object)
-{
-  GstVideoEncoder *encoder;
-
-  GST_DEBUG_OBJECT (object, "finalize");
-
-  encoder = GST_VIDEO_ENCODER (object);
-  if (encoder->priv->headers) {
-    g_list_foreach (encoder->priv->headers, (GFunc) gst_buffer_unref, NULL);
-    g_list_free (encoder->priv->headers);
-  }
-  g_static_rec_mutex_free (&encoder->stream_lock);
-
-  G_OBJECT_CLASS (parent_class)->finalize (object);
-}
-
-static gboolean
-gst_video_encoder_push_event (GstVideoEncoder * encoder, GstEvent * event)
-{
-  switch (GST_EVENT_TYPE (event)) {
-    case GST_EVENT_NEWSEGMENT:
-    {
-      gboolean update;
-      double rate;
-      double applied_rate;
-      GstFormat format;
-      gint64 start;
-      gint64 stop;
-      gint64 position;
-
-      GST_VIDEO_ENCODER_STREAM_LOCK (encoder);
-      gst_event_parse_new_segment_full (event, &update, &rate, &applied_rate,
-          &format, &start, &stop, &position);
-
-      GST_DEBUG_OBJECT (encoder, "newseg rate %g, applied rate %g, "
-          "format %d, start = %" GST_TIME_FORMAT ", stop = %" GST_TIME_FORMAT
-          ", pos = %" GST_TIME_FORMAT, rate, applied_rate, format,
-          GST_TIME_ARGS (start), GST_TIME_ARGS (stop),
-          GST_TIME_ARGS (position));
-
-      if (format != GST_FORMAT_TIME) {
-        GST_DEBUG_OBJECT (encoder, "received non TIME newsegment");
-        GST_VIDEO_ENCODER_STREAM_UNLOCK (encoder);
-        break;
-      }
-
-      gst_segment_set_newsegment_full (&encoder->output_segment, update, rate,
-          applied_rate, format, start, stop, position);
-      GST_VIDEO_ENCODER_STREAM_UNLOCK (encoder);
-      break;
-    }
-    default:
-      break;
-  }
-
-  return gst_pad_push_event (encoder->srcpad, event);
-}
-
-static gboolean
-gst_video_encoder_sink_eventfunc (GstVideoEncoder * encoder, GstEvent * event)
-{
-  GstVideoEncoderClass *encoder_class;
-  gboolean ret = FALSE;
-
-  encoder_class = GST_VIDEO_ENCODER_GET_CLASS (encoder);
-
-  switch (GST_EVENT_TYPE (event)) {
-    case GST_EVENT_EOS:
-    {
-      GstFlowReturn flow_ret;
-
-      GST_VIDEO_ENCODER_STREAM_LOCK (encoder);
-      encoder->priv->at_eos = TRUE;
-
-      if (encoder_class->finish) {
-        flow_ret = encoder_class->finish (encoder);
-      } else {
-        flow_ret = GST_FLOW_OK;
-      }
-
-      ret = (flow_ret == GST_VIDEO_ENCODER_FLOW_DROPPED);
-      GST_VIDEO_ENCODER_STREAM_UNLOCK (encoder);
-      break;
-    }
-    case GST_EVENT_NEWSEGMENT:
-    {
-      gboolean update;
-      double rate;
-      double applied_rate;
-      GstFormat format;
-      gint64 start;
-      gint64 stop;
-      gint64 position;
-
-      GST_VIDEO_ENCODER_STREAM_LOCK (encoder);
-      gst_event_parse_new_segment_full (event, &update, &rate, &applied_rate,
-          &format, &start, &stop, &position);
-
-      GST_DEBUG_OBJECT (encoder, "newseg rate %g, applied rate %g, "
-          "format %d, start = %" GST_TIME_FORMAT ", stop = %" GST_TIME_FORMAT
-          ", pos = %" GST_TIME_FORMAT, rate, applied_rate, format,
-          GST_TIME_ARGS (start), GST_TIME_ARGS (stop),
-          GST_TIME_ARGS (position));
-
-      if (format != GST_FORMAT_TIME) {
-        GST_DEBUG_OBJECT (encoder, "received non TIME newsegment");
-        GST_VIDEO_ENCODER_STREAM_UNLOCK (encoder);
-        break;
-      }
-
-      encoder->priv->at_eos = FALSE;
-
-      gst_segment_set_newsegment_full (&encoder->input_segment, update, rate,
-          applied_rate, format, start, stop, position);
-      GST_VIDEO_ENCODER_STREAM_UNLOCK (encoder);
-      break;
-    }
-    case GST_EVENT_CUSTOM_DOWNSTREAM:
-    {
-      if (gst_video_event_is_force_key_unit (event)) {
-        GstClockTime running_time;
-        gboolean all_headers;
-        guint count;
-
-        if (gst_video_event_parse_downstream_force_key_unit (event,
-                NULL, NULL, &running_time, &all_headers, &count)) {
-          ForcedKeyUnitEvent *fevt;
-
-          GST_OBJECT_LOCK (encoder);
-          fevt = forced_key_unit_event_new (running_time, all_headers, count);
-          encoder->priv->force_key_unit =
-              g_list_append (encoder->priv->force_key_unit, fevt);
-          GST_OBJECT_UNLOCK (encoder);
-
-          GST_DEBUG_OBJECT (encoder,
-              "force-key-unit event: running-time %" GST_TIME_FORMAT
-              ", all_headers %d, count %u",
-              GST_TIME_ARGS (running_time), all_headers, count);
-        }
-        gst_event_unref (event);
-        ret = TRUE;
-      }
-      break;
-    }
-    default:
-      break;
-  }
-
-  return ret;
-}
-
-static gboolean
-gst_video_encoder_sink_event (GstPad * pad, GstEvent * event)
-{
-  GstVideoEncoder *enc;
-  GstVideoEncoderClass *klass;
-  gboolean handled = FALSE;
-  gboolean ret = TRUE;
-
-  enc = GST_VIDEO_ENCODER (gst_pad_get_parent (pad));
-  klass = GST_VIDEO_ENCODER_GET_CLASS (enc);
-
-  GST_DEBUG_OBJECT (enc, "received event %d, %s", GST_EVENT_TYPE (event),
-      GST_EVENT_TYPE_NAME (event));
-
-  if (klass->sink_event)
-    handled = klass->sink_event (enc, event);
-
-  if (!handled)
-    handled = gst_video_encoder_sink_eventfunc (enc, event);
-
-  if (!handled) {
-    /* Forward non-serialized events and EOS/FLUSH_STOP immediately.
-     * For EOS this is required because no buffer or serialized event
-     * will come after EOS and nothing could trigger another
-     * _finish_frame() call.   *
-     * If the subclass handles sending of EOS manually it can return
-     * _DROPPED from ::finish() and all other subclasses should have
-     * decoded/flushed all remaining data before this
-     *
-     * For FLUSH_STOP this is required because it is expected
-     * to be forwarded immediately and no buffers are queued anyway.
-     */
-    if (!GST_EVENT_IS_SERIALIZED (event)
-        || GST_EVENT_TYPE (event) == GST_EVENT_EOS
-        || GST_EVENT_TYPE (event) == GST_EVENT_FLUSH_STOP) {
-      ret = gst_video_encoder_push_event (enc, event);
-    } else {
-      GST_VIDEO_ENCODER_STREAM_LOCK (enc);
-      enc->priv->current_frame_events =
-          g_list_prepend (enc->priv->current_frame_events, event);
-      GST_VIDEO_ENCODER_STREAM_UNLOCK (enc);
-      ret = TRUE;
-    }
-  }
-
-  GST_DEBUG_OBJECT (enc, "event handled");
-
-  gst_object_unref (enc);
-  return ret;
-}
-
-static gboolean
-gst_video_encoder_src_eventfunc (GstVideoEncoder * encoder, GstEvent * event)
-{
-  gboolean handled = FALSE;
-
-  switch (GST_EVENT_TYPE (event)) {
-    case GST_EVENT_CUSTOM_UPSTREAM:
-    {
-      if (gst_video_event_is_force_key_unit (event)) {
-        GstClockTime running_time;
-        gboolean all_headers;
-        guint count;
-
-        if (gst_video_event_parse_upstream_force_key_unit (event,
-                &running_time, &all_headers, &count)) {
-          ForcedKeyUnitEvent *fevt;
-
-          GST_OBJECT_LOCK (encoder);
-          fevt = forced_key_unit_event_new (running_time, all_headers, count);
-          encoder->priv->force_key_unit =
-              g_list_append (encoder->priv->force_key_unit, fevt);
-          GST_OBJECT_UNLOCK (encoder);
-
-          GST_DEBUG_OBJECT (encoder,
-              "force-key-unit event: running-time %" GST_TIME_FORMAT
-              ", all_headers %d, count %u",
-              GST_TIME_ARGS (running_time), all_headers, count);
-        }
-        gst_event_unref (event);
-        handled = TRUE;
-      }
-      break;
-    }
-    default:
-      break;
-  }
-
-  return handled;
-}
-
-static gboolean
-gst_video_encoder_src_event (GstPad * pad, GstEvent * event)
-{
-  GstVideoEncoder *encoder;
-  GstVideoEncoderClass *klass;
-  gboolean ret = FALSE;
-  gboolean handled = FALSE;
-
-  encoder = GST_VIDEO_ENCODER (gst_pad_get_parent (pad));
-  klass = GST_VIDEO_ENCODER_GET_CLASS (encoder);
-
-  GST_LOG_OBJECT (encoder, "handling event: %" GST_PTR_FORMAT, event);
-
-  if (klass->src_event)
-    handled = klass->src_event (encoder, event);
-
-  if (!handled)
-    handled = gst_video_encoder_src_eventfunc (encoder, event);
-
-  if (!handled)
-    ret = gst_pad_event_default (pad, event);
-
-  gst_object_unref (encoder);
-
-  return ret;
-}
-
-static const GstQueryType *
-gst_video_encoder_get_query_types (GstPad * pad)
-{
-  static const GstQueryType query_types[] = {
-    GST_QUERY_CONVERT,
-    GST_QUERY_LATENCY,
-    0
-  };
-
-  return query_types;
-}
-
-static gboolean
-gst_video_encoder_src_query (GstPad * pad, GstQuery * query)
-{
-  GstVideoEncoderPrivate *priv;
-  GstVideoEncoder *enc;
-  gboolean res;
-  GstPad *peerpad;
-
-  enc = GST_VIDEO_ENCODER (gst_pad_get_parent (pad));
-  priv = enc->priv;
-  peerpad = gst_pad_get_peer (enc->sinkpad);
-
-  GST_LOG_OBJECT (enc, "handling query: %" GST_PTR_FORMAT, query);
-
-  switch (GST_QUERY_TYPE (query)) {
-    case GST_QUERY_CONVERT:
-    {
-      GstFormat src_fmt, dest_fmt;
-      gint64 src_val, dest_val;
-
-      gst_query_parse_convert (query, &src_fmt, &src_val, &dest_fmt, &dest_val);
-      res =
-          gst_video_encoded_video_convert (priv->bytes, priv->time, src_fmt,
-          src_val, &dest_fmt, &dest_val);
-      if (!res)
-        goto error;
-      gst_query_set_convert (query, src_fmt, src_val, dest_fmt, dest_val);
-      break;
-    }
-    case GST_QUERY_LATENCY:
-    {
-      gboolean live;
-      GstClockTime min_latency, max_latency;
-
-      res = gst_pad_query (peerpad, query);
-      if (res) {
-        gst_query_parse_latency (query, &live, &min_latency, &max_latency);
-        GST_DEBUG_OBJECT (enc, "Peer latency: live %d, min %"
-            GST_TIME_FORMAT " max %" GST_TIME_FORMAT, live,
-            GST_TIME_ARGS (min_latency), GST_TIME_ARGS (max_latency));
-
-        GST_OBJECT_LOCK (enc);
-        min_latency += priv->min_latency;
-        if (enc->priv->max_latency == GST_CLOCK_TIME_NONE) {
-          max_latency = GST_CLOCK_TIME_NONE;
-        } else if (max_latency != GST_CLOCK_TIME_NONE) {
-          max_latency += enc->priv->max_latency;
-        }
-        GST_OBJECT_UNLOCK (enc);
-
-        gst_query_set_latency (query, live, min_latency, max_latency);
-      }
-    }
-      break;
-    default:
-      res = gst_pad_query_default (pad, query);
-  }
-  gst_object_unref (peerpad);
-  gst_object_unref (enc);
-  return res;
-
-error:
-  GST_DEBUG_OBJECT (enc, "query failed");
-  gst_object_unref (peerpad);
-  gst_object_unref (enc);
-  return res;
-}
-
-static GstVideoCodecFrame *
-gst_video_encoder_new_frame (GstVideoEncoder * encoder, GstBuffer * buf,
-    GstClockTime timestamp, GstClockTime duration)
-{
-  GstVideoEncoderPrivate *priv = encoder->priv;
-  GstVideoCodecFrame *frame;
-
-  frame = g_slice_new0 (GstVideoCodecFrame);
-
-  frame->ref_count = 1;
-
-  GST_VIDEO_ENCODER_STREAM_LOCK (encoder);
-  frame->system_frame_number = priv->system_frame_number;
-  priv->system_frame_number++;
-
-  frame->presentation_frame_number = priv->presentation_frame_number;
-  priv->presentation_frame_number++;
-  GST_VIDEO_ENCODER_STREAM_UNLOCK (encoder);
-
-  frame->events = priv->current_frame_events;
-  priv->current_frame_events = NULL;
-  frame->input_buffer = buf;
-  frame->pts = timestamp;
-  frame->duration = duration;
-
-  if (GST_VIDEO_INFO_IS_INTERLACED (&encoder->priv->input_state->info)) {
-    if (GST_BUFFER_FLAG_IS_SET (buf, GST_VIDEO_BUFFER_TFF)) {
-      GST_VIDEO_CODEC_FRAME_FLAG_SET (frame, GST_VIDEO_CODEC_FRAME_FLAG_TFF);
-    } else {
-      GST_VIDEO_CODEC_FRAME_FLAG_UNSET (frame, GST_VIDEO_CODEC_FRAME_FLAG_TFF);
-    }
-    if (GST_BUFFER_FLAG_IS_SET (buf, GST_VIDEO_BUFFER_RFF)) {
-      GST_VIDEO_CODEC_FRAME_FLAG_SET (frame, GST_VIDEO_CODEC_FRAME_FLAG_RFF);
-    } else {
-      GST_VIDEO_CODEC_FRAME_FLAG_UNSET (frame, GST_VIDEO_CODEC_FRAME_FLAG_RFF);
-    }
-    if (GST_BUFFER_FLAG_IS_SET (buf, GST_VIDEO_BUFFER_ONEFIELD)) {
-      GST_VIDEO_CODEC_FRAME_FLAG_SET (frame,
-          GST_VIDEO_CODEC_FRAME_FLAG_ONEFIELD);
-    } else {
-      GST_VIDEO_CODEC_FRAME_FLAG_UNSET (frame,
-          GST_VIDEO_CODEC_FRAME_FLAG_ONEFIELD);
-    }
-  }
-
-  return frame;
-}
-
-
-static GstFlowReturn
-gst_video_encoder_chain (GstPad * pad, GstBuffer * buf)
-{
-  GstVideoEncoder *encoder;
-  GstVideoEncoderPrivate *priv;
-  GstVideoEncoderClass *klass;
-  GstVideoCodecFrame *frame;
-  GstFlowReturn ret = GST_FLOW_OK;
-  gint64 start, stop = GST_CLOCK_TIME_NONE, cstart, cstop;
-
-  encoder = GST_VIDEO_ENCODER (gst_pad_get_parent (pad));
-  priv = encoder->priv;
-  klass = GST_VIDEO_ENCODER_GET_CLASS (encoder);
-
-  g_return_val_if_fail (klass->handle_frame != NULL, GST_FLOW_ERROR);
-
-  GST_VIDEO_ENCODER_STREAM_LOCK (encoder);
-
-  /* .... ?? */
-  if (!GST_PAD_CAPS (pad)) {
-    ret = GST_FLOW_NOT_NEGOTIATED;
-    goto done;
-  }
-
-  start = GST_BUFFER_TIMESTAMP (buf);
-  if (GST_CLOCK_TIME_IS_VALID (GST_BUFFER_DURATION (buf)))
-    stop = start + GST_BUFFER_DURATION (buf);
-
-  GST_LOG_OBJECT (encoder,
-      "received buffer of size %d with ts %" GST_TIME_FORMAT
-      ", duration %" GST_TIME_FORMAT, GST_BUFFER_SIZE (buf),
-      GST_TIME_ARGS (start), GST_TIME_ARGS (GST_BUFFER_DURATION (buf)));
-
-  if (priv->at_eos) {
-    ret = GST_FLOW_UNEXPECTED;
-    goto done;
-  }
-
-  /* Drop buffers outside of segment */
-  if (!gst_segment_clip (&encoder->input_segment,
-          GST_FORMAT_TIME, start, stop, &cstart, &cstop)) {
-    GST_DEBUG_OBJECT (encoder, "clipping to segment dropped frame");
-    gst_buffer_unref (buf);
-    goto done;
-  }
-
-  frame = gst_video_encoder_new_frame (encoder, buf, cstart, cstop - cstart);
-
-  GST_OBJECT_LOCK (encoder);
-  if (priv->force_key_unit) {
-    ForcedKeyUnitEvent *fevt = NULL;
-    GstClockTime running_time;
-    GList *l;
-
-    running_time =
-        gst_segment_to_running_time (&encoder->output_segment, GST_FORMAT_TIME,
-        GST_BUFFER_TIMESTAMP (buf));
-
-    for (l = priv->force_key_unit; l; l = l->next) {
-      ForcedKeyUnitEvent *tmp = l->data;
-
-      /* Skip pending keyunits */
-      if (tmp->pending)
-        continue;
-
-      /* Simple case, keyunit ASAP */
-      if (tmp->running_time == GST_CLOCK_TIME_NONE) {
-        fevt = tmp;
-        break;
-      }
-
-      /* Event for before this frame */
-      if (tmp->running_time <= running_time) {
-        fevt = tmp;
-        break;
-      }
-    }
-
-    if (fevt) {
-      GST_DEBUG_OBJECT (encoder,
-          "Forcing a key unit at running time %" GST_TIME_FORMAT,
-          GST_TIME_ARGS (running_time));
-      GST_VIDEO_CODEC_FRAME_SET_FORCE_KEYFRAME (frame);
-      if (fevt->all_headers)
-        GST_VIDEO_CODEC_FRAME_SET_FORCE_KEYFRAME_HEADERS (frame);
-      fevt->pending = TRUE;
-    }
-  }
-  GST_OBJECT_UNLOCK (encoder);
-
-  priv->frames = g_list_append (priv->frames, frame);
-
-  /* new data, more finish needed */
-  priv->drained = FALSE;
-
-  GST_LOG_OBJECT (encoder, "passing frame pfn %d to subclass",
-      frame->presentation_frame_number);
-
-  gst_video_codec_frame_ref (frame);
-  ret = klass->handle_frame (encoder, frame);
-
-done:
-  GST_VIDEO_ENCODER_STREAM_UNLOCK (encoder);
-
-  gst_object_unref (encoder);
-
-  return ret;
-}
-
-static GstStateChangeReturn
-gst_video_encoder_change_state (GstElement * element, GstStateChange transition)
-{
-  GstVideoEncoder *encoder;
-  GstVideoEncoderClass *encoder_class;
-  GstStateChangeReturn ret;
-
-  encoder = GST_VIDEO_ENCODER (element);
-  encoder_class = GST_VIDEO_ENCODER_GET_CLASS (element);
-
-  switch (transition) {
-    case GST_STATE_CHANGE_NULL_TO_READY:
-      /* open device/library if needed */
-      if (encoder_class->open && !encoder_class->open (encoder))
-        goto open_failed;
-      break;
-    case GST_STATE_CHANGE_READY_TO_PAUSED:
-      /* Initialize device/library if needed */
-      if (encoder_class->start && !encoder_class->start (encoder))
-        goto start_failed;
-      break;
-    default:
-      break;
-  }
-
-  ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
-
-  switch (transition) {
-    case GST_STATE_CHANGE_PAUSED_TO_READY:
-      gst_video_encoder_reset (encoder);
-      if (encoder_class->stop && !encoder_class->stop (encoder))
-        goto stop_failed;
-      break;
-    case GST_STATE_CHANGE_READY_TO_NULL:
-      /* close device/library if needed */
-      if (encoder_class->close && !encoder_class->close (encoder))
-        goto close_failed;
-      break;
-    default:
-      break;
-  }
-
-  return ret;
-
-  /* Errors */
-
-open_failed:
-  {
-    GST_ELEMENT_ERROR (encoder, LIBRARY, INIT, (NULL),
-        ("Failed to open encoder"));
-    return GST_STATE_CHANGE_FAILURE;
-  }
-
-start_failed:
-  {
-    GST_ELEMENT_ERROR (encoder, LIBRARY, INIT, (NULL),
-        ("Failed to start encoder"));
-    return GST_STATE_CHANGE_FAILURE;
-  }
-
-stop_failed:
-  {
-    GST_ELEMENT_ERROR (encoder, LIBRARY, INIT, (NULL),
-        ("Failed to stop encoder"));
-    return GST_STATE_CHANGE_FAILURE;
-  }
-
-close_failed:
-  {
-    GST_ELEMENT_ERROR (encoder, LIBRARY, INIT, (NULL),
-        ("Failed to close encoder"));
-    return GST_STATE_CHANGE_FAILURE;
-  }
-}
-
-static gboolean
-gst_video_encoder_set_src_caps (GstVideoEncoder * encoder)
-{
-  gboolean ret;
-  GstVideoCodecState *state = encoder->priv->output_state;
-  GstVideoInfo *info = &state->info;
-
-  g_return_val_if_fail (state->caps != NULL, FALSE);
-
-  if (encoder->priv->output_state_changed) {
-    state->caps = gst_caps_make_writable (state->caps);
-
-    /* Fill caps */
-    gst_caps_set_simple (state->caps, "width", G_TYPE_INT, info->width,
-        "height", G_TYPE_INT, info->height,
-        "pixel-aspect-ratio", GST_TYPE_FRACTION,
-        info->par_n, info->par_d, NULL);
-    if (info->flags & GST_VIDEO_FLAG_VARIABLE_FPS && info->fps_n != 0) {
-      /* variable fps with a max-framerate */
-      gst_caps_set_simple (state->caps, "framerate", GST_TYPE_FRACTION, 0, 1,
-          "max-framerate", GST_TYPE_FRACTION, info->fps_n, info->fps_d, NULL);
-    } else {
-      /* no variable fps or no max-framerate */
-      gst_caps_set_simple (state->caps, "framerate", GST_TYPE_FRACTION,
-          info->fps_n, info->fps_d, NULL);
-    }
-    if (state->codec_data)
-      gst_caps_set_simple (state->caps, "codec_data", GST_TYPE_BUFFER,
-          state->codec_data, NULL);
-    encoder->priv->output_state_changed = FALSE;
-  }
-
-  ret = gst_pad_set_caps (encoder->srcpad, state->caps);
-
-  return ret;
-}
-
-/**
- * gst_video_encoder_finish_frame:
- * @encoder: a #GstVideoEncoder
- * @frame: (transfer full): an encoded #GstVideoCodecFrame 
- *
- * @frame must have a valid encoded data buffer, whose metadata fields
- * are then appropriately set according to frame data or no buffer at
- * all if the frame should be dropped.
- * It is subsequently pushed downstream or provided to @pre_push.
- * In any case, the frame is considered finished and released.
- *
- * Returns: a #GstFlowReturn resulting from sending data downstream
- *
- * Since: 0.10.37
- */
-GstFlowReturn
-gst_video_encoder_finish_frame (GstVideoEncoder * encoder,
-    GstVideoCodecFrame * frame)
-{
-  GstVideoEncoderPrivate *priv = encoder->priv;
-  GstFlowReturn ret = GST_FLOW_OK;
-  GstVideoEncoderClass *encoder_class;
-  GList *l;
-  gboolean send_headers = FALSE;
-  gboolean discont = (frame->presentation_frame_number == 0);
-
-  encoder_class = GST_VIDEO_ENCODER_GET_CLASS (encoder);
-
-  GST_LOG_OBJECT (encoder,
-      "finish frame fpn %d", frame->presentation_frame_number);
-
-  GST_LOG_OBJECT (encoder, "frame PTS %" GST_TIME_FORMAT
-      ", DTS %" GST_TIME_FORMAT, GST_TIME_ARGS (frame->pts),
-      GST_TIME_ARGS (frame->dts));
-
-  GST_VIDEO_ENCODER_STREAM_LOCK (encoder);
-
-  if (G_UNLIKELY (priv->output_state_changed))
-    gst_video_encoder_set_src_caps (encoder);
-
-  if (G_UNLIKELY (priv->output_state == NULL))
-    goto no_output_state;
-
-  /* Push all pending events that arrived before this frame */
-  for (l = priv->frames; l; l = l->next) {
-    GstVideoCodecFrame *tmp = l->data;
-
-    if (tmp->events) {
-      GList *k;
-
-      for (k = g_list_last (tmp->events); k; k = k->prev)
-        gst_video_encoder_push_event (encoder, k->data);
-      g_list_free (tmp->events);
-      tmp->events = NULL;
-    }
-
-    if (tmp == frame)
-      break;
-  }
-
-  /* no buffer data means this frame is skipped/dropped */
-  if (!frame->output_buffer) {
-    GST_DEBUG_OBJECT (encoder, "skipping frame %" GST_TIME_FORMAT,
-        GST_TIME_ARGS (frame->pts));
-    goto done;
-  }
-
-  if (GST_VIDEO_CODEC_FRAME_IS_SYNC_POINT (frame) && priv->force_key_unit) {
-    GstClockTime stream_time, running_time;
-    GstEvent *ev;
-    ForcedKeyUnitEvent *fevt = NULL;
-    GList *l;
-
-    running_time =
-        gst_segment_to_running_time (&encoder->output_segment, GST_FORMAT_TIME,
-        frame->pts);
-
-    GST_OBJECT_LOCK (encoder);
-    for (l = priv->force_key_unit; l; l = l->next) {
-      ForcedKeyUnitEvent *tmp = l->data;
-
-      /* Skip non-pending keyunits */
-      if (!tmp->pending)
-        continue;
-
-      /* Simple case, keyunit ASAP */
-      if (tmp->running_time == GST_CLOCK_TIME_NONE) {
-        fevt = tmp;
-        break;
-      }
-
-      /* Event for before this frame */
-      if (tmp->running_time <= running_time) {
-        fevt = tmp;
-        break;
-      }
-    }
-
-    if (fevt) {
-      priv->force_key_unit = g_list_remove (priv->force_key_unit, fevt);
-    }
-    GST_OBJECT_UNLOCK (encoder);
-
-    if (fevt) {
-      stream_time =
-          gst_segment_to_stream_time (&encoder->output_segment, GST_FORMAT_TIME,
-          frame->pts);
-
-      ev = gst_video_event_new_downstream_force_key_unit
-          (frame->pts, stream_time, running_time,
-          fevt->all_headers, fevt->count);
-
-      gst_video_encoder_push_event (encoder, ev);
-
-      if (fevt->all_headers)
-        send_headers = TRUE;
-
-      GST_DEBUG_OBJECT (encoder,
-          "Forced key unit: running-time %" GST_TIME_FORMAT
-          ", all_headers %d, count %u",
-          GST_TIME_ARGS (running_time), fevt->all_headers, fevt->count);
-      forced_key_unit_event_free (fevt);
-    }
-  }
-
-  if (GST_VIDEO_CODEC_FRAME_IS_SYNC_POINT (frame)) {
-    priv->distance_from_sync = 0;
-    GST_BUFFER_FLAG_UNSET (frame->output_buffer, GST_BUFFER_FLAG_DELTA_UNIT);
-    /* For keyframes, DTS = PTS */
-    if (!GST_CLOCK_TIME_IS_VALID (frame->dts)) {
-      frame->dts = frame->pts;
-    } else if (GST_CLOCK_TIME_IS_VALID (frame->pts) && frame->pts != frame->dts) {
-      GST_WARNING_OBJECT (encoder, "keyframe PTS != DTS");
-    }
-  } else {
-    GST_BUFFER_FLAG_SET (frame->output_buffer, GST_BUFFER_FLAG_DELTA_UNIT);
-  }
-
-  frame->distance_from_sync = priv->distance_from_sync;
-  priv->distance_from_sync++;
-
-  GST_BUFFER_TIMESTAMP (frame->output_buffer) = frame->pts;
-  GST_BUFFER_DURATION (frame->output_buffer) = frame->duration;
-
-  /* update rate estimate */
-  priv->bytes += GST_BUFFER_SIZE (frame->output_buffer);
-  if (GST_CLOCK_TIME_IS_VALID (frame->duration)) {
-    priv->time += frame->duration;
-  } else {
-    /* better none than nothing valid */
-    priv->time = GST_CLOCK_TIME_NONE;
-  }
-
-  if (G_UNLIKELY (send_headers || priv->new_headers)) {
-    GList *tmp, *copy = NULL;
-
-    GST_DEBUG_OBJECT (encoder, "Sending headers");
-
-    /* First make all buffers metadata-writable */
-    for (tmp = priv->headers; tmp; tmp = tmp->next) {
-      GstBuffer *tmpbuf = GST_BUFFER (tmp->data);
-
-      copy = g_list_append (copy, gst_buffer_make_metadata_writable (tmpbuf));
-    }
-    g_list_free (priv->headers);
-    priv->headers = copy;
-
-    for (tmp = priv->headers; tmp; tmp = tmp->next) {
-      GstBuffer *tmpbuf = GST_BUFFER (tmp->data);
-
-      gst_buffer_set_caps (tmpbuf, GST_PAD_CAPS (encoder->srcpad));
-      gst_buffer_ref (tmpbuf);
-      priv->bytes += GST_BUFFER_SIZE (tmpbuf);
-      if (G_UNLIKELY (discont)) {
-        GST_LOG_OBJECT (encoder, "marking discont");
-        GST_BUFFER_FLAG_SET (tmpbuf, GST_BUFFER_FLAG_DISCONT);
-        discont = FALSE;
-      }
-
-      gst_pad_push (encoder->srcpad, tmpbuf);
-    }
-    priv->new_headers = FALSE;
-  }
-
-  if (G_UNLIKELY (discont)) {
-    GST_LOG_OBJECT (encoder, "marking discont");
-    GST_BUFFER_FLAG_SET (frame->output_buffer, GST_BUFFER_FLAG_DISCONT);
-  }
-
-  gst_buffer_set_caps (GST_BUFFER (frame->output_buffer),
-      GST_PAD_CAPS (encoder->srcpad));
-
-  if (encoder_class->pre_push)
-    ret = encoder_class->pre_push (encoder, frame);
-
-  if (ret == GST_FLOW_OK)
-    ret = gst_pad_push (encoder->srcpad, frame->output_buffer);
-
-  frame->output_buffer = NULL;
-
-done:
-  /* handed out */
-
-  /* unref once from the list */
-  l = g_list_find (priv->frames, frame);
-  if (l) {
-    gst_video_codec_frame_unref (frame);
-    priv->frames = g_list_delete_link (priv->frames, l);
-  }
-  /* unref because this function takes ownership */
-  gst_video_codec_frame_unref (frame);
-
-  GST_VIDEO_ENCODER_STREAM_UNLOCK (encoder);
-
-  return ret;
-
-  /* ERRORS */
-no_output_state:
-  {
-    GST_VIDEO_ENCODER_STREAM_UNLOCK (encoder);
-    GST_ERROR_OBJECT (encoder, "Output state was not configured");
-    return GST_FLOW_ERROR;
-  }
-}
-
-/**
- * gst_video_encoder_get_output_state:
- * @encoder: a #GstVideoEncoder
- *
- * Get the current #GstVideoCodecState
- *
- * Returns: (transfer full): #GstVideoCodecState describing format of video data.
- *
- * Since: 0.10.37
- */
-GstVideoCodecState *
-gst_video_encoder_get_output_state (GstVideoEncoder * encoder)
-{
-  GstVideoCodecState *state;
-
-  GST_VIDEO_ENCODER_STREAM_LOCK (encoder);
-  state = gst_video_codec_state_ref (encoder->priv->output_state);
-  GST_VIDEO_ENCODER_STREAM_UNLOCK (encoder);
-
-  return state;
-}
-
-/**
- * gst_video_encoder_set_output_state:
- * @encoder: a #GstVideoEncoder
- * @caps: (transfer full): the #GstCaps to use for the output
- * @reference: (allow-none) (transfer none): An optional reference @GstVideoCodecState
- *
- * Creates a new #GstVideoCodecState with the specified caps as the output state
- * for the encoder.
- * Any previously set output state on @decoder will be replaced by the newly
- * created one.
- *
- * The specified @caps should not contain any resolution, pixel-aspect-ratio,
- * framerate, codec-data, .... Those should be specified instead in the returned
- * #GstVideoCodecState.
- *
- * If the subclass wishes to copy over existing fields (like pixel aspect ratio,
- * or framerate) from an existing #GstVideoCodecState, it can be provided as a
- * @reference.
- *
- * If the subclass wishes to override some fields from the output state (like
- * pixel-aspect-ratio or framerate) it can do so on the returned #GstVideoCodecState.
- *
- * The new output state will only take effect (set on pads and buffers) starting
- * from the next call to #gst_video_encoder_finish_frame().
- *
- * Returns: (transfer full): the newly configured output state.
- *
- * Since: 0.10.37
- */
-GstVideoCodecState *
-gst_video_encoder_set_output_state (GstVideoEncoder * encoder, GstCaps * caps,
-    GstVideoCodecState * reference)
-{
-  GstVideoEncoderPrivate *priv = encoder->priv;
-  GstVideoCodecState *state;
-
-  g_return_val_if_fail (caps != NULL, NULL);
-
-  state = _new_output_state (caps, reference);
-
-  GST_VIDEO_ENCODER_STREAM_LOCK (encoder);
-  if (priv->output_state)
-    gst_video_codec_state_unref (priv->output_state);
-  priv->output_state = gst_video_codec_state_ref (state);
-
-  priv->output_state_changed = TRUE;
-  GST_VIDEO_ENCODER_STREAM_UNLOCK (encoder);
-
-  return state;
-}
-
-/**
- * gst_video_encoder_set_latency:
- * @encoder: a #GstVideoEncoder
- * @min_latency: minimum latency
- * @max_latency: maximum latency
- *
- * Informs baseclass of encoding latency.
- *
- * Since: 0.10.37
- */
-void
-gst_video_encoder_set_latency (GstVideoEncoder * encoder,
-    GstClockTime min_latency, GstClockTime max_latency)
-{
-  g_return_if_fail (GST_CLOCK_TIME_IS_VALID (min_latency));
-  g_return_if_fail (max_latency >= min_latency);
-
-  GST_OBJECT_LOCK (encoder);
-  encoder->priv->min_latency = min_latency;
-  encoder->priv->max_latency = max_latency;
-  GST_OBJECT_UNLOCK (encoder);
-
-  gst_element_post_message (GST_ELEMENT_CAST (encoder),
-      gst_message_new_latency (GST_OBJECT_CAST (encoder)));
-}
-
-/**
- * gst_video_encoder_get_latency:
- * @encoder: a #GstVideoEncoder
- * @min_latency: (out) (allow-none): the configured minimum latency
- * @max_latency: (out) (allow-none): the configured maximum latency
- *
- * Returns the configured encoding latency.
- *
- * Since: 0.10.37
- */
-void
-gst_video_encoder_get_latency (GstVideoEncoder * encoder,
-    GstClockTime * min_latency, GstClockTime * max_latency)
-{
-  GST_OBJECT_LOCK (encoder);
-  if (min_latency)
-    *min_latency = encoder->priv->min_latency;
-  if (max_latency)
-    *max_latency = encoder->priv->max_latency;
-  GST_OBJECT_UNLOCK (encoder);
-}
-
-/**
- * gst_video_encoder_get_oldest_frame:
- * @encoder: a #GstVideoEncoder
- *
- * Get the oldest unfinished pending #GstVideoCodecFrame
- *
- * Returns: (transfer full): oldest unfinished pending #GstVideoCodecFrame
- *
- * Since: 0.10.37
- */
-GstVideoCodecFrame *
-gst_video_encoder_get_oldest_frame (GstVideoEncoder * encoder)
-{
-  GstVideoCodecFrame *frame = NULL;
-
-  GST_VIDEO_ENCODER_STREAM_LOCK (encoder);
-  if (encoder->priv->frames)
-    frame = gst_video_codec_frame_ref (encoder->priv->frames->data);
-  GST_VIDEO_ENCODER_STREAM_UNLOCK (encoder);
-
-  return (GstVideoCodecFrame *) frame;
-}
-
-/**
- * gst_video_encoder_get_frame:
- * @encoder: a #GstVideoEnccoder
- * @frame_number: system_frame_number of a frame
- *
- * Get a pending unfinished #GstVideoCodecFrame
- * 
- * Returns: (transfer full): pending unfinished #GstVideoCodecFrame identified by @frame_number.
- *
- * Since: 0.10.37
- */
-GstVideoCodecFrame *
-gst_video_encoder_get_frame (GstVideoEncoder * encoder, int frame_number)
-{
-  GList *g;
-  GstVideoCodecFrame *frame = NULL;
-
-  GST_DEBUG_OBJECT (encoder, "frame_number : %d", frame_number);
-
-  GST_VIDEO_ENCODER_STREAM_LOCK (encoder);
-  for (g = encoder->priv->frames; g; g = g->next) {
-    GstVideoCodecFrame *tmp = g->data;
-
-    if (tmp->system_frame_number == frame_number) {
-      frame = tmp;
-      gst_video_codec_frame_ref (frame);
-      break;
-    }
-  }
-  GST_VIDEO_ENCODER_STREAM_UNLOCK (encoder);
-
-  return frame;
-}
-
-/**
- * gst_video_encoder_get_frames:
- * @encoder: a #GstVideoEncoder
- *
- * Get all pending unfinished #GstVideoCodecFrame
- * 
- * Returns: (transfer full) (element-type GstVideoCodecFrame): pending unfinished #GstVideoCodecFrame.
- */
-GList *
-gst_video_encoder_get_frames (GstVideoEncoder * encoder)
-{
-  GList *frames;
-
-  GST_VIDEO_ENCODER_STREAM_LOCK (encoder);
-  frames = g_list_copy (encoder->priv->frames);
-  g_list_foreach (frames, (GFunc) gst_video_codec_frame_ref, NULL);
-  GST_VIDEO_ENCODER_STREAM_UNLOCK (encoder);
-
-  return frames;
-}
diff -Nru gstreamer-vaapi-0.5.10/ext/videoutils/gst-libs/gst/video/gstvideoencoder.h gstreamer-vaapi-0.6.0/ext/videoutils/gst-libs/gst/video/gstvideoencoder.h
--- gstreamer-vaapi-0.5.10/ext/videoutils/gst-libs/gst/video/gstvideoencoder.h	2015-02-03 08:39:48.000000000 +0000
+++ gstreamer-vaapi-0.6.0/ext/videoutils/gst-libs/gst/video/gstvideoencoder.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,308 +0,0 @@
-/* GStreamer
- * Copyright (C) 2008 David Schleef <ds@schleef.org>
- * Copyright (C) 2011 Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>.
- * Copyright (C) 2011 Nokia Corporation. All rights reserved.
- *   Contact: Stefan Kost <stefan.kost@nokia.com>
- * Copyright (C) 2012 Collabora Ltd.
- *	Author : Edward Hervey <edward@collabora.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef _GST_VIDEO_ENCODER_H_
-#define _GST_VIDEO_ENCODER_H_
-
-#include <gst/video/gstvideoutils.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_VIDEO_ENCODER \
-  (gst_video_encoder_get_type())
-#define GST_VIDEO_ENCODER(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_VIDEO_ENCODER,GstVideoEncoder))
-#define GST_VIDEO_ENCODER_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_VIDEO_ENCODER,GstVideoEncoderClass))
-#define GST_VIDEO_ENCODER_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS((obj),GST_TYPE_VIDEO_ENCODER,GstVideoEncoderClass))
-#define GST_IS_VIDEO_ENCODER(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_VIDEO_ENCODER))
-#define GST_IS_VIDEO_ENCODER_CLASS(obj) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_VIDEO_ENCODER))
-#define GST_VIDEO_ENCODER_CAST(enc) ((GstVideoEncoder*)enc)
-
-/**
- * GST_VIDEO_ENCODER_SINK_NAME:
- *
- * The name of the templates for the sink pad.
- *
- * Since: 0.10.37
- */
-#define GST_VIDEO_ENCODER_SINK_NAME    "sink"
-/**
- * GST_VIDEO_ENCODER_SRC_NAME:
- *
- * The name of the templates for the source pad.
- *
- * Since: 0.10.37
- */
-#define GST_VIDEO_ENCODER_SRC_NAME     "src"
-
-/**
- * GST_VIDEO_ENCODER_FLOW_DROPPED:
- *
- * Returned when the event/buffer should be dropped.
- *
- * Since: 0.10.37
- */
-#define GST_VIDEO_ENCODER_FLOW_DROPPED GST_FLOW_CUSTOM_SUCCESS_1
-
-/**
- * GST_VIDEO_ENCODER_SRC_PAD:
- * @obj: a #GstVideoEncoder
- *
- * Gives the pointer to the source #GstPad object of the element.
- *
- * Since: 0.10.37
- */
-#define GST_VIDEO_ENCODER_SRC_PAD(obj)         (((GstVideoEncoder *) (obj))->srcpad)
-
-/**
- * GST_VIDEO_ENCODER_SINK_PAD:
- * @obj: a #GstVideoEncoder
- *
- * Gives the pointer to the sink #GstPad object of the element.
- *
- * Since: 0.10.37
- */
-#define GST_VIDEO_ENCODER_SINK_PAD(obj)        (((GstVideoEncoder *) (obj))->sinkpad)
-
-/**
- * GST_VIDEO_ENCODER_FLOW_NEED_DATA:
- *
- * Returned while parsing to indicate more data is needed.
- *
- * Since: 0.10.37
- **/
-#define GST_VIDEO_ENCODER_FLOW_NEED_DATA GST_FLOW_CUSTOM_SUCCESS
-
-/**
- * GST_VIDEO_ENCODER_FLOW_DROPPED:
- *
- * Returned when the event/buffer should be dropped.
- *
- * Since: 0.10.37
- */
-#define GST_VIDEO_ENCODER_FLOW_DROPPED GST_FLOW_CUSTOM_SUCCESS_1
-
-/**
- * GST_VIDEO_ENCODER_INPUT_SEGMENT:
- * @obj: base parse instance
- *
- * Gives the segment of the element.
- *
- * Since: 0.10.37
- */
-#define GST_VIDEO_ENCODER_INPUT_SEGMENT(obj)     (GST_VIDEO_ENCODER_CAST (obj)->input_segment)
-
-/**
- * GST_VIDEO_ENCODER_OUTPUT_SEGMENT:
- * @obj: base parse instance
- *
- * Gives the segment of the element.
- *
- * Since: 0.10.37
- */
-#define GST_VIDEO_ENCODER_OUTPUT_SEGMENT(obj)     (GST_VIDEO_ENCODER_CAST (obj)->output_segment)
-
-/**
- * GST_VIDEO_ENCODER_STREAM_LOCK:
- * @encoder: video encoder instance
- *
- * Obtain a lock to protect the encoder function from concurrent access.
- *
- * Since: 0.10.37
- */
-#define GST_VIDEO_ENCODER_STREAM_LOCK(encoder) g_static_rec_mutex_lock (&GST_VIDEO_ENCODER (encoder)->stream_lock)
-
-/**
- * GST_VIDEO_ENCODER_STREAM_UNLOCK:
- * @encoder: video encoder instance
- *
- * Release the lock that protects the encoder function from concurrent access.
- *
- * Since: 0.10.37
- */
-#define GST_VIDEO_ENCODER_STREAM_UNLOCK(encoder) g_static_rec_mutex_unlock (&GST_VIDEO_ENCODER (encoder)->stream_lock)
-
-typedef struct _GstVideoEncoder GstVideoEncoder;
-typedef struct _GstVideoEncoderPrivate GstVideoEncoderPrivate;
-typedef struct _GstVideoEncoderClass GstVideoEncoderClass;
-
-/**
- * GstVideoEncoder:
- *
- * The opaque #GstVideoEncoder data structure.
- *
- * Since: 0.10.37
- */
-struct _GstVideoEncoder
-{
-  /*< private >*/
-  GstElement    element;
-
-  /*< protected >*/
-  GstPad         *sinkpad;
-  GstPad         *srcpad;
-
-  /* protects all data processing, i.e. is locked
-   * in the chain function, finish_frame and when
-   * processing serialized events */
-  GStaticRecMutex stream_lock;
-
-  /* MT-protected (with STREAM_LOCK) */
-  GstSegment      input_segment;
-  GstSegment      output_segment;
-
-  GstVideoEncoderPrivate *priv;
-
-  /*< private >*/
-  gpointer        _gst_reserved[GST_PADDING_LARGE];
-};
-
-/**
- * GstVideoEncoderClass:
- * @open:           Optional.
- *                  Called when the element changes to GST_STATE_READY.
- *                  Allows opening external resources. Since: 0.10.37.
- * @close:          Optional.
- *                  Called when the element changes to GST_STATE_NULL.
- *                  Allows closing external resources. Since: 0.10.37.
- * @start:          Optional.
- *                  Called when the element starts processing.
- *                  Allows opening external resources.
- * @stop:           Optional.
- *                  Called when the element stops processing.
- *                  Allows closing external resources.
- * @set_format:     Optional.
- *                  Notifies subclass of incoming data format.
- *                  GstVideoCodecState fields have already been
- *                  set according to provided caps.
- * @handle_frame:   Provides input frame to subclass.
- * @reset:          Optional.
- *                  Allows subclass (encoder) to perform post-seek semantics reset.
- * @finish:         Optional.
- *                  Called to request subclass to dispatch any pending remaining
- *                  data (e.g. at EOS).
- * @pre_push:   Optional.
- *                  Allows subclass to push frame downstream in whatever
- *                  shape or form it deems appropriate.  If not provided,
- *                  provided encoded frame data is simply pushed downstream.
- * @getcaps:        Optional.
- *                  Allows for a custom sink getcaps implementation (e.g.
- *                  for multichannel input specification).  If not implemented,
- *                  default returns gst_video_encoder_proxy_getcaps
- *                  applied to sink template caps.
- * @sink_event:     Optional.
- *                  Event handler on the sink pad. This function should return
- *                  TRUE if the event was handled and should be discarded
- *                  (i.e. not unref'ed).
- * @src_event:      Optional.
- *                  Event handler on the source pad. This function should return
- *                  TRUE if the event was handled and should be discarded
- *                  (i.e. not unref'ed).
- *
- * Subclasses can override any of the available virtual methods or not, as
- * needed. At minimum @handle_frame needs to be overridden, and @set_format
- * and @get_caps are likely needed as well.
- *
- * Since: 0.10.37
- */
-struct _GstVideoEncoderClass
-{
-  /*< private >*/
-  GstElementClass  element_class;
-
-  /*< public >*/
-  /* virtual methods for subclasses */
-  gboolean      (*open)         (GstVideoEncoder *encoder);
-
-  gboolean      (*close)        (GstVideoEncoder *encoder);
-
-  gboolean      (*start)        (GstVideoEncoder *encoder);
-
-  gboolean      (*stop)         (GstVideoEncoder *encoder);
-
-  gboolean      (*set_format)   (GstVideoEncoder *encoder,
-				 GstVideoCodecState *state);
-
-  GstFlowReturn (*handle_frame) (GstVideoEncoder *encoder,
-				 GstVideoCodecFrame *frame);
-
-  gboolean      (*reset)        (GstVideoEncoder *encoder,
-				 gboolean hard);
-
-  GstFlowReturn (*finish)       (GstVideoEncoder *encoder);
-
-  GstFlowReturn (*pre_push)     (GstVideoEncoder *encoder,
-				 GstVideoCodecFrame *frame);
-
-  GstCaps *     (*getcaps)      (GstVideoEncoder *enc);
-
-  gboolean      (*sink_event)   (GstVideoEncoder *encoder,
-				 GstEvent *event);
-
-  gboolean      (*src_event)    (GstVideoEncoder *encoder,
-				 GstEvent *event);
-
-  /*< private >*/
-  gpointer       _gst_reserved[GST_PADDING_LARGE];
-};
-
-GType                gst_video_encoder_get_type (void);
-
-GstVideoCodecState*  gst_video_encoder_get_output_state (GstVideoEncoder *encoder);
-
-GstVideoCodecState*  gst_video_encoder_set_output_state (GstVideoEncoder * encoder,
-							 GstCaps * caps,
-							 GstVideoCodecState * reference);
-
-GstVideoCodecFrame*  gst_video_encoder_get_frame        (GstVideoEncoder *encoder,
-						         int frame_number);
-GstVideoCodecFrame*  gst_video_encoder_get_oldest_frame (GstVideoEncoder *encoder);
-
-GList *              gst_video_encoder_get_frames       (GstVideoEncoder *encoder);
-
-GstFlowReturn        gst_video_encoder_finish_frame (GstVideoEncoder *encoder,
-						     GstVideoCodecFrame *frame);
-
-GstCaps *            gst_video_encoder_proxy_getcaps (GstVideoEncoder * enc,
-						      GstCaps         * caps);
-void                 gst_video_encoder_set_discont (GstVideoEncoder *encoder);
-gboolean             gst_video_encoder_get_discont (GstVideoEncoder *encoder);
-
-void                 gst_video_encoder_set_latency (GstVideoEncoder *encoder,
-						    GstClockTime min_latency,
-						    GstClockTime max_latency);
-void		     gst_video_encoder_get_latency (GstVideoEncoder *encoder,
-						    GstClockTime *min_latency,
-						    GstClockTime *max_latency);
-
-void                 gst_video_encoder_set_headers (GstVideoEncoder *encoder,
-						    GList *headers);
-G_END_DECLS
-
-#endif
-
diff -Nru gstreamer-vaapi-0.5.10/ext/videoutils/gst-libs/gst/video/gstvideoutils.c gstreamer-vaapi-0.6.0/ext/videoutils/gst-libs/gst/video/gstvideoutils.c
--- gstreamer-vaapi-0.5.10/ext/videoutils/gst-libs/gst/video/gstvideoutils.c	2015-02-03 08:39:48.000000000 +0000
+++ gstreamer-vaapi-0.6.0/ext/videoutils/gst-libs/gst/video/gstvideoutils.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,207 +0,0 @@
-/* GStreamer
- * Copyright (C) 2008 David Schleef <ds@schleef.org>
- * Copyright (C) 2012 Collabora Ltd.
- *	Author : Edward Hervey <edward@collabora.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "gstvideoutils.h"
-
-#include <string.h>
-
-GType
-gst_video_codec_frame_get_type (void)
-{
-  static volatile gsize type = 0;
-
-  if (g_once_init_enter (&type)) {
-    GType _type;
-
-    _type = g_boxed_type_register_static ("GstVideoCodecFrame",
-        (GBoxedCopyFunc) gst_video_codec_frame_ref,
-        (GBoxedFreeFunc) gst_video_codec_frame_unref);
-    g_once_init_leave (&type, _type);
-  }
-  return (GType) type;
-}
-
-
-
-static void
-_gst_video_codec_frame_free (GstVideoCodecFrame * frame)
-{
-  g_return_if_fail (frame != NULL);
-
-  GST_DEBUG ("free frame %p", frame);
-
-  if (frame->input_buffer) {
-    gst_buffer_unref (frame->input_buffer);
-  }
-
-  if (frame->output_buffer) {
-    gst_buffer_unref (frame->output_buffer);
-  }
-
-  g_list_foreach (frame->events, (GFunc) gst_event_unref, NULL);
-  g_list_free (frame->events);
-
-  if (frame->user_data_destroy_notify)
-    frame->user_data_destroy_notify (frame->user_data);
-
-  g_slice_free (GstVideoCodecFrame, frame);
-}
-
-/**
- * gst_video_codec_frame_set_user_data:
- * @frame: a #GstVideoCodecFrame
- * @user_data: private data
- * @notify: (closure user_data): a #GDestroyNotify
- *
- * Sets @user_data on the frame and the #GDestroyNotify that will be called when
- * the frame is freed. Allows to attach private data by the subclass to frames.
- *
- * If a @user_data was previously set, then the previous set @notify will be called
- * before the @user_data is replaced.
- */
-void
-gst_video_codec_frame_set_user_data (GstVideoCodecFrame * frame,
-    gpointer user_data, GDestroyNotify notify)
-{
-  if (frame->user_data_destroy_notify)
-    frame->user_data_destroy_notify (frame->user_data);
-
-  frame->user_data = user_data;
-  frame->user_data_destroy_notify = notify;
-}
-
-/**
- * gst_video_codec_frame_get_user_data:
- * @frame: a #GstVideoCodecFrame
- *
- * Gets private data set on the frame by the subclass via
- * gst_video_codec_frame_set_user_data() previously.
- *
- * Returns: (transfer none): The previously set user_data
- */
-gpointer
-gst_video_codec_frame_get_user_data (GstVideoCodecFrame * frame)
-{
-  return frame->user_data;
-}
-
-/**
- * gst_video_codec_frame_ref:
- * @frame: a #GstVideoCodecFrame
- *
- * Increases the refcount of the given frame by one.
- *
- * Returns: @buf
- */
-GstVideoCodecFrame *
-gst_video_codec_frame_ref (GstVideoCodecFrame * frame)
-{
-  g_return_val_if_fail (frame != NULL, NULL);
-
-  g_atomic_int_inc (&frame->ref_count);
-
-  return frame;
-}
-
-/**
- * gst_video_codec_frame_unref:
- * @frame: a #GstVideoCodecFrame
- *
- * Decreases the refcount of the frame. If the refcount reaches 0, the frame
- * will be freed.
- */
-void
-gst_video_codec_frame_unref (GstVideoCodecFrame * frame)
-{
-  g_return_if_fail (frame != NULL);
-  g_return_if_fail (frame->ref_count > 0);
-
-  if (g_atomic_int_dec_and_test (&frame->ref_count)) {
-    _gst_video_codec_frame_free (frame);
-  }
-}
-
-
-/**
- * gst_video_codec_state_ref:
- * @state: a #GstVideoCodecState
- *
- * Increases the refcount of the given state by one.
- *
- * Returns: @buf
- */
-GstVideoCodecState *
-gst_video_codec_state_ref (GstVideoCodecState * state)
-{
-  g_return_val_if_fail (state != NULL, NULL);
-
-  g_atomic_int_inc (&state->ref_count);
-
-  return state;
-}
-
-static void
-_gst_video_codec_state_free (GstVideoCodecState * state)
-{
-  if (state->caps)
-    gst_caps_unref (state->caps);
-  if (state->codec_data)
-    gst_buffer_unref (state->codec_data);
-  g_slice_free (GstVideoCodecState, state);
-}
-
-/**
- * gst_video_codec_state_unref:
- * @state: a #GstVideoCodecState
- *
- * Decreases the refcount of the state. If the refcount reaches 0, the state
- * will be freed.
- */
-void
-gst_video_codec_state_unref (GstVideoCodecState * state)
-{
-  g_return_if_fail (state != NULL);
-  g_return_if_fail (state->ref_count > 0);
-
-  if (g_atomic_int_dec_and_test (&state->ref_count)) {
-    _gst_video_codec_state_free (state);
-  }
-}
-
-GType
-gst_video_codec_state_get_type (void)
-{
-  static volatile gsize type = 0;
-
-  if (g_once_init_enter (&type)) {
-    GType _type;
-
-    _type = g_boxed_type_register_static ("GstVideoCodecState",
-        (GBoxedCopyFunc) gst_video_codec_state_ref,
-        (GBoxedFreeFunc) gst_video_codec_state_unref);
-    g_once_init_leave (&type, _type);
-  }
-  return (GType) type;
-}
diff -Nru gstreamer-vaapi-0.5.10/ext/videoutils/gst-libs/gst/video/gstvideoutils.h gstreamer-vaapi-0.6.0/ext/videoutils/gst-libs/gst/video/gstvideoutils.h
--- gstreamer-vaapi-0.5.10/ext/videoutils/gst-libs/gst/video/gstvideoutils.h	2015-02-03 08:39:48.000000000 +0000
+++ gstreamer-vaapi-0.6.0/ext/videoutils/gst-libs/gst/video/gstvideoutils.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,278 +0,0 @@
-/* GStreamer
- * Copyright (C) 2008 David Schleef <ds@schleef.org>
- * Copyright (C) 2012 Collabora Ltd.
- *	Author : Edward Hervey <edward@collabora.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef _GST_VIDEO_UTILS_H_
-#define _GST_VIDEO_UTILS_H_
-
-#include <gst/gst.h>
-#include <gst/video/video.h>
-
-G_BEGIN_DECLS
-#define GST_TYPE_VIDEO_CODEC_STATE \
-  (gst_video_codec_state_get_type())
-
-#define GST_TYPE_VIDEO_CODEC_FRAME \
-  (gst_video_codec_frame_get_type())
-
-typedef struct _GstVideoCodecState GstVideoCodecState;
-typedef struct _GstVideoCodecFrame GstVideoCodecFrame;
-
-/**
- * GstVideoCodecState:
- * @info: The #GstVideoInfo describing the stream
- * @caps: The #GstCaps
- * @codec_data: (optional) a #GstBuffer corresponding to the
- *     'codec_data' field of a stream.
- *
- * Structure representing the state of an incoming or outgoing video
- * stream for encoders and decoders.
- *
- * Decoders and encoders will receive such a state through their
- * respective @set_format vmethods.
- *
- * Decoders and encoders can set the downstream state, by using the
- * @gst_video_decoder_set_output_state() or
- * @gst_video_encoder_set_output_state() methods.
- */
-struct _GstVideoCodecState
-{
-  /*< private >*/
-  gint ref_count;
-
-  /*< public >*/
-  GstVideoInfo info;
-
-  GstCaps *caps;
-
-  GstBuffer *codec_data;
-
-  /*< private >*/
-  void         *padding[GST_PADDING_LARGE];
-};
-
-/**
- * GstVideoCodecFrameFlags:
- * @GST_VIDEO_CODEC_FRAME_FLAG_DECODE_ONLY: is the frame only meant to be decoded
- * @GST_VIDEO_CODEC_FRAME_FLAG_SYNC_POINT: is the frame a synchronization point (keyframe)
- * @GST_VIDEO_CODEC_FRAME_FLAG_FORCE_KEYFRAME: should the output frame be made a keyframe
- * @GST_VIDEO_CODEC_FRAME_FLAG_FORCE_KEYFRAME_HEADERS: should the encoder output stream headers
- * @GST_VIDEO_CODEC_FRAME_FLAG_TFF: top-field first
- * @GST_VIDEO_CODEC_FRAME_FLAG_RFF: the field is repeated
- * @GST_VIDEO_CODEC_FRAME_FLAG_ONEFIELD: only one field is present
- *
- * Flags for #GstVideoCodecFrame
- */
-typedef enum
-{
-  GST_VIDEO_CODEC_FRAME_FLAG_DECODE_ONLY            = (1<<0),
-  GST_VIDEO_CODEC_FRAME_FLAG_SYNC_POINT             = (1<<1),
-  GST_VIDEO_CODEC_FRAME_FLAG_FORCE_KEYFRAME         = (1<<2),
-  GST_VIDEO_CODEC_FRAME_FLAG_FORCE_KEYFRAME_HEADERS = (1<<3),
-  GST_VIDEO_CODEC_FRAME_FLAG_TFF                    = (1<<4),
-  GST_VIDEO_CODEC_FRAME_FLAG_RFF                    = (1<<5),
-  GST_VIDEO_CODEC_FRAME_FLAG_ONEFIELD               = (1<<6)
-} GstVideoCodecFrameFlags;
-
-/**
- * GST_VIDEO_CODEC_FRAME_FLAGS:
- * @frame: a #GstVideoCodecFrame
- *
- * The entire set of flags for the @frame
- */
-#define GST_VIDEO_CODEC_FRAME_FLAGS(frame) ((frame)->flags)
-
-/**
- * GST_VIDEO_CODEC_FRAME_FLAG_IS_SET:
- * @frame: a #GstVideoCodecFrame
- * @flag: a flag to check for
- *
- * Checks whether the given @flag is set
- */
-#define GST_VIDEO_CODEC_FRAME_FLAG_IS_SET(frame,flag)   !!(GST_VIDEO_CODEC_FRAME_FLAGS(frame) & (flag))
-
-/**
- * GST_VIDEO_CODEC_FRAME_FLAG_SET:
- * @frame: a #GstVideoCodecFrame
- * @flag: Flag to set, can be any number of bits in guint32.
- *
- * This macro sets the given bits
- */
-#define GST_VIDEO_CODEC_FRAME_FLAG_SET(frame,flag)     (GST_VIDEO_CODEC_FRAME_FLAGS(frame) |= (flag))
-
-/**
- * GST_VIDEO_CODEC_FRAME_FLAG_UNSET:
- * @frame: a #GstVideoCodecFrame
- * @flag: Flag to unset
- *
- * This macro usets the given bits.
- */
-#define GST_VIDEO_CODEC_FRAME_FLAG_UNSET(frame,flag)   (GST_VIDEO_CODEC_FRAME_FLAGS(frame) &= ~(flag))
-
-/**
- * GST_VIDEO_CODEC_FRAME_IS_DECODE_ONLY:
- * @frame: a #GstVideoCodecFrame
- *
- * Tests if the buffer should only be decoded but not sent downstream.
- */
-#define GST_VIDEO_CODEC_FRAME_IS_DECODE_ONLY(frame)     (GST_VIDEO_CODEC_FRAME_FLAG_IS_SET(frame, GST_VIDEO_CODEC_FRAME_FLAG_DECODE_ONLY))
-
-/**
- * GST_VIDEO_CODEC_FRAME_SET_DECODE_ONLY:
- * @frame: a #GstVideoCodecFrame
- *
- * Sets the buffer to not be sent downstream.
- *
- * Decoder implementation can use this if they have frames that
- * are not meant to be displayed.
- *
- * Encoder implementation can safely ignore this field.
- */
-#define GST_VIDEO_CODEC_FRAME_SET_DECODE_ONLY(frame)    (GST_VIDEO_CODEC_FRAME_FLAG_SET(frame, GST_VIDEO_CODEC_FRAME_FLAG_DECODE_ONLY))
-
-/**
- * GST_VIDEO_CODEC_FRAME_IS_SYNC_POINT:
- * @frame: a #GstVideoCodecFrame
- *
- * Tests if the frame is a synchronization point (like a keyframe).
- *
- * Decoder implementations can use this to detect keyframes.
- */
-#define GST_VIDEO_CODEC_FRAME_IS_SYNC_POINT(frame)      (GST_VIDEO_CODEC_FRAME_FLAG_IS_SET(frame, GST_VIDEO_CODEC_FRAME_FLAG_SYNC_POINT))
-
-/**
- * GST_VIDEO_CODEC_FRAME_SET_SYNC_POINT:
- * @frame: a #GstVideoCodecFrame
- *
- * Sets the frame to be a synchronization point (like a keyframe).
- *
- * Encoder implementations should set this accordingly.
- *
- * Decoder implementing parsing features should set this when they
- * detect such a synchronization point.
- */
-#define GST_VIDEO_CODEC_FRAME_SET_SYNC_POINT(frame)     (GST_VIDEO_CODEC_FRAME_FLAG_SET(frame, GST_VIDEO_CODEC_FRAME_FLAG_SYNC_POINT))
-#define GST_VIDEO_CODEC_FRAME_UNSET_SYNC_POINT(frame)   (GST_VIDEO_CODEC_FRAME_FLAG_UNSET(frame, GST_VIDEO_CODEC_FRAME_FLAG_SYNC_POINT))
-
-
-/**
- * GST_VIDEO_CODEC_FRAME_IS_FORCE_KEYFRAME:
- * @frame: a #GstVideoCodecFrame
- *
- * Tests if the frame must be encoded as a keyframe. Applies only to
- * frames provided to encoders. Decoders can safely ignore this field.
- */
-#define GST_VIDEO_CODEC_FRAME_IS_FORCE_KEYFRAME(frame)      (GST_VIDEO_CODEC_FRAME_FLAG_IS_SET(frame, GST_VIDEO_CODEC_FRAME_FLAG_FORCE_KEYFRAME))
-#define GST_VIDEO_CODEC_FRAME_SET_FORCE_KEYFRAME(frame)     (GST_VIDEO_CODEC_FRAME_FLAG_SET(frame, GST_VIDEO_CODEC_FRAME_FLAG_FORCE_KEYFRAME))
-#define GST_VIDEO_CODEC_FRAME_UNSET_FORCE_KEYFRAME(frame)   (GST_VIDEO_CODEC_FRAME_FLAG_UNSET(frame, GST_VIDEO_CODEC_FRAME_FLAG_FORCE_KEYFRAME))
-
-/**
- * GST_VIDEO_CODEC_FRAME_IS_FORCE_KEYFRAME_HEADERS:
- * @frame: a #GstVideoCodecFrame
- *
- * Tests if encoder should output stream headers before outputting the
- * resulting encoded buffer for the given frame.
- *
- * Applies only to frames provided to encoders. Decoders can safely
- * ignore this field.
- */
-#define GST_VIDEO_CODEC_FRAME_IS_FORCE_KEYFRAME_HEADERS(frame)      (GST_VIDEO_CODEC_FRAME_FLAG_IS_SET(frame, GST_VIDEO_CODEC_FRAME_FLAG_FORCE_KEYFRAME_HEADERS))
-#define GST_VIDEO_CODEC_FRAME_SET_FORCE_KEYFRAME_HEADERS(frame)     (GST_VIDEO_CODEC_FRAME_FLAG_SET(frame, GST_VIDEO_CODEC_FRAME_FLAG_FORCE_KEYFRAME_HEADERS))
-#define GST_VIDEO_CODEC_FRAME_UNSET_FORCE_KEYFRAME_HEADERS(frame)   (GST_VIDEO_CODEC_FRAME_FLAG_UNSET(frame, GST_VIDEO_CODEC_FRAME_FLAG_FORCE_KEYFRAME_HEADERS))
-
-/**
- * GstVideoCodecFrame:
- * @pts: Presentation timestamp
- * @dts: Decoding timestamp
- * @duration: Duration of the frame
- * @system_frame_number: Unique identifier for the frame. Use this if you need
- *       to get hold of the frame later (like when data is being decoded).
- *       Typical usage in decoders is to set this on the opaque value provided
- *       to the library and get back the frame using gst_video_decoder_get_frame()
- * @distance_from_sync: Distance in frames from the last synchronization point.
- * @input_buffer: the input #GstBuffer that created this frame.
- * @output_buffer: the output #GstBuffer. Implementations should set this either
- *           directly, or by using the @gst_video_decoder_alloc_output_frame() or
- *           @gst_video_decoder_alloc_output_buffer() methods.
- * @field_index:
- * @n_fields: number of fields in the frame (default 2). Decoders can change
- *       this if the frame contains a different number of fields. 
- * @deadline: Running time when the frame will be used.
- * @events: Events that will be pushed downstream before this frame is pushed.
- *
- * A #GstVideoCodecFrame represents a video frame both in raw and
- * encoded form.
- */
-struct _GstVideoCodecFrame
-{
-  /*< private >*/
-  gint ref_count;
-
-  guint32 flags;
-
-  /*< public >*/
-  guint32 system_frame_number;	/* ED */
-  guint32 decode_frame_number;	/* ED */
-  guint32 presentation_frame_number; /* ED */
-
-  GstClockTime dts;       /* ED */
-  GstClockTime pts;       /* ED */
-  GstClockTime duration;  /* ED */
-
-  int distance_from_sync;	/* ED */
-
-  GstBuffer *input_buffer;	/* ED */
-  GstBuffer *output_buffer;	/* ED */
-
-  GstClockTime deadline;	/* D */
-
-  /*< private >*/
-
-  /* Events that should be pushed downstream *before*
-   * the next output_buffer */
-  GList *events;		/* ED */
-
-  gpointer       user_data;
-  GDestroyNotify user_data_destroy_notify;
-
-  void         *padding[GST_PADDING_LARGE];
-};
-
-/* GstVideoCodecState */
-GType           gst_video_codec_state_get_type (void);
-
-GstVideoCodecState *gst_video_codec_state_ref (GstVideoCodecState * state);
-
-void                gst_video_codec_state_unref (GstVideoCodecState * state);
-
-
-/* GstVideoCodecFrame */
-GType                gst_video_codec_frame_get_type (void);
-
-GstVideoCodecFrame  *gst_video_codec_frame_ref (GstVideoCodecFrame * frame);
-void                 gst_video_codec_frame_unref (GstVideoCodecFrame * frame);
-void                 gst_video_codec_frame_set_user_data (GstVideoCodecFrame *frame,
-						          gpointer user_data,
-				                          GDestroyNotify notify);
-gpointer             gst_video_codec_frame_get_user_data (GstVideoCodecFrame *frame);
-
-G_END_DECLS
-
-#endif
diff -Nru gstreamer-vaapi-0.5.10/ext/videoutils/gst-libs/gst/video/video.c gstreamer-vaapi-0.6.0/ext/videoutils/gst-libs/gst/video/video.c
--- gstreamer-vaapi-0.5.10/ext/videoutils/gst-libs/gst/video/video.c	2015-02-03 08:39:48.000000000 +0000
+++ gstreamer-vaapi-0.6.0/ext/videoutils/gst-libs/gst/video/video.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,3381 +0,0 @@
-/* GStreamer
- * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu>
- * Library       <2002> Ronald Bultje <rbultje@ronald.bitfreak.net>
- * Copyright (C) 2007 David A. Schleef <ds@schleef.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
-
-#include <string.h>
-#include "video.h"
-
-/**
- * SECTION:gstvideo
- * @short_description: Support library for video operations
- *
- * <refsect2>
- * <para>
- * This library contains some helper functions and includes the
- * videosink and videofilter base classes.
- * </para>
- * </refsect2>
- */
-
-static GstVideoFormat gst_video_format_from_rgb32_masks (int red_mask,
-    int green_mask, int blue_mask);
-static GstVideoFormat gst_video_format_from_rgba32_masks (int red_mask,
-    int green_mask, int blue_mask, int alpha_mask);
-static GstVideoFormat gst_video_format_from_rgb24_masks (int red_mask,
-    int green_mask, int blue_mask);
-static GstVideoFormat gst_video_format_from_rgb16_masks (int red_mask,
-    int green_mask, int blue_mask);
-
-
-static int fill_planes (GstVideoInfo * info);
-
-typedef struct
-{
-  guint32 fourcc;
-  GstVideoFormatInfo info;
-} VideoFormat;
-
-/* depths: bits, n_components, shift, depth */
-#define DPTH0            0, 0, { 0, 0, 0, 0 }, { 0, 0, 0, 0 }
-#define DPTH8            8, 1, { 0, 0, 0, 0 }, { 8, 0, 0, 0 }
-#define DPTH888          8, 3, { 0, 0, 0, 0 }, { 8, 8, 8, 0 }
-#define DPTH8888         8, 4, { 0, 0, 0, 0 }, { 8, 8, 8, 8 }
-#define DPTH10_10_10     10, 3, { 0, 0, 0, 0 }, { 10, 10, 10, 0 }
-#define DPTH16           16, 1, { 0, 0, 0, 0 }, { 16, 0, 0, 0 }
-#define DPTH16_16_16     16, 3, { 0, 0, 0, 0 }, { 16, 16, 16, 0 }
-#define DPTH16_16_16_16  16, 4, { 0, 0, 0, 0 }, { 16, 16, 16, 16 }
-#define DPTH555          16, 3, { 10, 5, 0, 0 }, { 5, 5, 5, 0 }
-#define DPTH565          16, 3, { 11, 5, 0, 0 }, { 5, 6, 5, 0 }
-
-/* pixel strides */
-#define PSTR0             { 0, 0, 0, 0 }
-#define PSTR1             { 1, 0, 0, 0 }
-#define PSTR111           { 1, 1, 1, 0 }
-#define PSTR1111          { 1, 1, 1, 1 }
-#define PSTR122           { 1, 2, 2, 0 }
-#define PSTR2             { 2, 0, 0, 0 }
-#define PSTR222           { 2, 2, 2, 0 }
-#define PSTR244           { 2, 4, 4, 0 }
-#define PSTR444           { 4, 4, 4, 0 }
-#define PSTR4444          { 4, 4, 4, 4 }
-#define PSTR333           { 3, 3, 3, 0 }
-#define PSTR488           { 4, 8, 8, 0 }
-#define PSTR8888          { 8, 8, 8, 8 }
-
-/* planes */
-#define PLANE_NA          0, { 0, 0, 0, 0 }
-#define PLANE0            1, { 0, 0, 0, 0 }
-#define PLANE011          2, { 0, 1, 1, 0 }
-#define PLANE012          3, { 0, 1, 2, 0 }
-#define PLANE0123         4, { 0, 1, 2, 3 }
-#define PLANE021          3, { 0, 2, 1, 0 }
-
-/* offsets */
-#define OFFS0             { 0, 0, 0, 0 }
-#define OFFS013           { 0, 1, 3, 0 }
-#define OFFS102           { 1, 0, 2, 0 }
-#define OFFS1230          { 1, 2, 3, 0 }
-#define OFFS012           { 0, 1, 2, 0 }
-#define OFFS210           { 2, 1, 0, 0 }
-#define OFFS123           { 1, 2, 3, 0 }
-#define OFFS321           { 3, 2, 1, 0 }
-#define OFFS0123          { 0, 1, 2, 3 }
-#define OFFS2103          { 2, 1, 0, 3 }
-#define OFFS3210          { 3, 2, 1, 0 }
-#define OFFS031           { 0, 3, 1, 0 }
-#define OFFS026           { 0, 2, 6, 0 }
-#define OFFS001           { 0, 0, 1, 0 }
-#define OFFS010           { 0, 1, 0, 0 }
-#define OFFS104           { 1, 0, 4, 0 }
-#define OFFS2460          { 2, 4, 6, 0 }
-
-/* subsampling */
-#define SUB410            { 0, 2, 2, 0 }, { 0, 2, 2, 0 }
-#define SUB411            { 0, 2, 2, 0 }, { 0, 0, 0, 0 }
-#define SUB420            { 0, 1, 1, 0 }, { 0, 1, 1, 0 }
-#define SUB422            { 0, 1, 1, 0 }, { 0, 0, 0, 0 }
-#define SUB4              { 0, 0, 0, 0 }, { 0, 0, 0, 0 }
-#define SUB444            { 0, 0, 0, 0 }, { 0, 0, 0, 0 }
-#define SUB4444           { 0, 0, 0, 0 }, { 0, 0, 0, 0 }
-#define SUB4204           { 0, 1, 1, 0 }, { 0, 1, 1, 0 }
-
-#define MAKE_YUV_FORMAT(name, desc, fourcc, depth, pstride, plane, offs, sub ) \
- { fourcc, {GST_VIDEO_FORMAT_ ##name, G_STRINGIFY(name), desc, GST_VIDEO_FORMAT_FLAG_YUV, depth, pstride, plane, offs, sub } }
-#define MAKE_YUVA_FORMAT(name, desc, fourcc, depth, pstride, plane, offs, sub) \
- { fourcc, {GST_VIDEO_FORMAT_ ##name, G_STRINGIFY(name), desc, GST_VIDEO_FORMAT_FLAG_YUV | GST_VIDEO_FORMAT_FLAG_ALPHA, depth, pstride, plane, offs, sub } }
-
-#define MAKE_YUVA_LE_FORMAT(name, desc, fourcc, depth, pstride, plane, offs, sub) \
- { fourcc, {GST_VIDEO_FORMAT_ ##name, G_STRINGIFY(name), desc, GST_VIDEO_FORMAT_FLAG_YUV | GST_VIDEO_FORMAT_FLAG_ALPHA | GST_VIDEO_FORMAT_FLAG_LE, depth, pstride, plane, offs, sub } }
-
-#define MAKE_RGB_FORMAT(name, desc, depth, pstride, plane, offs, sub) \
- { 0x00000000, {GST_VIDEO_FORMAT_ ##name, G_STRINGIFY(name), desc, GST_VIDEO_FORMAT_FLAG_RGB, depth, pstride, plane, offs, sub } }
-#define MAKE_RGB_LE_FORMAT(name, desc, depth, pstride, plane, offs, sub) \
- { 0x00000000, {GST_VIDEO_FORMAT_ ##name, G_STRINGIFY(name), desc, GST_VIDEO_FORMAT_FLAG_RGB | GST_VIDEO_FORMAT_FLAG_LE, depth, pstride, plane, offs, sub } }
-#define MAKE_RGBA_FORMAT(name, desc, depth, pstride, plane, offs, sub) \
- { 0x00000000, {GST_VIDEO_FORMAT_ ##name, G_STRINGIFY(name), desc, GST_VIDEO_FORMAT_FLAG_RGB | GST_VIDEO_FORMAT_FLAG_ALPHA, depth, pstride, plane, offs, sub } }
-#define MAKE_RGBA_LE_FORMAT(name, desc, depth, pstride, plane, offs, sub) \
- { 0x00000000, {GST_VIDEO_FORMAT_ ##name, G_STRINGIFY(name), desc, GST_VIDEO_FORMAT_FLAG_RGB | GST_VIDEO_FORMAT_FLAG_ALPHA | GST_VIDEO_FORMAT_FLAG_LE, depth, pstride, plane, offs, sub } }
-
-#define MAKE_GRAY_FORMAT(name, desc, depth, pstride, plane, offs, sub) \
- { 0x00000000, {GST_VIDEO_FORMAT_ ##name, G_STRINGIFY(name), desc, GST_VIDEO_FORMAT_FLAG_GRAY, depth, pstride, plane, offs, sub } }
-#define MAKE_GRAY_LE_FORMAT(name, desc, depth, pstride, plane, offs, sub) \
- { 0x00000000, {GST_VIDEO_FORMAT_ ##name, G_STRINGIFY(name), desc, GST_VIDEO_FORMAT_FLAG_GRAY | GST_VIDEO_FORMAT_FLAG_LE, depth, pstride, plane, offs, sub } }
-
-static VideoFormat formats[] = {
-  {0x00000000, {GST_VIDEO_FORMAT_UNKNOWN, "UNKNOWN", "unknown video", 0, DPTH0,
-              PSTR0, PLANE_NA,
-          OFFS0}},
-  MAKE_YUV_FORMAT (I420, "raw video", GST_MAKE_FOURCC ('I', '4', '2', '0'),
-      DPTH888, PSTR111,
-      PLANE012, OFFS0, SUB420),
-  MAKE_YUV_FORMAT (YV12, "raw video", GST_MAKE_FOURCC ('Y', 'V', '1', '2'),
-      DPTH888, PSTR111,
-      PLANE021, OFFS0, SUB420),
-  MAKE_YUV_FORMAT (YUY2, "raw video", GST_MAKE_FOURCC ('Y', 'U', 'Y', '2'),
-      DPTH888, PSTR244,
-      PLANE0, OFFS013, SUB422),
-  MAKE_YUV_FORMAT (UYVY, "raw video", GST_MAKE_FOURCC ('U', 'Y', 'V', 'Y'),
-      DPTH888, PSTR244,
-      PLANE0, OFFS102, SUB422),
-  MAKE_YUVA_FORMAT (AYUV, "raw video", GST_MAKE_FOURCC ('A', 'Y', 'U', 'V'),
-      DPTH8888,
-      PSTR4444, PLANE0, OFFS1230, SUB4444),
-  MAKE_RGB_FORMAT (RGBx, "raw video", DPTH888, PSTR444, PLANE0, OFFS012,
-      SUB444),
-  MAKE_RGB_FORMAT (BGRx, "raw video", DPTH888, PSTR444, PLANE0, OFFS210,
-      SUB444),
-  MAKE_RGB_FORMAT (xRGB, "raw video", DPTH888, PSTR444, PLANE0, OFFS123,
-      SUB444),
-  MAKE_RGB_FORMAT (xBGR, "raw video", DPTH888, PSTR444, PLANE0, OFFS321,
-      SUB444),
-  MAKE_RGBA_FORMAT (RGBA, "raw video", DPTH8888, PSTR4444, PLANE0, OFFS0123,
-      SUB4444),
-  MAKE_RGBA_FORMAT (BGRA, "raw video", DPTH8888, PSTR4444, PLANE0, OFFS2103,
-      SUB4444),
-  MAKE_RGBA_FORMAT (ARGB, "raw video", DPTH8888, PSTR4444, PLANE0, OFFS1230,
-      SUB4444),
-  MAKE_RGBA_FORMAT (ABGR, "raw video", DPTH8888, PSTR4444, PLANE0, OFFS3210,
-      SUB4444),
-  MAKE_RGB_FORMAT (RGB, "raw video", DPTH888, PSTR333, PLANE0, OFFS012, SUB444),
-  MAKE_RGB_FORMAT (BGR, "raw video", DPTH888, PSTR333, PLANE0, OFFS210, SUB444),
-
-  MAKE_YUV_FORMAT (Y41B, "raw video", GST_MAKE_FOURCC ('Y', '4', '1', 'B'),
-      DPTH888, PSTR111,
-      PLANE012, OFFS0, SUB411),
-  MAKE_YUV_FORMAT (Y42B, "raw video", GST_MAKE_FOURCC ('Y', '4', '2', 'B'),
-      DPTH888, PSTR111,
-      PLANE012, OFFS0, SUB422),
-  MAKE_YUV_FORMAT (YVYU, "raw video", GST_MAKE_FOURCC ('Y', 'V', 'Y', 'U'),
-      DPTH888, PSTR244,
-      PLANE0, OFFS031, SUB422),
-  MAKE_YUV_FORMAT (Y444, "raw video", GST_MAKE_FOURCC ('Y', '4', '4', '4'),
-      DPTH888, PSTR111,
-      PLANE012, OFFS0, SUB444),
-  MAKE_YUV_FORMAT (v210, "raw video", GST_MAKE_FOURCC ('v', '2', '1', '0'),
-      DPTH10_10_10,
-      PSTR0, PLANE0, OFFS0, SUB422),
-  MAKE_YUV_FORMAT (v216, "raw video", GST_MAKE_FOURCC ('v', '2', '1', '6'),
-      DPTH16_16_16,
-      PSTR488, PLANE0, OFFS026, SUB422),
-  MAKE_YUV_FORMAT (NV12, "raw video", GST_MAKE_FOURCC ('N', 'V', '1', '2'),
-      DPTH888, PSTR122,
-      PLANE011, OFFS001, SUB420),
-  MAKE_YUV_FORMAT (NV21, "raw video", GST_MAKE_FOURCC ('N', 'V', '2', '1'),
-      DPTH888, PSTR122,
-      PLANE011, OFFS010, SUB420),
-
-  MAKE_GRAY_FORMAT (GRAY8, "raw video", DPTH8, PSTR1, PLANE0, OFFS0, SUB4),
-  MAKE_GRAY_FORMAT (GRAY16_BE, "raw video", DPTH16, PSTR2, PLANE0, OFFS0, SUB4),
-  MAKE_GRAY_LE_FORMAT (GRAY16_LE, "raw video", DPTH16, PSTR2, PLANE0, OFFS0,
-      SUB4),
-
-  MAKE_YUV_FORMAT (v308, "raw video", GST_MAKE_FOURCC ('v', '3', '0', '8'),
-      DPTH888, PSTR333,
-      PLANE0, OFFS012, SUB444),
-  MAKE_YUV_FORMAT (Y800, "raw video", GST_MAKE_FOURCC ('Y', '8', '0', '0'),
-      DPTH8, PSTR1,
-      PLANE0, OFFS0, SUB4),
-  MAKE_YUV_FORMAT (Y16, "raw video", GST_MAKE_FOURCC ('Y', '1', '6', ' '),
-      DPTH16, PSTR2,
-      PLANE0, OFFS0, SUB4),
-
-#if G_BYTE_ORDER == G_LITTLE_ENDIAN
-  MAKE_RGB_LE_FORMAT (RGB16, "raw video", DPTH565, PSTR222, PLANE0, OFFS0,
-      SUB444),
-  MAKE_RGB_LE_FORMAT (BGR16, "raw video", DPTH565, PSTR222, PLANE0, OFFS0,
-      SUB444),
-  MAKE_RGB_LE_FORMAT (RGB15, "raw video", DPTH555, PSTR222, PLANE0, OFFS0,
-      SUB444),
-  MAKE_RGB_LE_FORMAT (BGR15, "raw video", DPTH555, PSTR222, PLANE0, OFFS0,
-      SUB444),
-#else
-  MAKE_RGB_FORMAT (RGB16, "raw video", DPTH565, PSTR222, PLANE0, OFFS0, SUB444),
-  MAKE_RGB_FORMAT (BGR16, "raw video", DPTH565, PSTR222, PLANE0, OFFS0, SUB444),
-  MAKE_RGB_FORMAT (RGB15, "raw video", DPTH555, PSTR222, PLANE0, OFFS0, SUB444),
-  MAKE_RGB_FORMAT (BGR15, "raw video", DPTH555, PSTR222, PLANE0, OFFS0, SUB444),
-#endif
-
-  MAKE_YUV_FORMAT (UYVP, "raw video", GST_MAKE_FOURCC ('U', 'Y', 'V', 'P'),
-      DPTH10_10_10,
-      PSTR0, PLANE0, OFFS0, SUB422),
-  MAKE_YUVA_FORMAT (A420, "raw video", GST_MAKE_FOURCC ('A', '4', '2', '0'),
-      DPTH8888,
-      PSTR1111, PLANE0123, OFFS0, SUB4204),
-  MAKE_RGBA_FORMAT (RGB8_PALETTED, "raw video", DPTH8888, PSTR1111, PLANE0,
-      OFFS0, SUB4444),
-  MAKE_YUV_FORMAT (YUV9, "raw video", GST_MAKE_FOURCC ('Y', 'U', 'V', '9'),
-      DPTH888, PSTR111,
-      PLANE012, OFFS0, SUB410),
-  MAKE_YUV_FORMAT (YVU9, "raw video", GST_MAKE_FOURCC ('Y', 'V', 'U', '9'),
-      DPTH888, PSTR111,
-      PLANE021, OFFS0, SUB410),
-  MAKE_YUV_FORMAT (IYU1, "raw video", GST_MAKE_FOURCC ('I', 'Y', 'U', '1'),
-      DPTH888, PSTR0,
-      PLANE0, OFFS104, SUB411),
-#if G_BYTE_ORDER == G_LITTLE_ENDIAN
-  MAKE_RGBA_LE_FORMAT (ARGB64, "raw video", DPTH16_16_16_16, PSTR8888,
-      PLANE0, OFFS2460, SUB444),
-  MAKE_YUVA_LE_FORMAT (AYUV64, "raw video", 0x00000000, DPTH16_16_16_16,
-      PSTR8888, PLANE0, OFFS2460, SUB444),
-#else
-  MAKE_RGBA_FORMAT (ARGB64, "raw video", DPTH16_16_16_16, PSTR8888, PLANE0,
-      OFFS2460,
-      SUB444),
-  MAKE_YUVA_FORMAT (AYUV64, "raw video", 0x00000000, DPTH16_16_16_16, PSTR8888,
-      PLANE0, OFFS2460, SUB444),
-#endif
-  MAKE_RGB_FORMAT (r210, "raw video", DPTH10_10_10, PSTR444, PLANE0, OFFS0,
-      SUB444),
-  {0x00000000, {GST_VIDEO_FORMAT_ENCODED, "ENCODED", "encoded video",
-          GST_VIDEO_FORMAT_FLAG_COMPLEX, DPTH0, PSTR0, PLANE_NA, OFFS0}},
-  MAKE_YUV_FORMAT (I420_10BE, "raw video", GST_MAKE_FOURCC ('D', '4', '2', '0'),
-      DPTH10_10_10, PSTR222,
-      PLANE012, OFFS0, SUB420),
-  MAKE_YUV_FORMAT (I420_10LE, "raw video", GST_MAKE_FOURCC ('d', '4', '2', '0'),
-      DPTH10_10_10, PSTR222,
-      PLANE012, OFFS0, SUB420),
-  MAKE_YUV_FORMAT (I422_10BE, "raw video", GST_MAKE_FOURCC ('D', '4', '2', '2'),
-      DPTH10_10_10, PSTR222,
-      PLANE012, OFFS0, SUB422),
-  MAKE_YUV_FORMAT (I422_10LE, "raw video", GST_MAKE_FOURCC ('d', '4', '2', '2'),
-      DPTH10_10_10, PSTR222,
-      PLANE012, OFFS0, SUB422),
-  MAKE_YUV_FORMAT (Y444_10BE, "raw video", GST_MAKE_FOURCC ('D', '4', '4', '4'),
-      DPTH10_10_10, PSTR222,
-      PLANE012, OFFS0, SUB444),
-  MAKE_YUV_FORMAT (Y444_10LE, "raw video", GST_MAKE_FOURCC ('d', '4', '4', '4'),
-      DPTH10_10_10, PSTR222,
-      PLANE012, OFFS0, SUB444)
-};
-
-/**
- * gst_video_frame_rate:
- * @pad: pointer to a #GstPad
- *
- * A convenience function to retrieve a GValue holding the framerate
- * from the caps on a pad.
- *
- * The pad needs to have negotiated caps containing a framerate property.
- *
- * Returns: NULL if the pad has no configured caps or the configured caps
- * do not contain a framerate.
- *
- */
-const GValue *
-gst_video_frame_rate (GstPad * pad)
-{
-  const GValue *fps;
-  gchar *fps_string;
-
-  const GstCaps *caps = NULL;
-  GstStructure *structure;
-
-  /* get pad caps */
-  caps = GST_PAD_CAPS (pad);
-  if (caps == NULL) {
-    g_warning ("gstvideo: failed to get caps of pad %s:%s",
-        GST_DEBUG_PAD_NAME (pad));
-    return NULL;
-  }
-
-  structure = gst_caps_get_structure (caps, 0);
-  if ((fps = gst_structure_get_value (structure, "framerate")) == NULL) {
-    g_warning ("gstvideo: failed to get framerate property of pad %s:%s",
-        GST_DEBUG_PAD_NAME (pad));
-    return NULL;
-  }
-  if (!GST_VALUE_HOLDS_FRACTION (fps)) {
-    g_warning
-        ("gstvideo: framerate property of pad %s:%s is not of type Fraction",
-        GST_DEBUG_PAD_NAME (pad));
-    return NULL;
-  }
-
-  fps_string = gst_value_serialize (fps);
-  GST_DEBUG ("Framerate request on pad %s:%s: %s",
-      GST_DEBUG_PAD_NAME (pad), fps_string);
-  g_free (fps_string);
-
-  return fps;
-}
-
-/**
- * gst_video_get_size:
- * @pad: pointer to a #GstPad
- * @width: pointer to integer to hold pixel width of the video frames (output)
- * @height: pointer to integer to hold pixel height of the video frames (output)
- *
- * Inspect the caps of the provided pad and retrieve the width and height of
- * the video frames it is configured for.
- *
- * The pad needs to have negotiated caps containing width and height properties.
- *
- * Returns: TRUE if the width and height could be retrieved.
- *
- */
-gboolean
-gst_video_get_size (GstPad * pad, gint * width, gint * height)
-{
-  const GstCaps *caps = NULL;
-  GstStructure *structure;
-  gboolean ret;
-
-  g_return_val_if_fail (pad != NULL, FALSE);
-  g_return_val_if_fail (width != NULL, FALSE);
-  g_return_val_if_fail (height != NULL, FALSE);
-
-  caps = GST_PAD_CAPS (pad);
-
-  if (caps == NULL) {
-    g_warning ("gstvideo: failed to get caps of pad %s:%s",
-        GST_DEBUG_PAD_NAME (pad));
-    return FALSE;
-  }
-
-  structure = gst_caps_get_structure (caps, 0);
-  ret = gst_structure_get_int (structure, "width", width);
-  ret &= gst_structure_get_int (structure, "height", height);
-
-  if (!ret) {
-    g_warning ("gstvideo: failed to get size properties on pad %s:%s",
-        GST_DEBUG_PAD_NAME (pad));
-    return FALSE;
-  }
-
-  GST_DEBUG ("size request on pad %s:%s: %dx%d",
-      GST_DEBUG_PAD_NAME (pad), width ? *width : -1, height ? *height : -1);
-
-  return TRUE;
-}
-
-/**
- * gst_video_calculate_display_ratio:
- * @dar_n: Numerator of the calculated display_ratio
- * @dar_d: Denominator of the calculated display_ratio
- * @video_width: Width of the video frame in pixels
- * @video_height: Height of the video frame in pixels
- * @video_par_n: Numerator of the pixel aspect ratio of the input video.
- * @video_par_d: Denominator of the pixel aspect ratio of the input video.
- * @display_par_n: Numerator of the pixel aspect ratio of the display device
- * @display_par_d: Denominator of the pixel aspect ratio of the display device
- *
- * Given the Pixel Aspect Ratio and size of an input video frame, and the
- * pixel aspect ratio of the intended display device, calculates the actual
- * display ratio the video will be rendered with.
- *
- * Returns: A boolean indicating success and a calculated Display Ratio in the
- * dar_n and dar_d parameters.
- * The return value is FALSE in the case of integer overflow or other error.
- *
- * Since: 0.10.7
- */
-gboolean
-gst_video_calculate_display_ratio (guint * dar_n, guint * dar_d,
-    guint video_width, guint video_height,
-    guint video_par_n, guint video_par_d,
-    guint display_par_n, guint display_par_d)
-{
-  gint num, den;
-  gint tmp_n, tmp_d;
-
-  g_return_val_if_fail (dar_n != NULL, FALSE);
-  g_return_val_if_fail (dar_d != NULL, FALSE);
-
-  /* Calculate (video_width * video_par_n * display_par_d) /
-   * (video_height * video_par_d * display_par_n) */
-  if (!gst_util_fraction_multiply (video_width, video_height, video_par_n,
-          video_par_d, &tmp_n, &tmp_d))
-    goto error_overflow;
-
-  if (!gst_util_fraction_multiply (tmp_n, tmp_d, display_par_d, display_par_n,
-          &num, &den))
-    goto error_overflow;
-
-  g_return_val_if_fail (num > 0, FALSE);
-  g_return_val_if_fail (den > 0, FALSE);
-
-  *dar_n = num;
-  *dar_d = den;
-
-  return TRUE;
-error_overflow:
-  return FALSE;
-}
-
-/**
- * gst_video_format_parse_caps_interlaced:
- * @caps: the fixed #GstCaps to parse
- * @interlaced: whether @caps represents interlaced video or not, may be NULL (output)
- *
- * Extracts whether the caps represents interlaced content or not and places it
- * in @interlaced.
- *
- * Since: 0.10.23
- *
- * Returns: TRUE if @caps was parsed correctly.
- */
-gboolean
-gst_video_format_parse_caps_interlaced (GstCaps * caps, gboolean * interlaced)
-{
-  GstStructure *structure;
-
-  if (!gst_caps_is_fixed (caps))
-    return FALSE;
-
-  structure = gst_caps_get_structure (caps, 0);
-
-  if (interlaced) {
-    if (!gst_structure_get_boolean (structure, "interlaced", interlaced))
-      *interlaced = FALSE;
-  }
-
-  return TRUE;
-}
-
-/**
- * gst_video_parse_caps_color_matrix:
- * @caps: the fixed #GstCaps to parse
- *
- * Extracts the color matrix used by the caps.  Possible values are
- * "sdtv" for the standard definition color matrix (as specified in
- * Rec. ITU-R BT.470-6) or "hdtv" for the high definition color
- * matrix (as specified in Rec. ITU-R BT.709)
- *
- * Since: 0.10.29
- *
- * Returns: a color matrix string, or NULL if no color matrix could be
- *     determined.
- */
-const char *
-gst_video_parse_caps_color_matrix (GstCaps * caps)
-{
-  GstStructure *structure;
-  const char *s;
-
-  if (!gst_caps_is_fixed (caps))
-    return NULL;
-
-  structure = gst_caps_get_structure (caps, 0);
-
-  s = gst_structure_get_string (structure, "color-matrix");
-  if (s)
-    return s;
-
-  if (gst_structure_has_name (structure, "video/x-raw-yuv")) {
-    return "sdtv";
-  }
-
-  return NULL;
-}
-
-/**
- * gst_video_parse_caps_chroma_site:
- * @caps: the fixed #GstCaps to parse
- *
- * Extracts the chroma site used by the caps.  Possible values are
- * "mpeg2" for MPEG-2 style chroma siting (co-sited horizontally,
- * halfway-sited vertically), "jpeg" for JPEG and Theora style
- * chroma siting (halfway-sited both horizontally and vertically).
- * Other chroma site values are possible, but uncommon.
- *
- * When no chroma site is specified in the caps, it should be assumed
- * to be "mpeg2".
- *
- * Since: 0.10.29
- *
- * Returns: a chroma site string, or NULL if no chroma site could be
- *     determined.
- */
-const char *
-gst_video_parse_caps_chroma_site (GstCaps * caps)
-{
-  GstStructure *structure;
-  const char *s;
-
-  if (!gst_caps_is_fixed (caps))
-    return NULL;
-
-  structure = gst_caps_get_structure (caps, 0);
-
-  s = gst_structure_get_string (structure, "chroma-site");
-  if (s)
-    return s;
-
-  if (gst_structure_has_name (structure, "video/x-raw-yuv")) {
-    return "mpeg2";
-  }
-
-  return NULL;
-}
-
-/**
- * gst_video_format_parse_caps:
- * @caps: the #GstCaps to parse
- * @format: the #GstVideoFormat of the video represented by @caps (output)
- * @width: the width of the video represented by @caps, may be NULL (output)
- * @height: the height of the video represented by @caps, may be NULL (output)
- *
- * Determines the #GstVideoFormat of @caps and places it in the location
- * pointed to by @format.  Extracts the size of the video and places it
- * in the location pointed to by @width and @height.  If @caps does not
- * represent a video format or does not contain height and width, the
- * function will fail and return FALSE. If @caps does not represent a raw
- * video format listed in #GstVideoFormat, but still contains video caps,
- * this function will return TRUE and set @format to #GST_VIDEO_FORMAT_UNKNOWN.
- *
- * Since: 0.10.16
- *
- * Returns: TRUE if @caps was parsed correctly.
- */
-gboolean
-gst_video_format_parse_caps (const GstCaps * caps, GstVideoFormat * format,
-    int *width, int *height)
-{
-  GstStructure *structure;
-  gboolean ok = TRUE;
-
-  if (!gst_caps_is_fixed (caps))
-    return FALSE;
-
-  structure = gst_caps_get_structure (caps, 0);
-
-  if (format) {
-    if (gst_structure_has_name (structure, "video/x-raw-yuv")) {
-      guint32 fourcc;
-
-      ok &= gst_structure_get_fourcc (structure, "format", &fourcc);
-
-      *format = gst_video_format_from_fourcc (fourcc);
-      if (*format == GST_VIDEO_FORMAT_UNKNOWN) {
-        ok = FALSE;
-      }
-    } else if (gst_structure_has_name (structure, "video/x-raw-rgb")) {
-      int depth;
-      int bpp;
-      int endianness = 0;
-      int red_mask = 0;
-      int green_mask = 0;
-      int blue_mask = 0;
-      int alpha_mask = 0;
-      gboolean have_alpha;
-
-      ok &= gst_structure_get_int (structure, "depth", &depth);
-      ok &= gst_structure_get_int (structure, "bpp", &bpp);
-
-      if (bpp != 8) {
-        ok &= gst_structure_get_int (structure, "endianness", &endianness);
-        ok &= gst_structure_get_int (structure, "red_mask", &red_mask);
-        ok &= gst_structure_get_int (structure, "green_mask", &green_mask);
-        ok &= gst_structure_get_int (structure, "blue_mask", &blue_mask);
-      }
-      have_alpha = gst_structure_get_int (structure, "alpha_mask", &alpha_mask);
-
-      if (depth == 30 && bpp == 32 && endianness == G_BIG_ENDIAN) {
-        *format = GST_VIDEO_FORMAT_r210;
-      } else if (depth == 24 && bpp == 32 && endianness == G_BIG_ENDIAN) {
-        *format = gst_video_format_from_rgb32_masks (red_mask, green_mask,
-            blue_mask);
-        if (*format == GST_VIDEO_FORMAT_UNKNOWN) {
-          ok = FALSE;
-        }
-      } else if (depth == 32 && bpp == 32 && endianness == G_BIG_ENDIAN &&
-          have_alpha) {
-        *format = gst_video_format_from_rgba32_masks (red_mask, green_mask,
-            blue_mask, alpha_mask);
-        if (*format == GST_VIDEO_FORMAT_UNKNOWN) {
-          ok = FALSE;
-        }
-      } else if (depth == 24 && bpp == 24 && endianness == G_BIG_ENDIAN) {
-        *format = gst_video_format_from_rgb24_masks (red_mask, green_mask,
-            blue_mask);
-        if (*format == GST_VIDEO_FORMAT_UNKNOWN) {
-          ok = FALSE;
-        }
-      } else if ((depth == 15 || depth == 16) && bpp == 16 &&
-          endianness == G_BYTE_ORDER) {
-        *format = gst_video_format_from_rgb16_masks (red_mask, green_mask,
-            blue_mask);
-        if (*format == GST_VIDEO_FORMAT_UNKNOWN) {
-          ok = FALSE;
-        }
-      } else if (depth == 8 && bpp == 8) {
-        *format = GST_VIDEO_FORMAT_RGB8_PALETTED;
-      } else if (depth == 64 && bpp == 64) {
-        *format = gst_video_format_from_rgba32_masks (red_mask, green_mask,
-            blue_mask, alpha_mask);
-        if (*format == GST_VIDEO_FORMAT_ARGB) {
-          *format = GST_VIDEO_FORMAT_ARGB64;
-        } else {
-          *format = GST_VIDEO_FORMAT_UNKNOWN;
-          ok = FALSE;
-        }
-      } else {
-        ok = FALSE;
-      }
-    } else if (gst_structure_has_name (structure, "video/x-raw-gray")) {
-      int depth;
-      int bpp;
-      int endianness;
-
-      ok &= gst_structure_get_int (structure, "depth", &depth);
-      ok &= gst_structure_get_int (structure, "bpp", &bpp);
-
-      if (bpp > 8)
-        ok &= gst_structure_get_int (structure, "endianness", &endianness);
-
-      if (depth == 8 && bpp == 8) {
-        *format = GST_VIDEO_FORMAT_GRAY8;
-      } else if (depth == 16 && bpp == 16 && endianness == G_BIG_ENDIAN) {
-        *format = GST_VIDEO_FORMAT_GRAY16_BE;
-      } else if (depth == 16 && bpp == 16 && endianness == G_LITTLE_ENDIAN) {
-        *format = GST_VIDEO_FORMAT_GRAY16_LE;
-      } else {
-        ok = FALSE;
-      }
-    } else if (g_str_has_prefix (gst_structure_get_name (structure), "video/")) {
-      *format = GST_VIDEO_FORMAT_UNKNOWN;
-    } else {
-      ok = FALSE;
-    }
-  }
-
-  if (width) {
-    ok &= gst_structure_get_int (structure, "width", width);
-  }
-
-  if (height) {
-    ok &= gst_structure_get_int (structure, "height", height);
-  }
-
-  return ok;
-}
-
-
-/**
- * gst_video_parse_caps_framerate:
- * @caps: pointer to a #GstCaps instance
- * @fps_n: pointer to integer to hold numerator of frame rate (output)
- * @fps_d: pointer to integer to hold denominator of frame rate (output)
- *
- * Extracts the frame rate from @caps and places the values in the locations
- * pointed to by @fps_n and @fps_d.  Returns TRUE if the values could be
- * parsed correctly, FALSE if not.
- *
- * This function can be used with #GstCaps that have any media type; it
- * is not limited to formats handled by #GstVideoFormat.
- *
- * Since: 0.10.16
- *
- * Returns: TRUE if @caps was parsed correctly.
- */
-gboolean
-gst_video_parse_caps_framerate (GstCaps * caps, int *fps_n, int *fps_d)
-{
-  GstStructure *structure;
-
-  if (!gst_caps_is_fixed (caps))
-    return FALSE;
-
-  structure = gst_caps_get_structure (caps, 0);
-
-  return gst_structure_get_fraction (structure, "framerate", fps_n, fps_d);
-}
-
-/**
- * gst_video_parse_caps_pixel_aspect_ratio:
- * @caps: pointer to a #GstCaps instance
- * @par_n: pointer to numerator of pixel aspect ratio (output)
- * @par_d: pointer to denominator of pixel aspect ratio (output)
- *
- * Extracts the pixel aspect ratio from @caps and places the values in
- * the locations pointed to by @par_n and @par_d.  Returns TRUE if the
- * values could be parsed correctly, FALSE if not.
- *
- * This function can be used with #GstCaps that have any media type; it
- * is not limited to formats handled by #GstVideoFormat.
- *
- * Since: 0.10.16
- *
- * Returns: TRUE if @caps was parsed correctly.
- */
-gboolean
-gst_video_parse_caps_pixel_aspect_ratio (GstCaps * caps, int *par_n, int *par_d)
-{
-  GstStructure *structure;
-
-  if (!gst_caps_is_fixed (caps))
-    return FALSE;
-
-  structure = gst_caps_get_structure (caps, 0);
-
-  if (!gst_structure_get_fraction (structure, "pixel-aspect-ratio",
-          par_n, par_d)) {
-    *par_n = 1;
-    *par_d = 1;
-  }
-  return TRUE;
-}
-
-/**
- * gst_video_format_new_caps_interlaced:
- * @format: the #GstVideoFormat describing the raw video format
- * @width: width of video
- * @height: height of video
- * @framerate_n: numerator of frame rate
- * @framerate_d: denominator of frame rate
- * @par_n: numerator of pixel aspect ratio
- * @par_d: denominator of pixel aspect ratio
- * @interlaced: #TRUE if the format is interlaced
- *
- * Creates a new #GstCaps object based on the parameters provided.
- *
- * Since: 0.10.23
- *
- * Returns: a new #GstCaps object, or NULL if there was an error
- */
-GstCaps *
-gst_video_format_new_caps_interlaced (GstVideoFormat format,
-    int width, int height, int framerate_n, int framerate_d, int par_n,
-    int par_d, gboolean interlaced)
-{
-  GstCaps *res;
-
-  res =
-      gst_video_format_new_caps (format, width, height, framerate_n,
-      framerate_d, par_n, par_d);
-  if (interlaced && (res != NULL))
-    gst_caps_set_simple (res, "interlaced", G_TYPE_BOOLEAN, TRUE, NULL);
-
-  return res;
-}
-
-static GstCaps *
-gst_video_format_new_caps_raw (GstVideoFormat format)
-{
-  g_return_val_if_fail (format != GST_VIDEO_FORMAT_UNKNOWN, NULL);
-
-  if (gst_video_format_is_yuv (format)) {
-    return gst_caps_new_simple ("video/x-raw-yuv",
-        "format", GST_TYPE_FOURCC, gst_video_format_to_fourcc (format), NULL);
-  }
-  if (gst_video_format_is_rgb (format)) {
-    GstCaps *caps;
-    int red_mask = 0;
-    int blue_mask = 0;
-    int green_mask = 0;
-    int alpha_mask;
-    int depth;
-    int bpp;
-    gboolean have_alpha;
-    unsigned int mask = 0;
-
-    switch (format) {
-      case GST_VIDEO_FORMAT_RGBx:
-      case GST_VIDEO_FORMAT_BGRx:
-      case GST_VIDEO_FORMAT_xRGB:
-      case GST_VIDEO_FORMAT_xBGR:
-        bpp = 32;
-        depth = 24;
-        have_alpha = FALSE;
-        break;
-      case GST_VIDEO_FORMAT_RGBA:
-      case GST_VIDEO_FORMAT_BGRA:
-      case GST_VIDEO_FORMAT_ARGB:
-      case GST_VIDEO_FORMAT_ABGR:
-        bpp = 32;
-        depth = 32;
-        have_alpha = TRUE;
-        break;
-      case GST_VIDEO_FORMAT_RGB:
-      case GST_VIDEO_FORMAT_BGR:
-        bpp = 24;
-        depth = 24;
-        have_alpha = FALSE;
-        break;
-      case GST_VIDEO_FORMAT_RGB16:
-      case GST_VIDEO_FORMAT_BGR16:
-        bpp = 16;
-        depth = 16;
-        have_alpha = FALSE;
-        break;
-      case GST_VIDEO_FORMAT_RGB15:
-      case GST_VIDEO_FORMAT_BGR15:
-        bpp = 16;
-        depth = 15;
-        have_alpha = FALSE;
-        break;
-      case GST_VIDEO_FORMAT_RGB8_PALETTED:
-        bpp = 8;
-        depth = 8;
-        have_alpha = FALSE;
-        break;
-      case GST_VIDEO_FORMAT_ARGB64:
-        bpp = 64;
-        depth = 64;
-        have_alpha = TRUE;
-        break;
-      case GST_VIDEO_FORMAT_r210:
-        bpp = 32;
-        depth = 30;
-        have_alpha = FALSE;
-        break;
-      default:
-        return NULL;
-    }
-    if (bpp == 32 && depth == 30) {
-      red_mask = 0x3ff00000;
-      green_mask = 0x000ffc00;
-      blue_mask = 0x000003ff;
-      have_alpha = FALSE;
-    } else if (bpp == 32 || bpp == 24 || bpp == 64) {
-      if (bpp == 32) {
-        mask = 0xff000000;
-      } else {
-        mask = 0xff0000;
-      }
-      red_mask =
-          mask >> (8 * gst_video_format_get_component_offset (format, 0, 0, 0));
-      green_mask =
-          mask >> (8 * gst_video_format_get_component_offset (format, 1, 0, 0));
-      blue_mask =
-          mask >> (8 * gst_video_format_get_component_offset (format, 2, 0, 0));
-    } else if (bpp == 16) {
-      switch (format) {
-        case GST_VIDEO_FORMAT_RGB16:
-          red_mask = GST_VIDEO_COMP1_MASK_16_INT;
-          green_mask = GST_VIDEO_COMP2_MASK_16_INT;
-          blue_mask = GST_VIDEO_COMP3_MASK_16_INT;
-          break;
-        case GST_VIDEO_FORMAT_BGR16:
-          red_mask = GST_VIDEO_COMP3_MASK_16_INT;
-          green_mask = GST_VIDEO_COMP2_MASK_16_INT;
-          blue_mask = GST_VIDEO_COMP1_MASK_16_INT;
-          break;
-          break;
-        case GST_VIDEO_FORMAT_RGB15:
-          red_mask = GST_VIDEO_COMP1_MASK_15_INT;
-          green_mask = GST_VIDEO_COMP2_MASK_15_INT;
-          blue_mask = GST_VIDEO_COMP3_MASK_15_INT;
-          break;
-        case GST_VIDEO_FORMAT_BGR15:
-          red_mask = GST_VIDEO_COMP3_MASK_15_INT;
-          green_mask = GST_VIDEO_COMP2_MASK_15_INT;
-          blue_mask = GST_VIDEO_COMP1_MASK_15_INT;
-          break;
-        default:
-          g_assert_not_reached ();
-      }
-    } else if (bpp != 8) {
-      g_assert_not_reached ();
-    }
-
-    caps = gst_caps_new_simple ("video/x-raw-rgb",
-        "bpp", G_TYPE_INT, bpp, "depth", G_TYPE_INT, depth, NULL);
-
-    if (bpp != 8) {
-      gst_caps_set_simple (caps,
-          "endianness", G_TYPE_INT, bpp == 16 ? G_BYTE_ORDER : G_BIG_ENDIAN,
-          "red_mask", G_TYPE_INT, red_mask,
-          "green_mask", G_TYPE_INT, green_mask,
-          "blue_mask", G_TYPE_INT, blue_mask, NULL);
-    }
-
-    if (have_alpha) {
-      alpha_mask =
-          mask >> (8 * gst_video_format_get_component_offset (format, 3, 0, 0));
-      gst_caps_set_simple (caps, "alpha_mask", G_TYPE_INT, alpha_mask, NULL);
-    }
-    return caps;
-  }
-
-  if (gst_video_format_is_gray (format)) {
-    GstCaps *caps;
-    int bpp;
-    int depth;
-    int endianness;
-
-    switch (format) {
-      case GST_VIDEO_FORMAT_GRAY8:
-        bpp = depth = 8;
-        endianness = G_BIG_ENDIAN;
-        break;
-      case GST_VIDEO_FORMAT_GRAY16_BE:
-        bpp = depth = 16;
-        endianness = G_BIG_ENDIAN;
-        break;
-      case GST_VIDEO_FORMAT_GRAY16_LE:
-        bpp = depth = 16;
-        endianness = G_LITTLE_ENDIAN;
-        break;
-      default:
-        return NULL;
-        break;
-    }
-
-    if (bpp <= 8) {
-      caps = gst_caps_new_simple ("video/x-raw-gray",
-          "bpp", G_TYPE_INT, bpp, "depth", G_TYPE_INT, depth, NULL);
-    } else {
-      caps = gst_caps_new_simple ("video/x-raw-gray",
-          "bpp", G_TYPE_INT, bpp,
-          "depth", G_TYPE_INT, depth,
-          "endianness", G_TYPE_INT, endianness, NULL);
-    }
-
-    return caps;
-  }
-
-  return NULL;
-}
-
-/**
- * gst_video_format_new_template_caps:
- * @format: the #GstVideoFormat describing the raw video format
- *
- * Creates a new #GstCaps object based on the parameters provided.
- * Size, frame rate, and pixel aspect ratio are set to the full
- * range.
- *
- * Since: 0.10.33
- *
- * Returns: a new #GstCaps object, or NULL if there was an error
- */
-GstCaps *
-gst_video_format_new_template_caps (GstVideoFormat format)
-{
-  GstCaps *caps;
-  GstStructure *structure;
-
-  g_return_val_if_fail (format != GST_VIDEO_FORMAT_UNKNOWN, NULL);
-
-  caps = gst_video_format_new_caps_raw (format);
-  if (caps) {
-    GValue value = { 0 };
-    GValue v = { 0 };
-
-    structure = gst_caps_get_structure (caps, 0);
-
-    gst_structure_set (structure,
-        "width", GST_TYPE_INT_RANGE, 1, G_MAXINT,
-        "height", GST_TYPE_INT_RANGE, 1, G_MAXINT,
-        "framerate", GST_TYPE_FRACTION_RANGE, 0, 1, G_MAXINT, 1,
-        "pixel-aspect-ratio", GST_TYPE_FRACTION_RANGE, 0, 1, G_MAXINT, 1, NULL);
-
-    g_value_init (&value, GST_TYPE_LIST);
-    g_value_init (&v, G_TYPE_BOOLEAN);
-    g_value_set_boolean (&v, TRUE);
-    gst_value_list_append_value (&value, &v);
-    g_value_set_boolean (&v, FALSE);
-    gst_value_list_append_value (&value, &v);
-    g_value_unset (&v);
-
-    gst_structure_take_value (structure, "interlaced", &value);
-  }
-
-  return caps;
-}
-
-/**
- * gst_video_format_new_caps:
- * @format: the #GstVideoFormat describing the raw video format
- * @width: width of video
- * @height: height of video
- * @framerate_n: numerator of frame rate
- * @framerate_d: denominator of frame rate
- * @par_n: numerator of pixel aspect ratio
- * @par_d: denominator of pixel aspect ratio
- *
- * Creates a new #GstCaps object based on the parameters provided.
- *
- * Since: 0.10.16
- *
- * Returns: a new #GstCaps object, or NULL if there was an error
- */
-GstCaps *
-gst_video_format_new_caps (GstVideoFormat format, int width,
-    int height, int framerate_n, int framerate_d, int par_n, int par_d)
-{
-  GstCaps *caps;
-  GstStructure *structure;
-
-  g_return_val_if_fail (format != GST_VIDEO_FORMAT_UNKNOWN, NULL);
-  g_return_val_if_fail (width > 0 && height > 0, NULL);
-
-  caps = gst_video_format_new_caps_raw (format);
-  if (caps) {
-    structure = gst_caps_get_structure (caps, 0);
-
-    gst_structure_set (structure,
-        "width", G_TYPE_INT, width,
-        "height", G_TYPE_INT, height,
-        "framerate", GST_TYPE_FRACTION, framerate_n, framerate_d,
-        "pixel-aspect-ratio", GST_TYPE_FRACTION, par_n, par_d, NULL);
-  }
-
-  return caps;
-}
-
-
-/**
- * gst_video_format_from_fourcc:
- * @fourcc: a FOURCC value representing raw YUV video
- *
- * Converts a FOURCC value into the corresponding #GstVideoFormat.
- * If the FOURCC cannot be represented by #GstVideoFormat,
- * #GST_VIDEO_FORMAT_UNKNOWN is returned.
- *
- * Since: 0.10.16
- *
- * Returns: the #GstVideoFormat describing the FOURCC value
- */
-GstVideoFormat
-gst_video_format_from_fourcc (guint32 fourcc)
-{
-  switch (fourcc) {
-    case GST_MAKE_FOURCC ('I', '4', '2', '0'):
-      return GST_VIDEO_FORMAT_I420;
-    case GST_MAKE_FOURCC ('Y', 'V', '1', '2'):
-      return GST_VIDEO_FORMAT_YV12;
-    case GST_MAKE_FOURCC ('Y', 'U', 'Y', '2'):
-      return GST_VIDEO_FORMAT_YUY2;
-    case GST_MAKE_FOURCC ('Y', 'V', 'Y', 'U'):
-      return GST_VIDEO_FORMAT_YVYU;
-    case GST_MAKE_FOURCC ('U', 'Y', 'V', 'Y'):
-      return GST_VIDEO_FORMAT_UYVY;
-    case GST_MAKE_FOURCC ('A', 'Y', 'U', 'V'):
-      return GST_VIDEO_FORMAT_AYUV;
-    case GST_MAKE_FOURCC ('Y', '4', '1', 'B'):
-      return GST_VIDEO_FORMAT_Y41B;
-    case GST_MAKE_FOURCC ('Y', '4', '2', 'B'):
-      return GST_VIDEO_FORMAT_Y42B;
-    case GST_MAKE_FOURCC ('Y', '4', '4', '4'):
-      return GST_VIDEO_FORMAT_Y444;
-    case GST_MAKE_FOURCC ('v', '2', '1', '0'):
-      return GST_VIDEO_FORMAT_v210;
-    case GST_MAKE_FOURCC ('v', '2', '1', '6'):
-      return GST_VIDEO_FORMAT_v216;
-    case GST_MAKE_FOURCC ('N', 'V', '1', '2'):
-      return GST_VIDEO_FORMAT_NV12;
-    case GST_MAKE_FOURCC ('N', 'V', '2', '1'):
-      return GST_VIDEO_FORMAT_NV21;
-    case GST_MAKE_FOURCC ('v', '3', '0', '8'):
-      return GST_VIDEO_FORMAT_v308;
-    case GST_MAKE_FOURCC ('Y', '8', '0', '0'):
-    case GST_MAKE_FOURCC ('Y', '8', ' ', ' '):
-    case GST_MAKE_FOURCC ('G', 'R', 'E', 'Y'):
-      return GST_VIDEO_FORMAT_Y800;
-    case GST_MAKE_FOURCC ('Y', '1', '6', ' '):
-      return GST_VIDEO_FORMAT_Y16;
-    case GST_MAKE_FOURCC ('U', 'Y', 'V', 'P'):
-      return GST_VIDEO_FORMAT_UYVP;
-    case GST_MAKE_FOURCC ('A', '4', '2', '0'):
-      return GST_VIDEO_FORMAT_A420;
-    case GST_MAKE_FOURCC ('Y', 'U', 'V', '9'):
-      return GST_VIDEO_FORMAT_YUV9;
-    case GST_MAKE_FOURCC ('Y', 'V', 'U', '9'):
-      return GST_VIDEO_FORMAT_YVU9;
-    case GST_MAKE_FOURCC ('I', 'Y', 'U', '1'):
-      return GST_VIDEO_FORMAT_IYU1;
-    case GST_MAKE_FOURCC ('A', 'Y', '6', '4'):
-      return GST_VIDEO_FORMAT_AYUV64;
-    case GST_MAKE_FOURCC ('D', '4', '2', '0'):
-      return GST_VIDEO_FORMAT_I420_10BE;
-    case GST_MAKE_FOURCC ('d', '4', '2', '0'):
-      return GST_VIDEO_FORMAT_I420_10LE;
-    case GST_MAKE_FOURCC ('D', '4', '2', '2'):
-      return GST_VIDEO_FORMAT_I422_10BE;
-    case GST_MAKE_FOURCC ('d', '4', '2', '2'):
-      return GST_VIDEO_FORMAT_I422_10LE;
-    case GST_MAKE_FOURCC ('D', '4', '4', '4'):
-      return GST_VIDEO_FORMAT_Y444_10BE;
-    case GST_MAKE_FOURCC ('d', '4', '4', '4'):
-      return GST_VIDEO_FORMAT_Y444_10LE;
-    default:
-      return GST_VIDEO_FORMAT_UNKNOWN;
-  }
-}
-
-/**
- * gst_video_format_to_fourcc:
- * @format: a #GstVideoFormat video format
- *
- * Converts a #GstVideoFormat value into the corresponding FOURCC.  Only
- * a few YUV formats have corresponding FOURCC values.  If @format has
- * no corresponding FOURCC value, 0 is returned.
- *
- * Since: 0.10.16
- *
- * Returns: the FOURCC corresponding to @format
- */
-guint32
-gst_video_format_to_fourcc (GstVideoFormat format)
-{
-  if (format == GST_VIDEO_FORMAT_UNKNOWN || format >= G_N_ELEMENTS (formats))
-    return 0;
-
-  return formats[format].fourcc;
-}
-
-/**
- * gst_video_format_to_string:
- * @format: a #GstVideoFormat video format
- *
- * Returns: a short string that describes @format, or #NULL
- *
- * Since: 0.10.37
- */
-const gchar *
-gst_video_format_to_string (GstVideoFormat format)
-{
-  if (format >= G_N_ELEMENTS (formats))
-    return NULL;
-
-  return GST_VIDEO_FORMAT_INFO_NAME (&formats[format].info);
-}
-
-/**
- * gst_video_format_get_info:
- * @format: a #GstVideoFormat
- *
- * Get the #GstVideoFormatInfo for @format
- *
- * Returns: The #GstVideoFormatInfo for @format.
- *
- * Since: 0.10.37
- */
-const GstVideoFormatInfo *
-gst_video_format_get_info (GstVideoFormat format)
-{
-  g_return_val_if_fail (format != GST_VIDEO_FORMAT_UNKNOWN, NULL);
-  g_return_val_if_fail (format < G_N_ELEMENTS (formats), NULL);
-
-  return &formats[format].info;
-}
-
-/**
- * gst_video_info_init:
- * @info: a #GstVideoInfo
- *
- * Initialize @info with default values.
- *
- * Since: 0.10.37
- */
-void
-gst_video_info_init (GstVideoInfo * info)
-{
-  g_return_if_fail (info != NULL);
-
-  memset (info, 0, sizeof (GstVideoInfo));
-
-  info->finfo = &formats[GST_VIDEO_FORMAT_UNKNOWN].info;
-
-  /* arrange for sensible defaults, e.g. if turned into caps */
-  info->fps_n = 0;
-  info->fps_d = 1;
-  info->par_n = 1;
-  info->par_d = 1;
-}
-
-/**
- * gst_video_info_set_format:
- * @info: a #GstVideoInfo
- * @format: the format
- * @width: a width
- * @height: a height
- *
- * Set the default info for a video frame of @format and @width and @height.
- *
- * Since: 0.10.37
- */
-void
-gst_video_info_set_format (GstVideoInfo * info, GstVideoFormat format,
-    guint width, guint height)
-{
-  const GstVideoFormatInfo *finfo;
-
-  g_return_if_fail (info != NULL);
-  g_return_if_fail (format != GST_VIDEO_FORMAT_UNKNOWN);
-
-  finfo = &formats[format].info;
-
-  info->flags = 0;
-  info->finfo = finfo;
-  info->width = width;
-  info->height = height;
-
-  fill_planes (info);
-}
-
-#if 0
-static const gchar *interlace_mode[] = {
-  "progressive",
-  "interleaved",
-  "mixed",
-  "fields"
-};
-
-static const gchar *
-gst_interlace_mode_to_string (GstVideoInterlaceMode mode)
-{
-  if (mode < 0 || mode >= G_N_ELEMENTS (interlace_mode))
-    return NULL;
-
-  return interlace_mode[mode];
-}
-
-static GstVideoInterlaceMode
-gst_interlace_mode_from_string (const gchar * mode)
-{
-  gint i;
-  for (i = 0; i < G_N_ELEMENTS (interlace_mode); i++) {
-    if (g_str_equal (interlace_mode[i], mode))
-      return i;
-  }
-  return GST_VIDEO_INTERLACE_MODE_PROGRESSIVE;
-}
-#endif
-
-typedef struct
-{
-  const gchar *name;
-  GstVideoChromaSite site;
-} ChromaSiteInfo;
-
-static const ChromaSiteInfo chromasite[] = {
-  {"jpeg", GST_VIDEO_CHROMA_SITE_JPEG},
-  {"mpeg2", GST_VIDEO_CHROMA_SITE_MPEG2},
-  {"dv", GST_VIDEO_CHROMA_SITE_DV}
-};
-
-static GstVideoChromaSite
-gst_video_chroma_from_string (const gchar * s)
-{
-  gint i;
-  for (i = 0; i < G_N_ELEMENTS (chromasite); i++) {
-    if (g_str_equal (chromasite[i].name, s))
-      return chromasite[i].site;
-  }
-  return GST_VIDEO_CHROMA_SITE_UNKNOWN;
-}
-
-static const gchar *
-gst_video_chroma_to_string (GstVideoChromaSite site)
-{
-  gint i;
-  for (i = 0; i < G_N_ELEMENTS (chromasite); i++) {
-    if (chromasite[i].site == site)
-      return chromasite[i].name;
-  }
-  return NULL;
-}
-
-typedef struct
-{
-  const gchar *name;
-  GstVideoColorimetry color;
-} ColorimetryInfo;
-
-#define MAKE_COLORIMETRY(n,r,m,t,p) { GST_VIDEO_COLORIMETRY_ ##n, \
-  { GST_VIDEO_COLOR_RANGE ##r, GST_VIDEO_COLOR_MATRIX_ ##m, \
-  GST_VIDEO_TRANSFER_ ##t, GST_VIDEO_COLOR_PRIMARIES_ ##p } }
-
-static const ColorimetryInfo colorimetry[] = {
-  MAKE_COLORIMETRY (BT601, _16_235, BT601, BT709, BT470M),
-  MAKE_COLORIMETRY (BT709, _16_235, BT709, BT709, BT709),
-  MAKE_COLORIMETRY (SMPTE240M, _16_235, SMPTE240M, SMPTE240M, SMPTE240M),
-};
-
-static const ColorimetryInfo *
-gst_video_get_colorimetry (const gchar * s)
-{
-  gint i;
-
-  for (i = 0; i < G_N_ELEMENTS (colorimetry); i++) {
-    if (g_str_equal (colorimetry[i].name, s))
-      return &colorimetry[i];
-  }
-  return NULL;
-}
-
-#define IS_EQUAL(ci,i) (((ci)->color.range == (i)->range) && \
-                        ((ci)->color.matrix == (i)->matrix) && \
-                        ((ci)->color.transfer == (i)->transfer) && \
-                        ((ci)->color.primaries == (i)->primaries))
-
-
-/**
- * gst_video_colorimetry_from_string
- * @cinfo: a #GstVideoColorimetry
- * @color: a colorimetry string
- *
- * Parse the colorimetry string and update @cinfo with the parsed
- * values.
- *
- * Returns: #TRUE if @color points to valid colorimetry info.
- *
- * Since: 0.10.37
- */
-gboolean
-gst_video_colorimetry_from_string (GstVideoColorimetry * cinfo,
-    const gchar * color)
-{
-  const ColorimetryInfo *ci;
-
-  if ((ci = gst_video_get_colorimetry (color))) {
-    *cinfo = ci->color;
-  } else {
-    /* FIXME, split and parse */
-    cinfo->range = GST_VIDEO_COLOR_RANGE_16_235;
-    cinfo->matrix = GST_VIDEO_COLOR_MATRIX_BT601;
-    cinfo->transfer = GST_VIDEO_TRANSFER_BT709;
-    cinfo->primaries = GST_VIDEO_COLOR_PRIMARIES_BT709;
-  }
-  return TRUE;
-}
-
-static void
-gst_video_caps_set_colorimetry (GstCaps * caps, GstVideoColorimetry * cinfo)
-{
-  gint i;
-
-  for (i = 0; i < G_N_ELEMENTS (colorimetry); i++) {
-    if (IS_EQUAL (&colorimetry[i], cinfo)) {
-      gst_caps_set_simple (caps, "colorimetry", G_TYPE_STRING,
-          colorimetry[i].name, NULL);
-      return;
-    }
-  }
-  /* FIXME, construct colorimetry */
-}
-
-/**
- * gst_video_colorimetry_matches:
- * @cinfo: a #GstVideoInfo
- * @color: a colorimetry string
- *
- * Check if the colorimetry information in @cinfo matches that of the
- * string @color.
- *
- * Returns: #TRUE if @color conveys the same colorimetry info as the color
- * information in @info.
- *
- * Since: 0.10.37
- */
-gboolean
-gst_video_colorimetry_matches (GstVideoColorimetry * cinfo, const gchar * color)
-{
-  const ColorimetryInfo *ci;
-
-  if ((ci = gst_video_get_colorimetry (color)))
-    return IS_EQUAL (ci, cinfo);
-
-  return FALSE;
-}
-
-/**
- * gst_video_info_from_caps:
- * @info: a #GstVideoInfo
- * @caps: a #GstCaps
- *
- * Parse @caps and update @info.
- *
- * Returns: TRUE if @caps could be parsed
- *
- * Since: 0.10.37
- */
-gboolean
-gst_video_info_from_caps (GstVideoInfo * info, const GstCaps * caps)
-{
-  GstStructure *structure;
-  const gchar *s;
-  GstVideoFormat format = GST_VIDEO_FORMAT_UNKNOWN;
-  gint width = 0, height = 0;
-  gint fps_n, fps_d;
-  gint par_n, par_d;
-  gboolean interlaced;
-
-  g_return_val_if_fail (info != NULL, FALSE);
-  g_return_val_if_fail (caps != NULL, FALSE);
-  g_return_val_if_fail (gst_caps_is_fixed (caps), FALSE);
-
-  GST_DEBUG ("parsing caps %" GST_PTR_FORMAT, caps);
-
-  structure = gst_caps_get_structure (caps, 0);
-
-  if (gst_structure_has_name (structure, "video/x-raw-yuv")) {
-    guint32 fourcc;
-
-    if (!gst_structure_get_fourcc (structure, "format", &fourcc))
-      goto no_format;
-
-    format = gst_video_format_from_fourcc (fourcc);
-  } else if (gst_structure_has_name (structure, "video/x-raw-rgb")) {
-    int depth;
-    int bpp;
-    int endianness = 0;
-    int red_mask = 0;
-    int green_mask = 0;
-    int blue_mask = 0;
-    int alpha_mask = 0;
-
-    if (!gst_structure_get_int (structure, "depth", &depth) ||
-        !gst_structure_get_int (structure, "bpp", &bpp))
-      goto no_bpp_depth;
-
-    if (bpp != 8) {
-      gst_structure_get_int (structure, "endianness", &endianness);
-      gst_structure_get_int (structure, "red_mask", &red_mask);
-      gst_structure_get_int (structure, "green_mask", &green_mask);
-      gst_structure_get_int (structure, "blue_mask", &blue_mask);
-    }
-    gst_structure_get_int (structure, "alpha_mask", &alpha_mask);
-    format = gst_video_format_from_masks (depth, bpp, endianness,
-        red_mask, green_mask, blue_mask, alpha_mask);
-  } else if (gst_structure_has_name (structure, "video/x-raw-gray")) {
-    int depth;
-    int bpp;
-    int endianness;
-
-    if (!gst_structure_get_int (structure, "depth", &depth) ||
-        !gst_structure_get_int (structure, "bpp", &bpp))
-      goto no_bpp_depth;
-
-    /* endianness is mandatory for bpp > 8 */
-    if (bpp > 8 &&
-        !gst_structure_get_int (structure, "endianness", &endianness))
-      goto no_endianess;
-
-    if (depth == 8 && bpp == 8) {
-      format = GST_VIDEO_FORMAT_GRAY8;
-    } else if (depth == 16 && bpp == 16 && endianness == G_BIG_ENDIAN) {
-      format = GST_VIDEO_FORMAT_GRAY16_BE;
-    } else if (depth == 16 && bpp == 16 && endianness == G_LITTLE_ENDIAN) {
-      format = GST_VIDEO_FORMAT_GRAY16_LE;
-    }
-  } else if (g_str_has_prefix (gst_structure_get_name (structure), "video/") ||
-      g_str_has_prefix (gst_structure_get_name (structure), "image/"))
-    format = GST_VIDEO_FORMAT_ENCODED;
-
-  if (format == GST_VIDEO_FORMAT_UNKNOWN)
-    goto unknown_format;
-
-  /* width and height are mandatory, except for non-raw-formats */
-  if (!gst_structure_get_int (structure, "width", &width) &&
-      format != GST_VIDEO_FORMAT_ENCODED)
-    goto no_width;
-  if (!gst_structure_get_int (structure, "height", &height) &&
-      format != GST_VIDEO_FORMAT_ENCODED)
-    goto no_height;
-
-  gst_video_info_set_format (info, format, width, height);
-
-  if (gst_structure_get_fraction (structure, "framerate", &fps_n, &fps_d)) {
-    if (fps_n == 0) {
-      /* variable framerate */
-      info->flags |= GST_VIDEO_FLAG_VARIABLE_FPS;
-      /* see if we have a max-framerate */
-      gst_structure_get_fraction (structure, "max-framerate", &fps_n, &fps_d);
-    }
-    info->fps_n = fps_n;
-    info->fps_d = fps_d;
-  } else {
-    /* unspecified is variable framerate */
-    info->fps_n = 0;
-    info->fps_d = 1;
-  }
-
-  if (gst_structure_get_boolean (structure, "interlaced", &interlaced)
-      && interlaced)
-    info->interlace_mode = GST_VIDEO_INTERLACE_MODE_INTERLEAVED;
-  else
-    info->interlace_mode = GST_VIDEO_INTERLACE_MODE_PROGRESSIVE;
-
-  if ((s = gst_structure_get_string (structure, "chroma-site")))
-    info->chroma_site = gst_video_chroma_from_string (s);
-  else
-    info->chroma_site = GST_VIDEO_CHROMA_SITE_UNKNOWN;
-
-  if ((s = gst_structure_get_string (structure, "colorimetry")))
-    gst_video_colorimetry_from_string (&info->colorimetry, s);
-  else
-    memset (&info->colorimetry, 0, sizeof (GstVideoColorimetry));
-
-  if (gst_structure_get_fraction (structure, "pixel-aspect-ratio",
-          &par_n, &par_d)) {
-    info->par_n = par_n;
-    info->par_d = par_d;
-  } else {
-    info->par_n = 1;
-    info->par_d = 1;
-  }
-  return TRUE;
-
-  /* ERROR */
-no_format:
-  {
-    GST_ERROR ("no format given");
-    return FALSE;
-  }
-unknown_format:
-  {
-    GST_ERROR ("unknown format");
-    return FALSE;
-  }
-no_width:
-  {
-    GST_ERROR ("no width property given");
-    return FALSE;
-  }
-no_height:
-  {
-    GST_ERROR ("no height property given");
-    return FALSE;
-  }
-
-no_bpp_depth:
-  {
-    GST_ERROR ("no bpp or depth given");
-    return FALSE;
-  }
-
-no_endianess:
-  {
-    GST_ERROR ("no endianness given");
-    return FALSE;
-  }
-}
-
-/**
- * gst_video_info_is_equal:
- * @info: a #GstVideoInfo
- * @other: a #GstVideoInfo
- *
- * Compares two #GstVideoInfo and returns whether they are equal or not
- *
- * Returns: %TRUE if @info and @other are equal, else %FALSE.
- *
- * Since: 0.10.37
- */
-gboolean
-gst_video_info_is_equal (const GstVideoInfo * info, const GstVideoInfo * other)
-{
-  if (GST_VIDEO_INFO_FORMAT (info) != GST_VIDEO_INFO_FORMAT (other))
-    return FALSE;
-  if (GST_VIDEO_INFO_INTERLACE_MODE (info) !=
-      GST_VIDEO_INFO_INTERLACE_MODE (other))
-    return FALSE;
-  if (GST_VIDEO_INFO_FLAGS (info) != GST_VIDEO_INFO_FLAGS (other))
-    return FALSE;
-  if (GST_VIDEO_INFO_WIDTH (info) != GST_VIDEO_INFO_WIDTH (other))
-    return FALSE;
-  if (GST_VIDEO_INFO_HEIGHT (info) != GST_VIDEO_INFO_HEIGHT (other))
-    return FALSE;
-  if (GST_VIDEO_INFO_SIZE (info) != GST_VIDEO_INFO_SIZE (other))
-    return FALSE;
-  if (GST_VIDEO_INFO_PAR_N (info) != GST_VIDEO_INFO_PAR_N (other))
-    return FALSE;
-  if (GST_VIDEO_INFO_PAR_D (info) != GST_VIDEO_INFO_PAR_D (other))
-    return FALSE;
-  if (GST_VIDEO_INFO_FPS_N (info) != GST_VIDEO_INFO_FPS_N (other))
-    return FALSE;
-  if (GST_VIDEO_INFO_FPS_D (info) != GST_VIDEO_INFO_FPS_D (other))
-    return FALSE;
-  return TRUE;
-}
-
-/**
- * gst_video_info_to_caps:
- * @info: a #GstVideoInfo
- *
- * Convert the values of @info into a #GstCaps.
- *
- * Returns: a new #GstCaps containing the info of @info.
- *
- * Since: 0.10.37
- */
-GstCaps *
-gst_video_info_to_caps (GstVideoInfo * info)
-{
-  GstCaps *caps;
-
-  g_return_val_if_fail (info != NULL, NULL);
-  g_return_val_if_fail (info->finfo != NULL, NULL);
-  g_return_val_if_fail (info->finfo->format != GST_VIDEO_FORMAT_UNKNOWN, NULL);
-
-  caps = gst_video_format_new_caps_raw (GST_VIDEO_INFO_FORMAT (info));
-
-  gst_caps_set_simple (caps,
-      "width", G_TYPE_INT, info->width,
-      "height", G_TYPE_INT, info->height,
-      "pixel-aspect-ratio", GST_TYPE_FRACTION, info->par_n, info->par_d, NULL);
-
-  gst_caps_set_simple (caps, "interlaced", G_TYPE_BOOLEAN,
-      GST_VIDEO_INFO_IS_INTERLACED (info), NULL);
-
-  if (info->chroma_site != GST_VIDEO_CHROMA_SITE_UNKNOWN)
-    gst_caps_set_simple (caps, "chroma-site", G_TYPE_STRING,
-        gst_video_chroma_to_string (info->chroma_site), NULL);
-
-  gst_video_caps_set_colorimetry (caps, &info->colorimetry);
-
-  if (info->flags & GST_VIDEO_FLAG_VARIABLE_FPS && info->fps_n != 0) {
-    /* variable fps with a max-framerate */
-    gst_caps_set_simple (caps, "framerate", GST_TYPE_FRACTION, 0, 1,
-        "max-framerate", GST_TYPE_FRACTION, info->fps_n, info->fps_d, NULL);
-  } else {
-    /* no variable fps or no max-framerate */
-    gst_caps_set_simple (caps, "framerate", GST_TYPE_FRACTION,
-        info->fps_n, info->fps_d, NULL);
-  }
-
-  return caps;
-}
-
-
-static int
-fill_planes (GstVideoInfo * info)
-{
-  gint width, height;
-
-  width = info->width;
-  height = info->height;
-
-  switch (info->finfo->format) {
-    case GST_VIDEO_FORMAT_YUY2:
-    case GST_VIDEO_FORMAT_YVYU:
-    case GST_VIDEO_FORMAT_UYVY:
-      info->stride[0] = GST_ROUND_UP_4 (width * 2);
-      info->offset[0] = 0;
-      info->size = info->stride[0] * height;
-      break;
-    case GST_VIDEO_FORMAT_AYUV:
-    case GST_VIDEO_FORMAT_RGBx:
-    case GST_VIDEO_FORMAT_RGBA:
-    case GST_VIDEO_FORMAT_BGRx:
-    case GST_VIDEO_FORMAT_BGRA:
-    case GST_VIDEO_FORMAT_xRGB:
-    case GST_VIDEO_FORMAT_ARGB:
-    case GST_VIDEO_FORMAT_xBGR:
-    case GST_VIDEO_FORMAT_ABGR:
-    case GST_VIDEO_FORMAT_r210:
-      info->stride[0] = width * 4;
-      info->offset[0] = 0;
-      info->size = info->stride[0] * height;
-      break;
-    case GST_VIDEO_FORMAT_RGB16:
-    case GST_VIDEO_FORMAT_BGR16:
-    case GST_VIDEO_FORMAT_RGB15:
-    case GST_VIDEO_FORMAT_BGR15:
-      info->stride[0] = GST_ROUND_UP_4 (width * 2);
-      info->offset[0] = 0;
-      info->size = info->stride[0] * height;
-      break;
-    case GST_VIDEO_FORMAT_RGB:
-    case GST_VIDEO_FORMAT_BGR:
-    case GST_VIDEO_FORMAT_v308:
-      info->stride[0] = GST_ROUND_UP_4 (width * 3);
-      info->offset[0] = 0;
-      info->size = info->stride[0] * height;
-      break;
-    case GST_VIDEO_FORMAT_v210:
-      info->stride[0] = ((width + 47) / 48) * 128;
-      info->offset[0] = 0;
-      info->size = info->stride[0] * height;
-      break;
-    case GST_VIDEO_FORMAT_v216:
-      info->stride[0] = GST_ROUND_UP_8 (width * 4);
-      info->offset[0] = 0;
-      info->size = info->stride[0] * height;
-      break;
-    case GST_VIDEO_FORMAT_GRAY8:
-    case GST_VIDEO_FORMAT_Y800:
-      info->stride[0] = GST_ROUND_UP_4 (width);
-      info->offset[0] = 0;
-      info->size = info->stride[0] * height;
-      break;
-    case GST_VIDEO_FORMAT_GRAY16_BE:
-    case GST_VIDEO_FORMAT_GRAY16_LE:
-    case GST_VIDEO_FORMAT_Y16:
-      info->stride[0] = GST_ROUND_UP_4 (width * 2);
-      info->offset[0] = 0;
-      info->size = info->stride[0] * height;
-      break;
-    case GST_VIDEO_FORMAT_UYVP:
-      info->stride[0] = GST_ROUND_UP_4 ((width * 2 * 5 + 3) / 4);
-      info->offset[0] = 0;
-      info->size = info->stride[0] * height;
-      break;
-    case GST_VIDEO_FORMAT_RGB8_PALETTED:
-      info->stride[0] = GST_ROUND_UP_4 (width);
-      info->offset[0] = 0;
-      info->size = info->stride[0] * height;
-      break;
-    case GST_VIDEO_FORMAT_IYU1:
-      info->stride[0] = GST_ROUND_UP_4 (GST_ROUND_UP_4 (width) +
-          GST_ROUND_UP_4 (width) / 2);
-      info->offset[0] = 0;
-      info->size = info->stride[0] * height;
-      break;
-    case GST_VIDEO_FORMAT_ARGB64:
-    case GST_VIDEO_FORMAT_AYUV64:
-      info->stride[0] = width * 8;
-      info->offset[0] = 0;
-      info->size = info->stride[0] * height;
-      break;
-    case GST_VIDEO_FORMAT_I420:
-    case GST_VIDEO_FORMAT_YV12:        /* same as I420, but plane 1+2 swapped */
-      info->stride[0] = GST_ROUND_UP_4 (width);
-      info->stride[1] = GST_ROUND_UP_4 (GST_ROUND_UP_2 (width) / 2);
-      info->stride[2] = info->stride[1];
-      info->offset[0] = 0;
-      info->offset[1] = info->stride[0] * GST_ROUND_UP_2 (height);
-      info->offset[2] = info->offset[1] +
-          info->stride[1] * (GST_ROUND_UP_2 (height) / 2);
-      info->size = info->offset[2] +
-          info->stride[2] * (GST_ROUND_UP_2 (height) / 2);
-      break;
-    case GST_VIDEO_FORMAT_Y41B:
-      info->stride[0] = GST_ROUND_UP_4 (width);
-      info->stride[1] = GST_ROUND_UP_16 (width) / 4;
-      info->stride[2] = info->stride[1];
-      info->offset[0] = 0;
-      info->offset[1] = info->stride[0] * height;
-      info->offset[2] = info->offset[1] + info->stride[1] * height;
-      /* simplification of ROUNDUP4(w)*h + 2*((ROUNDUP16(w)/4)*h */
-      info->size = (info->stride[0] + (GST_ROUND_UP_16 (width) / 2)) * height;
-      break;
-    case GST_VIDEO_FORMAT_Y42B:
-      info->stride[0] = GST_ROUND_UP_4 (width);
-      info->stride[1] = GST_ROUND_UP_8 (width) / 2;
-      info->stride[2] = info->stride[1];
-      info->offset[0] = 0;
-      info->offset[1] = info->stride[0] * height;
-      info->offset[2] = info->offset[1] + info->stride[1] * height;
-      /* simplification of ROUNDUP4(w)*h + 2*(ROUNDUP8(w)/2)*h */
-      info->size = (info->stride[0] + GST_ROUND_UP_8 (width)) * height;
-      break;
-    case GST_VIDEO_FORMAT_Y444:
-      info->stride[0] = GST_ROUND_UP_4 (width);
-      info->stride[1] = info->stride[0];
-      info->stride[2] = info->stride[0];
-      info->offset[0] = 0;
-      info->offset[1] = info->stride[0] * height;
-      info->offset[2] = info->offset[1] * 2;
-      info->size = info->stride[0] * height * 3;
-      break;
-    case GST_VIDEO_FORMAT_NV12:
-    case GST_VIDEO_FORMAT_NV21:
-      info->stride[0] = GST_ROUND_UP_4 (width);
-      info->stride[1] = info->stride[0];
-      info->offset[0] = 0;
-      info->offset[1] = info->stride[0] * GST_ROUND_UP_2 (height);
-      info->size = info->stride[0] * GST_ROUND_UP_2 (height) * 3 / 2;
-      break;
-    case GST_VIDEO_FORMAT_A420:
-      info->stride[0] = GST_ROUND_UP_4 (width);
-      info->stride[1] = GST_ROUND_UP_4 (GST_ROUND_UP_2 (width) / 2);
-      info->stride[2] = info->stride[1];
-      info->stride[3] = info->stride[0];
-      info->offset[0] = 0;
-      info->offset[1] = info->stride[0] * GST_ROUND_UP_2 (height);
-      info->offset[2] = info->offset[1] +
-          info->stride[1] * (GST_ROUND_UP_2 (height) / 2);
-      info->offset[3] = info->offset[2] +
-          info->stride[2] * (GST_ROUND_UP_2 (height) / 2);
-      info->size = info->offset[3] + info->stride[0];
-      break;
-    case GST_VIDEO_FORMAT_YUV9:
-    case GST_VIDEO_FORMAT_YVU9:
-      info->stride[0] = GST_ROUND_UP_4 (width);
-      info->stride[1] = GST_ROUND_UP_4 (GST_ROUND_UP_4 (width) / 4);
-      info->stride[2] = info->stride[1];
-      info->offset[0] = 0;
-      info->offset[1] = info->stride[0] * height;
-      info->offset[2] = info->offset[1] +
-          info->stride[1] * (GST_ROUND_UP_4 (height) / 4);
-      info->size = info->offset[2] +
-          info->stride[2] * (GST_ROUND_UP_4 (height) / 4);
-      break;
-    case GST_VIDEO_FORMAT_I420_10LE:
-    case GST_VIDEO_FORMAT_I420_10BE:
-      info->stride[0] = GST_ROUND_UP_4 (width * 2);
-      info->stride[1] = GST_ROUND_UP_4 (width);
-      info->stride[2] = info->stride[1];
-      info->offset[0] = 0;
-      info->offset[1] = info->stride[0] * GST_ROUND_UP_2 (height);
-      info->offset[2] = info->offset[1] +
-          info->stride[1] * (GST_ROUND_UP_2 (height) / 2);
-      info->size = info->offset[2] +
-          info->stride[2] * (GST_ROUND_UP_2 (height) / 2);
-      break;
-    case GST_VIDEO_FORMAT_I422_10LE:
-    case GST_VIDEO_FORMAT_I422_10BE:
-      info->stride[0] = GST_ROUND_UP_4 (width * 2);
-      info->stride[1] = GST_ROUND_UP_4 (width);
-      info->stride[2] = info->stride[1];
-      info->offset[0] = 0;
-      info->offset[1] = info->stride[0] * GST_ROUND_UP_2 (height);
-      info->offset[2] = info->offset[1] +
-          info->stride[1] * GST_ROUND_UP_2 (height);
-      info->size = info->offset[2] + info->stride[2] * GST_ROUND_UP_2 (height);
-      break;
-    case GST_VIDEO_FORMAT_Y444_10LE:
-    case GST_VIDEO_FORMAT_Y444_10BE:
-      info->stride[0] = GST_ROUND_UP_4 (width * 2);
-      info->stride[1] = info->stride[0];
-      info->stride[2] = info->stride[0];
-      info->offset[0] = 0;
-      info->offset[1] = info->stride[0] * height;
-      info->offset[2] = info->offset[1] * 2;
-      info->size = info->stride[0] * height * 3;
-      break;
-    default:
-      if (GST_VIDEO_FORMAT_INFO_IS_COMPLEX (info->finfo))
-        break;
-      GST_ERROR ("invalid format");
-      g_warning ("invalid format");
-      break;
-  }
-  return 0;
-}
-
-/*
- * gst_video_format_from_rgb32_masks:
- * @red_mask: red bit mask
- * @green_mask: green bit mask
- * @blue_mask: blue bit mask
- *
- * Converts red, green, blue bit masks into the corresponding
- * #GstVideoFormat.
- *
- * Since: 0.10.16
- *
- * Returns: the #GstVideoFormat corresponding to the bit masks
- */
-static GstVideoFormat
-gst_video_format_from_rgb32_masks (int red_mask, int green_mask, int blue_mask)
-{
-  if (red_mask == 0xff000000 && green_mask == 0x00ff0000 &&
-      blue_mask == 0x0000ff00) {
-    return GST_VIDEO_FORMAT_RGBx;
-  }
-  if (red_mask == 0x0000ff00 && green_mask == 0x00ff0000 &&
-      blue_mask == 0xff000000) {
-    return GST_VIDEO_FORMAT_BGRx;
-  }
-  if (red_mask == 0x00ff0000 && green_mask == 0x0000ff00 &&
-      blue_mask == 0x000000ff) {
-    return GST_VIDEO_FORMAT_xRGB;
-  }
-  if (red_mask == 0x000000ff && green_mask == 0x0000ff00 &&
-      blue_mask == 0x00ff0000) {
-    return GST_VIDEO_FORMAT_xBGR;
-  }
-
-  return GST_VIDEO_FORMAT_UNKNOWN;
-}
-
-static GstVideoFormat
-gst_video_format_from_rgba32_masks (int red_mask, int green_mask,
-    int blue_mask, int alpha_mask)
-{
-  if (red_mask == 0xff000000 && green_mask == 0x00ff0000 &&
-      blue_mask == 0x0000ff00 && alpha_mask == 0x000000ff) {
-    return GST_VIDEO_FORMAT_RGBA;
-  }
-  if (red_mask == 0x0000ff00 && green_mask == 0x00ff0000 &&
-      blue_mask == 0xff000000 && alpha_mask == 0x000000ff) {
-    return GST_VIDEO_FORMAT_BGRA;
-  }
-  if (red_mask == 0x00ff0000 && green_mask == 0x0000ff00 &&
-      blue_mask == 0x000000ff && alpha_mask == 0xff000000) {
-    return GST_VIDEO_FORMAT_ARGB;
-  }
-  if (red_mask == 0x000000ff && green_mask == 0x0000ff00 &&
-      blue_mask == 0x00ff0000 && alpha_mask == 0xff000000) {
-    return GST_VIDEO_FORMAT_ABGR;
-  }
-
-  return GST_VIDEO_FORMAT_UNKNOWN;
-}
-
-static GstVideoFormat
-gst_video_format_from_rgb24_masks (int red_mask, int green_mask, int blue_mask)
-{
-  if (red_mask == 0xff0000 && green_mask == 0x00ff00 && blue_mask == 0x0000ff) {
-    return GST_VIDEO_FORMAT_RGB;
-  }
-  if (red_mask == 0x0000ff && green_mask == 0x00ff00 && blue_mask == 0xff0000) {
-    return GST_VIDEO_FORMAT_BGR;
-  }
-
-  return GST_VIDEO_FORMAT_UNKNOWN;
-}
-
-static GstVideoFormat
-gst_video_format_from_rgb16_masks (int red_mask, int green_mask, int blue_mask)
-{
-  if (red_mask == GST_VIDEO_COMP1_MASK_16_INT
-      && green_mask == GST_VIDEO_COMP2_MASK_16_INT
-      && blue_mask == GST_VIDEO_COMP3_MASK_16_INT) {
-    return GST_VIDEO_FORMAT_RGB16;
-  }
-  if (red_mask == GST_VIDEO_COMP3_MASK_16_INT
-      && green_mask == GST_VIDEO_COMP2_MASK_16_INT
-      && blue_mask == GST_VIDEO_COMP1_MASK_16_INT) {
-    return GST_VIDEO_FORMAT_BGR16;
-  }
-  if (red_mask == GST_VIDEO_COMP1_MASK_15_INT
-      && green_mask == GST_VIDEO_COMP2_MASK_15_INT
-      && blue_mask == GST_VIDEO_COMP3_MASK_15_INT) {
-    return GST_VIDEO_FORMAT_RGB15;
-  }
-  if (red_mask == GST_VIDEO_COMP3_MASK_15_INT
-      && green_mask == GST_VIDEO_COMP2_MASK_15_INT
-      && blue_mask == GST_VIDEO_COMP1_MASK_15_INT) {
-    return GST_VIDEO_FORMAT_BGR15;
-  }
-
-  return GST_VIDEO_FORMAT_UNKNOWN;
-}
-
-/**
- * gst_video_format_from_masks:
- * @depth: the amount of bits used for a pixel
- * @bpp: the amount of bits used to store a pixel. This value is bigger than
- *   @depth
- * @endianness: the endianness of the masks
- * @red_mask: the red mask
- * @green_mask: the green mask
- * @blue_mask: the blue mask
- * @alpha_mask: the optional alpha mask
- *
- * Find the #GstVideoFormat for the given parameters.
- *
- * Returns: a #GstVideoFormat or GST_VIDEO_FORMAT_UNKNOWN when the parameters to
- * not specify a known format.
- */
-GstVideoFormat
-gst_video_format_from_masks (gint depth, gint bpp, gint endianness,
-    gint red_mask, gint green_mask, gint blue_mask, gint alpha_mask)
-{
-  GstVideoFormat format;
-
-  /* our caps system handles 24/32bpp RGB as big-endian. */
-  if ((bpp == 24 || bpp == 32) && endianness == G_LITTLE_ENDIAN) {
-    red_mask = GUINT32_TO_BE (red_mask);
-    green_mask = GUINT32_TO_BE (green_mask);
-    blue_mask = GUINT32_TO_BE (blue_mask);
-    endianness = G_BIG_ENDIAN;
-    if (bpp == 24) {
-      red_mask >>= 8;
-      green_mask >>= 8;
-      blue_mask >>= 8;
-    }
-  }
-
-  if (depth == 30 && bpp == 32) {
-    format = GST_VIDEO_FORMAT_r210;
-  } else if (depth == 24 && bpp == 32) {
-    format = gst_video_format_from_rgb32_masks (red_mask, green_mask,
-        blue_mask);
-  } else if (depth == 32 && bpp == 32 && alpha_mask) {
-    format = gst_video_format_from_rgba32_masks (red_mask, green_mask,
-        blue_mask, alpha_mask);
-  } else if (depth == 24 && bpp == 24) {
-    format = gst_video_format_from_rgb24_masks (red_mask, green_mask,
-        blue_mask);
-  } else if ((depth == 15 || depth == 16) && bpp == 16 &&
-      endianness == G_BYTE_ORDER) {
-    format = gst_video_format_from_rgb16_masks (red_mask, green_mask,
-        blue_mask);
-  } else if (depth == 8 && bpp == 8) {
-    format = GST_VIDEO_FORMAT_RGB8_PALETTED;
-  } else if (depth == 64 && bpp == 64) {
-    format = gst_video_format_from_rgba32_masks (red_mask, green_mask,
-        blue_mask, alpha_mask);
-    if (format == GST_VIDEO_FORMAT_ARGB) {
-      format = GST_VIDEO_FORMAT_ARGB64;
-    } else {
-      format = GST_VIDEO_FORMAT_UNKNOWN;
-    }
-  } else {
-    format = GST_VIDEO_FORMAT_UNKNOWN;
-  }
-  return format;
-}
-
-/**
- * gst_video_format_is_rgb:
- * @format: a #GstVideoFormat
- *
- * Determine whether the video format is an RGB format.
- *
- * Since: 0.10.16
- *
- * Deprecated: Use #GstVideoFormatInfo and #GST_VIDEO_FORMAT_INFO_IS_RGB
- *
- * Returns: TRUE if @format represents RGB video
- */
-gboolean
-gst_video_format_is_rgb (GstVideoFormat format)
-{
-  if (format == GST_VIDEO_FORMAT_UNKNOWN || format >= G_N_ELEMENTS (formats))
-    return FALSE;
-
-  return GST_VIDEO_FORMAT_INFO_IS_RGB (&formats[format].info);
-}
-
-/**
- * gst_video_format_is_yuv:
- * @format: a #GstVideoFormat
- *
- * Determine whether the video format is a YUV format.
- *
- * Since: 0.10.16
- *
- * Deprecated: Use #GstVideoFormatInfo and #GST_VIDEO_FORMAT_INFO_IS_YUV
- *
- * Returns: TRUE if @format represents YUV video
- */
-gboolean
-gst_video_format_is_yuv (GstVideoFormat format)
-{
-  if (format == GST_VIDEO_FORMAT_UNKNOWN || format >= G_N_ELEMENTS (formats))
-    return FALSE;
-
-  return GST_VIDEO_FORMAT_INFO_IS_YUV (&formats[format].info);
-}
-
-/**
- * gst_video_format_is_gray:
- * @format: a #GstVideoFormat
- *
- * Determine whether the video format is a grayscale format.
- *
- * Since: 0.10.29
- *
- * Deprecated: Use #GstVideoFormatInfo and #GST_VIDEO_FORMAT_INFO_IS_GRAY
- *
- * Returns: TRUE if @format represents grayscale video
- */
-gboolean
-gst_video_format_is_gray (GstVideoFormat format)
-{
-  if (format == GST_VIDEO_FORMAT_UNKNOWN || format >= G_N_ELEMENTS (formats))
-    return FALSE;
-
-  return GST_VIDEO_FORMAT_INFO_IS_GRAY (&formats[format].info);
-}
-
-/**
- * gst_video_format_has_alpha:
- * @format: a #GstVideoFormat
- *
- * Returns TRUE or FALSE depending on if the video format provides an
- * alpha channel.
- *
- * Since: 0.10.16
- *
- * Deprecated: Use #GstVideoFormatInfo and #GST_VIDEO_FORMAT_INFO_HAS_ALPHA
- *
- * Returns: TRUE if @format has an alpha channel
- */
-gboolean
-gst_video_format_has_alpha (GstVideoFormat format)
-{
-  if (format == GST_VIDEO_FORMAT_UNKNOWN || format >= G_N_ELEMENTS (formats))
-    return FALSE;
-
-  return GST_VIDEO_FORMAT_INFO_HAS_ALPHA (&formats[format].info);
-}
-
-/**
- * gst_video_format_get_component_depth:
- * @format: a #GstVideoFormat
- * @component: the video component (e.g. 0 for 'R' in RGB)
- *
- * Returns the number of bits used to encode an individual pixel of
- * a given @component.  Typically this is 8, although higher and lower
- * values are possible for some formats.
- *
- * Since: 0.10.33
- *
- * Returns: depth of component
- */
-int
-gst_video_format_get_component_depth (GstVideoFormat format, int component)
-{
-  if (format == GST_VIDEO_FORMAT_UNKNOWN || format >= G_N_ELEMENTS (formats))
-    return 8;
-
-  return GST_VIDEO_FORMAT_INFO_DEPTH (&formats[format].info, component);
-}
-
-/**
- * gst_video_format_get_row_stride:
- * @format: a #GstVideoFormat
- * @component: the component index
- * @width: the width of video
- *
- * Calculates the row stride (number of bytes from one row of pixels to
- * the next) for the video component with an index of @component.  For
- * YUV video, Y, U, and V have component indices of 0, 1, and 2,
- * respectively.  For RGB video, R, G, and B have component indicies of
- * 0, 1, and 2, respectively.  Alpha channels, if present, have a component
- * index of 3.  The @width parameter always represents the width of the
- * video, not the component.
- *
- * Since: 0.10.16
- *
- * Returns: row stride of component @component
- */
-int
-gst_video_format_get_row_stride (GstVideoFormat format, int component,
-    int width)
-{
-  g_return_val_if_fail (format != GST_VIDEO_FORMAT_UNKNOWN, 0);
-  g_return_val_if_fail (component >= 0 && component <= 3, 0);
-  g_return_val_if_fail (width > 0, 0);
-
-  switch (format) {
-    case GST_VIDEO_FORMAT_I420:
-    case GST_VIDEO_FORMAT_YV12:
-      if (component == 0) {
-        return GST_ROUND_UP_4 (width);
-      } else {
-        return GST_ROUND_UP_4 (GST_ROUND_UP_2 (width) / 2);
-      }
-    case GST_VIDEO_FORMAT_YUY2:
-    case GST_VIDEO_FORMAT_YVYU:
-    case GST_VIDEO_FORMAT_UYVY:
-      return GST_ROUND_UP_4 (width * 2);
-    case GST_VIDEO_FORMAT_AYUV:
-    case GST_VIDEO_FORMAT_RGBx:
-    case GST_VIDEO_FORMAT_BGRx:
-    case GST_VIDEO_FORMAT_xRGB:
-    case GST_VIDEO_FORMAT_xBGR:
-    case GST_VIDEO_FORMAT_RGBA:
-    case GST_VIDEO_FORMAT_BGRA:
-    case GST_VIDEO_FORMAT_ARGB:
-    case GST_VIDEO_FORMAT_ABGR:
-    case GST_VIDEO_FORMAT_r210:
-      return width * 4;
-    case GST_VIDEO_FORMAT_RGB16:
-    case GST_VIDEO_FORMAT_BGR16:
-    case GST_VIDEO_FORMAT_RGB15:
-    case GST_VIDEO_FORMAT_BGR15:
-      return GST_ROUND_UP_4 (width * 2);
-    case GST_VIDEO_FORMAT_RGB:
-    case GST_VIDEO_FORMAT_BGR:
-    case GST_VIDEO_FORMAT_v308:
-      return GST_ROUND_UP_4 (width * 3);
-    case GST_VIDEO_FORMAT_Y41B:
-      if (component == 0) {
-        return GST_ROUND_UP_4 (width);
-      } else {
-        return GST_ROUND_UP_16 (width) / 4;
-      }
-    case GST_VIDEO_FORMAT_Y42B:
-      if (component == 0) {
-        return GST_ROUND_UP_4 (width);
-      } else {
-        return GST_ROUND_UP_8 (width) / 2;
-      }
-    case GST_VIDEO_FORMAT_Y444:
-      return GST_ROUND_UP_4 (width);
-    case GST_VIDEO_FORMAT_v210:
-      return ((width + 47) / 48) * 128;
-    case GST_VIDEO_FORMAT_v216:
-      return GST_ROUND_UP_8 (width * 4);
-    case GST_VIDEO_FORMAT_NV12:
-    case GST_VIDEO_FORMAT_NV21:
-      return GST_ROUND_UP_4 (width);
-    case GST_VIDEO_FORMAT_GRAY8:
-    case GST_VIDEO_FORMAT_Y800:
-      return GST_ROUND_UP_4 (width);
-    case GST_VIDEO_FORMAT_GRAY16_BE:
-    case GST_VIDEO_FORMAT_GRAY16_LE:
-    case GST_VIDEO_FORMAT_Y16:
-      return GST_ROUND_UP_4 (width * 2);
-    case GST_VIDEO_FORMAT_UYVP:
-      return GST_ROUND_UP_4 ((width * 2 * 5 + 3) / 4);
-    case GST_VIDEO_FORMAT_A420:
-      if (component == 0 || component == 3) {
-        return GST_ROUND_UP_4 (width);
-      } else {
-        return GST_ROUND_UP_4 (GST_ROUND_UP_2 (width) / 2);
-      }
-    case GST_VIDEO_FORMAT_RGB8_PALETTED:
-      return GST_ROUND_UP_4 (width);
-    case GST_VIDEO_FORMAT_YUV9:
-    case GST_VIDEO_FORMAT_YVU9:
-      if (component == 0) {
-        return GST_ROUND_UP_4 (width);
-      } else {
-        return GST_ROUND_UP_4 (GST_ROUND_UP_4 (width) / 4);
-      }
-    case GST_VIDEO_FORMAT_IYU1:
-      return GST_ROUND_UP_4 (GST_ROUND_UP_4 (width) +
-          GST_ROUND_UP_4 (width) / 2);
-    case GST_VIDEO_FORMAT_ARGB64:
-    case GST_VIDEO_FORMAT_AYUV64:
-      return width * 8;
-    case GST_VIDEO_FORMAT_I420_10BE:
-    case GST_VIDEO_FORMAT_I420_10LE:
-      if (component == 0) {
-        return GST_ROUND_UP_4 (2 * width);
-      } else {
-        return GST_ROUND_UP_4 (width);
-      }
-    case GST_VIDEO_FORMAT_I422_10BE:
-    case GST_VIDEO_FORMAT_I422_10LE:
-      if (component == 0) {
-        return GST_ROUND_UP_4 (2 * width);
-      } else {
-        return GST_ROUND_UP_4 (width);
-      }
-    case GST_VIDEO_FORMAT_Y444_10BE:
-    case GST_VIDEO_FORMAT_Y444_10LE:
-      return GST_ROUND_UP_4 (2 * width);
-    default:
-      return 0;
-  }
-}
-
-/**
- * gst_video_format_get_pixel_stride:
- * @format: a #GstVideoFormat
- * @component: the component index
- *
- * Calculates the pixel stride (number of bytes from one pixel to the
- * pixel to its immediate left) for the video component with an index
- * of @component.  See @gst_video_format_get_row_stride for a description
- * of the component index.
- *
- * Since: 0.10.16
- *
- * Returns: pixel stride of component @component
- */
-int
-gst_video_format_get_pixel_stride (GstVideoFormat format, int component)
-{
-  g_return_val_if_fail (format != GST_VIDEO_FORMAT_UNKNOWN, 0);
-  g_return_val_if_fail (component >= 0 && component <= 3, 0);
-
-  if (format >= G_N_ELEMENTS (formats))
-    return 0;
-
-  return GST_VIDEO_FORMAT_INFO_PSTRIDE (&formats[format].info, component);
-}
-
-/**
- * gst_video_format_get_component_width:
- * @format: a #GstVideoFormat
- * @component: the component index
- * @width: the width of video
- *
- * Calculates the width of the component.  See
- * @gst_video_format_get_row_stride for a description
- * of the component index.
- *
- * Since: 0.10.16
- *
- * Returns: width of component @component
- */
-int
-gst_video_format_get_component_width (GstVideoFormat format,
-    int component, int width)
-{
-  g_return_val_if_fail (format != GST_VIDEO_FORMAT_UNKNOWN, 0);
-  g_return_val_if_fail (component >= 0 && component <= 3, 0);
-  g_return_val_if_fail (width > 0, 0);
-
-  switch (format) {
-    case GST_VIDEO_FORMAT_I420:
-    case GST_VIDEO_FORMAT_YV12:
-    case GST_VIDEO_FORMAT_YUY2:
-    case GST_VIDEO_FORMAT_YVYU:
-    case GST_VIDEO_FORMAT_UYVY:
-    case GST_VIDEO_FORMAT_Y42B:
-    case GST_VIDEO_FORMAT_v210:
-    case GST_VIDEO_FORMAT_v216:
-    case GST_VIDEO_FORMAT_NV12:
-    case GST_VIDEO_FORMAT_NV21:
-    case GST_VIDEO_FORMAT_UYVP:
-    case GST_VIDEO_FORMAT_I422_10BE:
-    case GST_VIDEO_FORMAT_I422_10LE:
-    case GST_VIDEO_FORMAT_I420_10BE:
-    case GST_VIDEO_FORMAT_I420_10LE:
-      if (component == 0) {
-        return width;
-      } else {
-        return GST_ROUND_UP_2 (width) / 2;
-      }
-    case GST_VIDEO_FORMAT_Y41B:
-    case GST_VIDEO_FORMAT_YUV9:
-    case GST_VIDEO_FORMAT_YVU9:
-    case GST_VIDEO_FORMAT_IYU1:
-      if (component == 0) {
-        return width;
-      } else {
-        return GST_ROUND_UP_4 (width) / 4;
-      }
-    case GST_VIDEO_FORMAT_AYUV:
-    case GST_VIDEO_FORMAT_RGBx:
-    case GST_VIDEO_FORMAT_BGRx:
-    case GST_VIDEO_FORMAT_xRGB:
-    case GST_VIDEO_FORMAT_xBGR:
-    case GST_VIDEO_FORMAT_RGBA:
-    case GST_VIDEO_FORMAT_BGRA:
-    case GST_VIDEO_FORMAT_ARGB:
-    case GST_VIDEO_FORMAT_ABGR:
-    case GST_VIDEO_FORMAT_RGB:
-    case GST_VIDEO_FORMAT_BGR:
-    case GST_VIDEO_FORMAT_RGB16:
-    case GST_VIDEO_FORMAT_BGR16:
-    case GST_VIDEO_FORMAT_RGB15:
-    case GST_VIDEO_FORMAT_BGR15:
-    case GST_VIDEO_FORMAT_Y444:
-    case GST_VIDEO_FORMAT_v308:
-    case GST_VIDEO_FORMAT_GRAY8:
-    case GST_VIDEO_FORMAT_GRAY16_BE:
-    case GST_VIDEO_FORMAT_GRAY16_LE:
-    case GST_VIDEO_FORMAT_Y800:
-    case GST_VIDEO_FORMAT_Y16:
-    case GST_VIDEO_FORMAT_RGB8_PALETTED:
-    case GST_VIDEO_FORMAT_ARGB64:
-    case GST_VIDEO_FORMAT_AYUV64:
-    case GST_VIDEO_FORMAT_Y444_10BE:
-    case GST_VIDEO_FORMAT_Y444_10LE:
-    case GST_VIDEO_FORMAT_r210:
-      return width;
-    case GST_VIDEO_FORMAT_A420:
-      if (component == 0 || component == 3) {
-        return width;
-      } else {
-        return GST_ROUND_UP_2 (width) / 2;
-      }
-    default:
-      return 0;
-  }
-}
-
-/**
- * gst_video_format_get_component_height:
- * @format: a #GstVideoFormat
- * @component: the component index
- * @height: the height of video
- *
- * Calculates the height of the component.  See
- * @gst_video_format_get_row_stride for a description
- * of the component index.
- *
- * Since: 0.10.16
- *
- * Returns: height of component @component
- */
-int
-gst_video_format_get_component_height (GstVideoFormat format,
-    int component, int height)
-{
-  g_return_val_if_fail (format != GST_VIDEO_FORMAT_UNKNOWN, 0);
-  g_return_val_if_fail (component >= 0 && component <= 3, 0);
-  g_return_val_if_fail (height > 0, 0);
-
-  switch (format) {
-    case GST_VIDEO_FORMAT_I420:
-    case GST_VIDEO_FORMAT_YV12:
-    case GST_VIDEO_FORMAT_NV12:
-    case GST_VIDEO_FORMAT_NV21:
-    case GST_VIDEO_FORMAT_I420_10BE:
-    case GST_VIDEO_FORMAT_I420_10LE:
-      if (component == 0) {
-        return height;
-      } else {
-        return GST_ROUND_UP_2 (height) / 2;
-      }
-    case GST_VIDEO_FORMAT_Y41B:
-    case GST_VIDEO_FORMAT_Y42B:
-    case GST_VIDEO_FORMAT_YUY2:
-    case GST_VIDEO_FORMAT_YVYU:
-    case GST_VIDEO_FORMAT_UYVY:
-    case GST_VIDEO_FORMAT_AYUV:
-    case GST_VIDEO_FORMAT_RGBx:
-    case GST_VIDEO_FORMAT_BGRx:
-    case GST_VIDEO_FORMAT_xRGB:
-    case GST_VIDEO_FORMAT_xBGR:
-    case GST_VIDEO_FORMAT_RGBA:
-    case GST_VIDEO_FORMAT_BGRA:
-    case GST_VIDEO_FORMAT_ARGB:
-    case GST_VIDEO_FORMAT_ABGR:
-    case GST_VIDEO_FORMAT_RGB:
-    case GST_VIDEO_FORMAT_BGR:
-    case GST_VIDEO_FORMAT_RGB16:
-    case GST_VIDEO_FORMAT_BGR16:
-    case GST_VIDEO_FORMAT_RGB15:
-    case GST_VIDEO_FORMAT_BGR15:
-    case GST_VIDEO_FORMAT_Y444:
-    case GST_VIDEO_FORMAT_v210:
-    case GST_VIDEO_FORMAT_v216:
-    case GST_VIDEO_FORMAT_v308:
-    case GST_VIDEO_FORMAT_GRAY8:
-    case GST_VIDEO_FORMAT_GRAY16_BE:
-    case GST_VIDEO_FORMAT_GRAY16_LE:
-    case GST_VIDEO_FORMAT_Y800:
-    case GST_VIDEO_FORMAT_Y16:
-    case GST_VIDEO_FORMAT_UYVP:
-    case GST_VIDEO_FORMAT_RGB8_PALETTED:
-    case GST_VIDEO_FORMAT_IYU1:
-    case GST_VIDEO_FORMAT_ARGB64:
-    case GST_VIDEO_FORMAT_AYUV64:
-    case GST_VIDEO_FORMAT_r210:
-    case GST_VIDEO_FORMAT_Y444_10BE:
-    case GST_VIDEO_FORMAT_Y444_10LE:
-    case GST_VIDEO_FORMAT_I422_10BE:
-    case GST_VIDEO_FORMAT_I422_10LE:
-      return height;
-    case GST_VIDEO_FORMAT_A420:
-      if (component == 0 || component == 3) {
-        return height;
-      } else {
-        return GST_ROUND_UP_2 (height) / 2;
-      }
-    case GST_VIDEO_FORMAT_YUV9:
-    case GST_VIDEO_FORMAT_YVU9:
-      if (component == 0) {
-        return height;
-      } else {
-        return GST_ROUND_UP_4 (height) / 4;
-      }
-    default:
-      return 0;
-  }
-}
-
-/**
- * gst_video_format_get_component_offset:
- * @format: a #GstVideoFormat
- * @component: the component index
- * @width: the width of video
- * @height: the height of video
- *
- * Calculates the offset (in bytes) of the first pixel of the component
- * with index @component.  For packed formats, this will typically be a
- * small integer (0, 1, 2, 3).  For planar formats, this will be a
- * (relatively) large offset to the beginning of the second or third
- * component planes.  See @gst_video_format_get_row_stride for a description
- * of the component index.
- *
- * Since: 0.10.16
- *
- * Returns: offset of component @component
- */
-int
-gst_video_format_get_component_offset (GstVideoFormat format,
-    int component, int width, int height)
-{
-  g_return_val_if_fail (format != GST_VIDEO_FORMAT_UNKNOWN, 0);
-  g_return_val_if_fail (component >= 0 && component <= 3, 0);
-  g_return_val_if_fail ((!gst_video_format_is_yuv (format)) || (width > 0
-          && height > 0), 0);
-
-  switch (format) {
-    case GST_VIDEO_FORMAT_I420:
-      if (component == 0)
-        return 0;
-      if (component == 1)
-        return GST_ROUND_UP_4 (width) * GST_ROUND_UP_2 (height);
-      if (component == 2) {
-        return GST_ROUND_UP_4 (width) * GST_ROUND_UP_2 (height) +
-            GST_ROUND_UP_4 (GST_ROUND_UP_2 (width) / 2) *
-            (GST_ROUND_UP_2 (height) / 2);
-      }
-      break;
-    case GST_VIDEO_FORMAT_YV12:        /* same as I420, but components 1+2 swapped */
-      if (component == 0)
-        return 0;
-      if (component == 2)
-        return GST_ROUND_UP_4 (width) * GST_ROUND_UP_2 (height);
-      if (component == 1) {
-        return GST_ROUND_UP_4 (width) * GST_ROUND_UP_2 (height) +
-            GST_ROUND_UP_4 (GST_ROUND_UP_2 (width) / 2) *
-            (GST_ROUND_UP_2 (height) / 2);
-      }
-      break;
-    case GST_VIDEO_FORMAT_YUY2:
-      if (component == 0)
-        return 0;
-      if (component == 1)
-        return 1;
-      if (component == 2)
-        return 3;
-      break;
-    case GST_VIDEO_FORMAT_YVYU:
-      if (component == 0)
-        return 0;
-      if (component == 1)
-        return 3;
-      if (component == 2)
-        return 1;
-      break;
-    case GST_VIDEO_FORMAT_UYVY:
-      if (component == 0)
-        return 1;
-      if (component == 1)
-        return 0;
-      if (component == 2)
-        return 2;
-      break;
-    case GST_VIDEO_FORMAT_AYUV:
-      if (component == 0)
-        return 1;
-      if (component == 1)
-        return 2;
-      if (component == 2)
-        return 3;
-      if (component == 3)
-        return 0;
-      break;
-    case GST_VIDEO_FORMAT_RGBx:
-    case GST_VIDEO_FORMAT_RGBA:
-      if (component == 0)
-        return 0;
-      if (component == 1)
-        return 1;
-      if (component == 2)
-        return 2;
-      if (component == 3)
-        return 3;
-      break;
-    case GST_VIDEO_FORMAT_BGRx:
-    case GST_VIDEO_FORMAT_BGRA:
-      if (component == 0)
-        return 2;
-      if (component == 1)
-        return 1;
-      if (component == 2)
-        return 0;
-      if (component == 3)
-        return 3;
-      break;
-    case GST_VIDEO_FORMAT_xRGB:
-    case GST_VIDEO_FORMAT_ARGB:
-      if (component == 0)
-        return 1;
-      if (component == 1)
-        return 2;
-      if (component == 2)
-        return 3;
-      if (component == 3)
-        return 0;
-      break;
-    case GST_VIDEO_FORMAT_xBGR:
-    case GST_VIDEO_FORMAT_ABGR:
-      if (component == 0)
-        return 3;
-      if (component == 1)
-        return 2;
-      if (component == 2)
-        return 1;
-      if (component == 3)
-        return 0;
-      break;
-    case GST_VIDEO_FORMAT_RGB:
-    case GST_VIDEO_FORMAT_v308:
-      if (component == 0)
-        return 0;
-      if (component == 1)
-        return 1;
-      if (component == 2)
-        return 2;
-      break;
-    case GST_VIDEO_FORMAT_BGR:
-      if (component == 0)
-        return 2;
-      if (component == 1)
-        return 1;
-      if (component == 2)
-        return 0;
-      break;
-    case GST_VIDEO_FORMAT_Y41B:
-      if (component == 0)
-        return 0;
-      if (component == 1)
-        return GST_ROUND_UP_4 (width) * height;
-      if (component == 2)
-        return (GST_ROUND_UP_4 (width) +
-            (GST_ROUND_UP_16 (width) / 4)) * height;
-      break;
-    case GST_VIDEO_FORMAT_Y42B:
-      if (component == 0)
-        return 0;
-      if (component == 1)
-        return GST_ROUND_UP_4 (width) * height;
-      if (component == 2)
-        return (GST_ROUND_UP_4 (width) + (GST_ROUND_UP_8 (width) / 2)) * height;
-      break;
-    case GST_VIDEO_FORMAT_Y444:
-      return GST_ROUND_UP_4 (width) * height * component;
-    case GST_VIDEO_FORMAT_v210:
-    case GST_VIDEO_FORMAT_r210:
-      /* v210 is bit-packed, so this doesn't make sense */
-      return 0;
-    case GST_VIDEO_FORMAT_v216:
-      if (component == 0)
-        return 0;
-      if (component == 1)
-        return 2;
-      if (component == 2)
-        return 6;
-      break;
-    case GST_VIDEO_FORMAT_NV12:
-      if (component == 0)
-        return 0;
-      if (component == 1)
-        return GST_ROUND_UP_4 (width) * GST_ROUND_UP_2 (height);
-      if (component == 2)
-        return GST_ROUND_UP_4 (width) * GST_ROUND_UP_2 (height) + 1;
-      break;
-    case GST_VIDEO_FORMAT_NV21:
-      if (component == 0)
-        return 0;
-      if (component == 1)
-        return GST_ROUND_UP_4 (width) * GST_ROUND_UP_2 (height) + 1;
-      if (component == 2)
-        return GST_ROUND_UP_4 (width) * GST_ROUND_UP_2 (height);
-      break;
-    case GST_VIDEO_FORMAT_GRAY8:
-    case GST_VIDEO_FORMAT_GRAY16_BE:
-    case GST_VIDEO_FORMAT_GRAY16_LE:
-    case GST_VIDEO_FORMAT_Y800:
-    case GST_VIDEO_FORMAT_Y16:
-      return 0;
-    case GST_VIDEO_FORMAT_UYVP:
-      /* UYVP is bit-packed, so this doesn't make sense */
-      return 0;
-    case GST_VIDEO_FORMAT_A420:
-      if (component == 0)
-        return 0;
-      if (component == 1)
-        return GST_ROUND_UP_4 (width) * GST_ROUND_UP_2 (height);
-      if (component == 2) {
-        return GST_ROUND_UP_4 (width) * GST_ROUND_UP_2 (height) +
-            GST_ROUND_UP_4 (GST_ROUND_UP_2 (width) / 2) *
-            (GST_ROUND_UP_2 (height) / 2);
-      }
-      if (component == 3) {
-        return GST_ROUND_UP_4 (width) * GST_ROUND_UP_2 (height) +
-            2 * GST_ROUND_UP_4 (GST_ROUND_UP_2 (width) / 2) *
-            (GST_ROUND_UP_2 (height) / 2);
-      }
-      break;
-    case GST_VIDEO_FORMAT_RGB8_PALETTED:
-      return 0;
-    case GST_VIDEO_FORMAT_YUV9:
-      if (component == 0)
-        return 0;
-      if (component == 1)
-        return GST_ROUND_UP_4 (width) * height;
-      if (component == 2) {
-        return GST_ROUND_UP_4 (width) * height +
-            GST_ROUND_UP_4 (GST_ROUND_UP_4 (width) / 4) *
-            (GST_ROUND_UP_4 (height) / 4);
-      }
-      break;
-    case GST_VIDEO_FORMAT_YVU9:
-      if (component == 0)
-        return 0;
-      if (component == 1) {
-        return GST_ROUND_UP_4 (width) * height +
-            GST_ROUND_UP_4 (GST_ROUND_UP_4 (width) / 4) *
-            (GST_ROUND_UP_4 (height) / 4);
-      }
-      if (component == 2)
-        return GST_ROUND_UP_4 (width) * height;
-      break;
-    case GST_VIDEO_FORMAT_IYU1:
-      if (component == 0)
-        return 1;
-      if (component == 1)
-        return 0;
-      if (component == 2)
-        return 4;
-      break;
-    case GST_VIDEO_FORMAT_ARGB64:
-    case GST_VIDEO_FORMAT_AYUV64:
-      if (component == 0)
-        return 2;
-      if (component == 1)
-        return 4;
-      if (component == 2)
-        return 6;
-      if (component == 3)
-        return 0;
-      break;
-    case GST_VIDEO_FORMAT_I420_10BE:
-    case GST_VIDEO_FORMAT_I420_10LE:
-      if (component == 0)
-        return 0;
-      if (component == 1)
-        return GST_ROUND_UP_4 (2 * width) * GST_ROUND_UP_2 (height);
-      if (component == 2) {
-        return GST_ROUND_UP_4 (2 * width) * GST_ROUND_UP_2 (height) +
-            GST_ROUND_UP_4 (width) * (GST_ROUND_UP_2 (height) / 2);
-      }
-    case GST_VIDEO_FORMAT_I422_10BE:
-    case GST_VIDEO_FORMAT_I422_10LE:
-      if (component == 0)
-        return 0;
-      if (component == 1)
-        return GST_ROUND_UP_4 (2 * width) * GST_ROUND_UP_2 (height);
-      if (component == 2) {
-        return GST_ROUND_UP_4 (2 * width) * GST_ROUND_UP_2 (height) +
-            GST_ROUND_UP_4 (width) * GST_ROUND_UP_2 (height);
-      }
-      break;
-    case GST_VIDEO_FORMAT_Y444_10BE:
-    case GST_VIDEO_FORMAT_Y444_10LE:
-      return GST_ROUND_UP_4 (2 * width) * height * component;
-    default:
-      break;
-  }
-  GST_WARNING ("unhandled format %s or component %d",
-      gst_video_format_to_string (format), component);
-  return 0;
-}
-
-/**
- * gst_video_format_get_size:
- * @format: a #GstVideoFormat
- * @width: the width of video
- * @height: the height of video
- *
- * Calculates the total number of bytes in the raw video format.  This
- * number should be used when allocating a buffer for raw video.
- *
- * Since: 0.10.16
- *
- * Returns: size (in bytes) of raw video format
- */
-int
-gst_video_format_get_size (GstVideoFormat format, int width, int height)
-{
-  int size;
-
-  g_return_val_if_fail (format != GST_VIDEO_FORMAT_UNKNOWN, 0);
-  g_return_val_if_fail (width > 0 && height > 0, 0);
-
-  switch (format) {
-    case GST_VIDEO_FORMAT_I420:
-    case GST_VIDEO_FORMAT_YV12:
-      size = GST_ROUND_UP_4 (width) * GST_ROUND_UP_2 (height);
-      size += GST_ROUND_UP_4 (GST_ROUND_UP_2 (width) / 2) *
-          (GST_ROUND_UP_2 (height) / 2) * 2;
-      return size;
-    case GST_VIDEO_FORMAT_IYU1:
-      return GST_ROUND_UP_4 (GST_ROUND_UP_4 (width) +
-          GST_ROUND_UP_4 (width) / 2) * height;
-    case GST_VIDEO_FORMAT_YUY2:
-    case GST_VIDEO_FORMAT_YVYU:
-    case GST_VIDEO_FORMAT_UYVY:
-      return GST_ROUND_UP_4 (width * 2) * height;
-    case GST_VIDEO_FORMAT_AYUV:
-    case GST_VIDEO_FORMAT_RGBx:
-    case GST_VIDEO_FORMAT_BGRx:
-    case GST_VIDEO_FORMAT_xRGB:
-    case GST_VIDEO_FORMAT_xBGR:
-    case GST_VIDEO_FORMAT_RGBA:
-    case GST_VIDEO_FORMAT_BGRA:
-    case GST_VIDEO_FORMAT_ARGB:
-    case GST_VIDEO_FORMAT_ABGR:
-    case GST_VIDEO_FORMAT_r210:
-      return width * 4 * height;
-    case GST_VIDEO_FORMAT_RGB16:
-    case GST_VIDEO_FORMAT_BGR16:
-    case GST_VIDEO_FORMAT_RGB15:
-    case GST_VIDEO_FORMAT_BGR15:
-      return GST_ROUND_UP_4 (width * 2) * height;
-    case GST_VIDEO_FORMAT_RGB:
-    case GST_VIDEO_FORMAT_BGR:
-    case GST_VIDEO_FORMAT_v308:
-      return GST_ROUND_UP_4 (width * 3) * height;
-    case GST_VIDEO_FORMAT_Y41B:
-      /* simplification of ROUNDUP4(w)*h + 2*((ROUNDUP16(w)/4)*h */
-      return (GST_ROUND_UP_4 (width) + (GST_ROUND_UP_16 (width) / 2)) * height;
-    case GST_VIDEO_FORMAT_Y42B:
-      /* simplification of ROUNDUP4(w)*h + 2*(ROUNDUP8(w)/2)*h */
-      return (GST_ROUND_UP_4 (width) + GST_ROUND_UP_8 (width)) * height;
-    case GST_VIDEO_FORMAT_Y444:
-      return GST_ROUND_UP_4 (width) * height * 3;
-    case GST_VIDEO_FORMAT_v210:
-      return ((width + 47) / 48) * 128 * height;
-    case GST_VIDEO_FORMAT_v216:
-      return GST_ROUND_UP_8 (width * 4) * height;
-    case GST_VIDEO_FORMAT_NV12:
-    case GST_VIDEO_FORMAT_NV21:
-      return GST_ROUND_UP_4 (width) * GST_ROUND_UP_2 (height) * 3 / 2;
-    case GST_VIDEO_FORMAT_GRAY8:
-    case GST_VIDEO_FORMAT_Y800:
-    case GST_VIDEO_FORMAT_RGB8_PALETTED:
-      return GST_ROUND_UP_4 (width) * height;
-    case GST_VIDEO_FORMAT_GRAY16_BE:
-    case GST_VIDEO_FORMAT_GRAY16_LE:
-    case GST_VIDEO_FORMAT_Y16:
-      return GST_ROUND_UP_4 (width * 2) * height;
-    case GST_VIDEO_FORMAT_UYVP:
-      return GST_ROUND_UP_4 ((width * 2 * 5 + 3) / 4) * height;
-    case GST_VIDEO_FORMAT_A420:
-      size = 2 * GST_ROUND_UP_4 (width) * GST_ROUND_UP_2 (height);
-      size += GST_ROUND_UP_4 (GST_ROUND_UP_2 (width) / 2) *
-          (GST_ROUND_UP_2 (height) / 2) * 2;
-      return size;
-    case GST_VIDEO_FORMAT_YUV9:
-    case GST_VIDEO_FORMAT_YVU9:
-      size = GST_ROUND_UP_4 (width) * height;
-      size += GST_ROUND_UP_4 (GST_ROUND_UP_4 (width) / 4) *
-          (GST_ROUND_UP_4 (height) / 4) * 2;
-      return size;
-    case GST_VIDEO_FORMAT_ARGB64:
-    case GST_VIDEO_FORMAT_AYUV64:
-      return width * 8 * height;
-    case GST_VIDEO_FORMAT_I420_10BE:
-    case GST_VIDEO_FORMAT_I420_10LE:
-      size = GST_ROUND_UP_4 (2 * width) * GST_ROUND_UP_2 (height);
-      size += GST_ROUND_UP_4 (width) * (GST_ROUND_UP_2 (height) / 2) * 2;
-      return size;
-    case GST_VIDEO_FORMAT_I422_10BE:
-    case GST_VIDEO_FORMAT_I422_10LE:
-      size = GST_ROUND_UP_4 (2 * width) * GST_ROUND_UP_2 (height);
-      size += GST_ROUND_UP_4 (width) * GST_ROUND_UP_2 (height) * 2;
-      return size;
-    case GST_VIDEO_FORMAT_Y444_10BE:
-    case GST_VIDEO_FORMAT_Y444_10LE:
-      return 2 * GST_ROUND_UP_4 (width) * height * 3;
-    default:
-      return 0;
-  }
-}
-
-/**
- * gst_video_get_size_from_caps:
- * @caps: a pointer to #GstCaps
- * @size: a pointer to a gint that will be assigned the size (in bytes) of a video frame with the given caps
- *
- * Calculates the total number of bytes in the raw video format for the given
- * caps.  This number should be used when allocating a buffer for raw video.
- *
- * Since: 0.10.36
- *
- * Returns: %TRUE if the size could be calculated from the caps
- */
-gboolean
-gst_video_get_size_from_caps (const GstCaps * caps, gint * size)
-{
-  GstVideoFormat format = 0;
-  gint width = 0, height = 0;
-
-  g_return_val_if_fail (gst_caps_is_fixed (caps), FALSE);
-  g_return_val_if_fail (size != NULL, FALSE);
-
-  if (gst_video_format_parse_caps (caps, &format, &width, &height) == FALSE) {
-    GST_WARNING ("Could not parse caps: %" GST_PTR_FORMAT, caps);
-    return FALSE;
-  }
-
-  *size = gst_video_format_get_size (format, width, height);
-  return TRUE;
-}
-
-/**
- * gst_video_format_convert:
- * @format: a #GstVideoFormat
- * @width: the width of video
- * @height: the height of video
- * @fps_n: frame rate numerator
- * @fps_d: frame rate denominator
- * @src_format: #GstFormat of the @src_value
- * @src_value: value to convert
- * @dest_format: #GstFormat of the @dest_value
- * @dest_value: pointer to destination value
- *
- * Converts among various #GstFormat types.  This function handles
- * GST_FORMAT_BYTES, GST_FORMAT_TIME, and GST_FORMAT_DEFAULT.  For
- * raw video, GST_FORMAT_DEFAULT corresponds to video frames.  This
- * function can be to handle pad queries of the type GST_QUERY_CONVERT.
- *
- * Since: 0.10.16
- *
- * Returns: TRUE if the conversion was successful.
- */
-gboolean
-gst_video_format_convert (GstVideoFormat format, int width, int height,
-    int fps_n, int fps_d,
-    GstFormat src_format, gint64 src_value,
-    GstFormat dest_format, gint64 * dest_value)
-{
-  gboolean ret = FALSE;
-  int size;
-
-  g_return_val_if_fail (format != GST_VIDEO_FORMAT_UNKNOWN, 0);
-  g_return_val_if_fail (width > 0 && height > 0, 0);
-
-  size = gst_video_format_get_size (format, width, height);
-
-  GST_DEBUG ("converting value %" G_GINT64_FORMAT " from %s to %s",
-      src_value, gst_format_get_name (src_format),
-      gst_format_get_name (dest_format));
-
-  if (src_format == dest_format) {
-    *dest_value = src_value;
-    ret = TRUE;
-    goto done;
-  }
-
-  if (src_value == -1) {
-    *dest_value = -1;
-    ret = TRUE;
-    goto done;
-  }
-
-  /* bytes to frames */
-  if (src_format == GST_FORMAT_BYTES && dest_format == GST_FORMAT_DEFAULT) {
-    if (size != 0) {
-      *dest_value = gst_util_uint64_scale_int (src_value, 1, size);
-    } else {
-      GST_ERROR ("blocksize is 0");
-      *dest_value = 0;
-    }
-    ret = TRUE;
-    goto done;
-  }
-
-  /* frames to bytes */
-  if (src_format == GST_FORMAT_DEFAULT && dest_format == GST_FORMAT_BYTES) {
-    *dest_value = gst_util_uint64_scale_int (src_value, size, 1);
-    ret = TRUE;
-    goto done;
-  }
-
-  /* time to frames */
-  if (src_format == GST_FORMAT_TIME && dest_format == GST_FORMAT_DEFAULT) {
-    if (fps_d != 0) {
-      *dest_value = gst_util_uint64_scale (src_value,
-          fps_n, GST_SECOND * fps_d);
-    } else {
-      GST_ERROR ("framerate denominator is 0");
-      *dest_value = 0;
-    }
-    ret = TRUE;
-    goto done;
-  }
-
-  /* frames to time */
-  if (src_format == GST_FORMAT_DEFAULT && dest_format == GST_FORMAT_TIME) {
-    if (fps_n != 0) {
-      *dest_value = gst_util_uint64_scale (src_value,
-          GST_SECOND * fps_d, fps_n);
-    } else {
-      GST_ERROR ("framerate numerator is 0");
-      *dest_value = 0;
-    }
-    ret = TRUE;
-    goto done;
-  }
-
-  /* time to bytes */
-  if (src_format == GST_FORMAT_TIME && dest_format == GST_FORMAT_BYTES) {
-    if (fps_d != 0) {
-      *dest_value = gst_util_uint64_scale (src_value,
-          fps_n * size, GST_SECOND * fps_d);
-    } else {
-      GST_ERROR ("framerate denominator is 0");
-      *dest_value = 0;
-    }
-    ret = TRUE;
-    goto done;
-  }
-
-  /* bytes to time */
-  if (src_format == GST_FORMAT_BYTES && dest_format == GST_FORMAT_TIME) {
-    if (fps_n != 0 && size != 0) {
-      *dest_value = gst_util_uint64_scale (src_value,
-          GST_SECOND * fps_d, fps_n * size);
-    } else {
-      GST_ERROR ("framerate denominator and/or blocksize is 0");
-      *dest_value = 0;
-    }
-    ret = TRUE;
-  }
-
-done:
-
-  GST_DEBUG ("ret=%d result %" G_GINT64_FORMAT, ret, *dest_value);
-
-  return ret;
-}
-
-#define GST_VIDEO_EVENT_STILL_STATE_NAME "GstEventStillFrame"
-
-/**
- * gst_video_event_new_still_frame:
- * @in_still: boolean value for the still-frame state of the event.
- *
- * Creates a new Still Frame event. If @in_still is %TRUE, then the event
- * represents the start of a still frame sequence. If it is %FALSE, then
- * the event ends a still frame sequence.
- *
- * To parse an event created by gst_video_event_new_still_frame() use
- * gst_video_event_parse_still_frame().
- *
- * Returns: The new GstEvent
- * Since: 0.10.26
- */
-GstEvent *
-gst_video_event_new_still_frame (gboolean in_still)
-{
-  GstEvent *still_event;
-  GstStructure *s;
-
-  s = gst_structure_new (GST_VIDEO_EVENT_STILL_STATE_NAME,
-      "still-state", G_TYPE_BOOLEAN, in_still, NULL);
-  still_event = gst_event_new_custom (GST_EVENT_CUSTOM_DOWNSTREAM, s);
-
-  return still_event;
-}
-
-/**
- * gst_video_event_parse_still_frame:
- * @event: A #GstEvent to parse
- * @in_still: A boolean to receive the still-frame status from the event, or NULL
- *
- * Parse a #GstEvent, identify if it is a Still Frame event, and
- * return the still-frame state from the event if it is.
- * If the event represents the start of a still frame, the in_still
- * variable will be set to TRUE, otherwise FALSE. It is OK to pass NULL for the
- * in_still variable order to just check whether the event is a valid still-frame
- * event.
- *
- * Create a still frame event using gst_video_event_new_still_frame()
- *
- * Returns: %TRUE if the event is a valid still-frame event. %FALSE if not
- * Since: 0.10.26
- */
-gboolean
-gst_video_event_parse_still_frame (GstEvent * event, gboolean * in_still)
-{
-  const GstStructure *s;
-  gboolean ev_still_state;
-
-  g_return_val_if_fail (event != NULL, FALSE);
-
-  if (GST_EVENT_TYPE (event) != GST_EVENT_CUSTOM_DOWNSTREAM)
-    return FALSE;               /* Not a still frame event */
-
-  s = gst_event_get_structure (event);
-  if (s == NULL
-      || !gst_structure_has_name (s, GST_VIDEO_EVENT_STILL_STATE_NAME))
-    return FALSE;               /* Not a still frame event */
-  if (!gst_structure_get_boolean (s, "still-state", &ev_still_state))
-    return FALSE;               /* Not a still frame event */
-  if (in_still)
-    *in_still = ev_still_state;
-  return TRUE;
-}
-
-/**
- * gst_video_parse_caps_palette:
- * @caps: #GstCaps to parse
- *
- * Returns the palette data from the caps as a #GstBuffer. For
- * #GST_VIDEO_FORMAT_RGB8_PALETTED this is containing 256 #guint32
- * values, each containing ARGB colors in native endianness.
- *
- * Returns: a #GstBuffer containing the palette data. Unref after usage.
- * Since: 0.10.32
- */
-GstBuffer *
-gst_video_parse_caps_palette (GstCaps * caps)
-{
-  GstStructure *s;
-  const GValue *p_v;
-  GstBuffer *p;
-
-  if (!gst_caps_is_fixed (caps))
-    return NULL;
-
-  s = gst_caps_get_structure (caps, 0);
-
-  p_v = gst_structure_get_value (s, "palette_data");
-  if (!p_v || !GST_VALUE_HOLDS_BUFFER (p_v))
-    return NULL;
-
-  p = gst_buffer_ref (gst_value_get_buffer (p_v));
-
-  return p;
-}
-
-#define GST_VIDEO_EVENT_FORCE_KEY_UNIT_NAME "GstForceKeyUnit"
-
-/**
- * gst_video_event_new_downstream_force_key_unit:
- * @timestamp: the timestamp of the buffer that starts a new key unit
- * @stream_time: the stream_time of the buffer that starts a new key unit
- * @running_time: the running_time of the buffer that starts a new key unit
- * @all_headers: %TRUE to produce headers when starting a new key unit
- * @count: integer that can be used to number key units
- *
- * Creates a new downstream force key unit event. A downstream force key unit
- * event can be sent down the pipeline to request downstream elements to produce
- * a key unit. A downstream force key unit event must also be sent when handling
- * an upstream force key unit event to notify downstream that the latter has been
- * handled.
- *
- * To parse an event created by gst_video_event_new_downstream_force_key_unit() use
- * gst_video_event_parse_downstream_force_key_unit().
- *
- * Returns: The new GstEvent
- * Since: 0.10.36
- */
-GstEvent *
-gst_video_event_new_downstream_force_key_unit (GstClockTime timestamp,
-    GstClockTime stream_time, GstClockTime running_time, gboolean all_headers,
-    guint count)
-{
-  GstEvent *force_key_unit_event;
-  GstStructure *s;
-
-  s = gst_structure_new (GST_VIDEO_EVENT_FORCE_KEY_UNIT_NAME,
-      "timestamp", G_TYPE_UINT64, timestamp,
-      "stream-time", G_TYPE_UINT64, stream_time,
-      "running-time", G_TYPE_UINT64, running_time,
-      "all-headers", G_TYPE_BOOLEAN, all_headers,
-      "count", G_TYPE_UINT, count, NULL);
-  force_key_unit_event = gst_event_new_custom (GST_EVENT_CUSTOM_DOWNSTREAM, s);
-
-  return force_key_unit_event;
-}
-
-/**
- * gst_video_event_new_upstream_force_key_unit:
- * @running_time: the running_time at which a new key unit should be produced
- * @all_headers: %TRUE to produce headers when starting a new key unit
- * @count: integer that can be used to number key units
- *
- * Creates a new upstream force key unit event. An upstream force key unit event
- * can be sent to request upstream elements to produce a key unit. 
- *
- * @running_time can be set to request a new key unit at a specific
- * running_time. If set to GST_CLOCK_TIME_NONE, upstream elements will produce a
- * new key unit as soon as possible.
- *
- * To parse an event created by gst_video_event_new_downstream_force_key_unit() use
- * gst_video_event_parse_downstream_force_key_unit().
- *
- * Returns: The new GstEvent
- * Since: 0.10.36
- */
-GstEvent *
-gst_video_event_new_upstream_force_key_unit (GstClockTime running_time,
-    gboolean all_headers, guint count)
-{
-  GstEvent *force_key_unit_event;
-  GstStructure *s;
-
-  s = gst_structure_new (GST_VIDEO_EVENT_FORCE_KEY_UNIT_NAME,
-      "running-time", GST_TYPE_CLOCK_TIME, running_time,
-      "all-headers", G_TYPE_BOOLEAN, all_headers,
-      "count", G_TYPE_UINT, count, NULL);
-  force_key_unit_event = gst_event_new_custom (GST_EVENT_CUSTOM_UPSTREAM, s);
-
-  return force_key_unit_event;
-}
-
-/**
- * gst_video_event_is_force_key_unit:
- * @event: A #GstEvent to check
- *
- * Checks if an event is a force key unit event. Returns true for both upstream
- * and downstream force key unit events.
- *
- * Returns: %TRUE if the event is a valid force key unit event
- * Since: 0.10.36
- */
-gboolean
-gst_video_event_is_force_key_unit (GstEvent * event)
-{
-  const GstStructure *s;
-
-  g_return_val_if_fail (event != NULL, FALSE);
-
-  if (GST_EVENT_TYPE (event) != GST_EVENT_CUSTOM_DOWNSTREAM &&
-      GST_EVENT_TYPE (event) != GST_EVENT_CUSTOM_UPSTREAM)
-    return FALSE;               /* Not a force key unit event */
-
-  s = gst_event_get_structure (event);
-  if (s == NULL
-      || !gst_structure_has_name (s, GST_VIDEO_EVENT_FORCE_KEY_UNIT_NAME))
-    return FALSE;
-
-  return TRUE;
-}
-
-/**
- * gst_video_event_parse_downstream_force_key_unit:
- * @event: A #GstEvent to parse
- * @timestamp: (out): A pointer to the timestamp in the event
- * @stream_time: (out): A pointer to the stream-time in the event
- * @running_time: (out): A pointer to the running-time in the event
- * @all_headers: (out): A pointer to the all_headers flag in the event
- * @count: (out): A pointer to the count field of the event
- *
- * Get timestamp, stream-time, running-time, all-headers and count in the force
- * key unit event. See gst_video_event_new_downstream_force_key_unit() for a
- * full description of the downstream force key unit event.
- *
- * Returns: %TRUE if the event is a valid downstream force key unit event.
- * Since: 0.10.36
- */
-gboolean
-gst_video_event_parse_downstream_force_key_unit (GstEvent * event,
-    GstClockTime * timestamp, GstClockTime * stream_time,
-    GstClockTime * running_time, gboolean * all_headers, guint * count)
-{
-  const GstStructure *s;
-  GstClockTime ev_timestamp, ev_stream_time, ev_running_time;
-  gboolean ev_all_headers;
-  guint ev_count;
-
-  g_return_val_if_fail (event != NULL, FALSE);
-
-  if (GST_EVENT_TYPE (event) != GST_EVENT_CUSTOM_DOWNSTREAM)
-    return FALSE;               /* Not a force key unit event */
-
-  s = gst_event_get_structure (event);
-  if (s == NULL
-      || !gst_structure_has_name (s, GST_VIDEO_EVENT_FORCE_KEY_UNIT_NAME))
-    return FALSE;
-
-  if (!gst_structure_get_clock_time (s, "timestamp", &ev_timestamp))
-    ev_timestamp = GST_CLOCK_TIME_NONE;
-  if (!gst_structure_get_clock_time (s, "stream-time", &ev_stream_time))
-    ev_stream_time = GST_CLOCK_TIME_NONE;
-  if (!gst_structure_get_clock_time (s, "running-time", &ev_running_time))
-    ev_running_time = GST_CLOCK_TIME_NONE;
-  if (!gst_structure_get_boolean (s, "all-headers", &ev_all_headers))
-    ev_all_headers = FALSE;
-  if (!gst_structure_get_uint (s, "count", &ev_count))
-    ev_count = 0;
-
-  if (timestamp)
-    *timestamp = ev_timestamp;
-
-  if (stream_time)
-    *stream_time = ev_stream_time;
-
-  if (running_time)
-    *running_time = ev_running_time;
-
-  if (all_headers)
-    *all_headers = ev_all_headers;
-
-  if (count)
-    *count = ev_count;
-
-  return TRUE;
-}
-
-/**
- * gst_video_event_parse_upstream_force_key_unit:
- * @event: A #GstEvent to parse
- * @running_time: (out): A pointer to the running_time in the event
- * @all_headers: (out): A pointer to the all_headers flag in the event
- * @count: (out): A pointer to the count field in the event
- *
- * Get running-time, all-headers and count in the force key unit event. See
- * gst_video_event_new_upstream_force_key_unit() for a full description of the
- * upstream force key unit event.
- *
- * Create an upstream force key unit event using  gst_video_event_new_upstream_force_key_unit()
- *
- * Returns: %TRUE if the event is a valid upstream force-key-unit event. %FALSE if not
- * Since: 0.10.36
- */
-gboolean
-gst_video_event_parse_upstream_force_key_unit (GstEvent * event,
-    GstClockTime * running_time, gboolean * all_headers, guint * count)
-{
-  const GstStructure *s;
-  GstClockTime ev_running_time;
-  gboolean ev_all_headers;
-  guint ev_count;
-
-  g_return_val_if_fail (event != NULL, FALSE);
-
-  if (GST_EVENT_TYPE (event) != GST_EVENT_CUSTOM_UPSTREAM)
-    return FALSE;               /* Not a force key unit event */
-
-  s = gst_event_get_structure (event);
-  if (s == NULL
-      || !gst_structure_has_name (s, GST_VIDEO_EVENT_FORCE_KEY_UNIT_NAME))
-    return FALSE;
-
-  if (!gst_structure_get_clock_time (s, "running-time", &ev_running_time))
-    ev_running_time = GST_CLOCK_TIME_NONE;
-  if (!gst_structure_get_boolean (s, "all-headers", &ev_all_headers))
-    ev_all_headers = FALSE;
-  if (!gst_structure_get_uint (s, "count", &ev_count))
-    ev_count = 0;
-
-  if (running_time)
-    *running_time = ev_running_time;
-
-  if (all_headers)
-    *all_headers = ev_all_headers;
-
-  if (count)
-    *count = ev_count;
-
-  return TRUE;
-}
diff -Nru gstreamer-vaapi-0.5.10/ext/videoutils/gst-libs/gst/video/video.h gstreamer-vaapi-0.6.0/ext/videoutils/gst-libs/gst/video/video.h
--- gstreamer-vaapi-0.5.10/ext/videoutils/gst-libs/gst/video/video.h	2015-02-03 08:39:48.000000000 +0000
+++ gstreamer-vaapi-0.6.0/ext/videoutils/gst-libs/gst/video/video.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,1079 +0,0 @@
-/* GStreamer
- * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu>
- * Library       <2002> Ronald Bultje <rbultje@ronald.bitfreak.net>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_VIDEO_H__
-#define __GST_VIDEO_H__
-
-#include <gst/gst.h>
-
-G_BEGIN_DECLS
-
-#include <gst/video/video-enumtypes.h>
-
-/**
- * GstVideoFormat:
- * @GST_VIDEO_FORMAT_UNKNOWN: Unknown or unset video format id
- * @GST_VIDEO_FORMAT_ENCODED: Encoded video format
- * @GST_VIDEO_FORMAT_I420: planar 4:2:0 YUV
- * @GST_VIDEO_FORMAT_YV12: planar 4:2:0 YVU (like I420 but UV planes swapped)
- * @GST_VIDEO_FORMAT_YUY2: packed 4:2:2 YUV (Y0-U0-Y1-V0 Y2-U2-Y3-V2 Y4 ...)
- * @GST_VIDEO_FORMAT_UYVY: packed 4:2:2 YUV (U0-Y0-V0-Y1 U2-Y2-V2-Y3 U4 ...) 
- * @GST_VIDEO_FORMAT_AYUV: packed 4:4:4 YUV with alpha channel (A0-Y0-U0-V0 ...)
- * @GST_VIDEO_FORMAT_RGBx: sparse rgb packed into 32 bit, space last
- * @GST_VIDEO_FORMAT_BGRx: sparse reverse rgb packed into 32 bit, space last
- * @GST_VIDEO_FORMAT_xRGB: sparse rgb packed into 32 bit, space first
- * @GST_VIDEO_FORMAT_xBGR: sparse reverse rgb packed into 32 bit, space first
- * @GST_VIDEO_FORMAT_RGBA: rgb with alpha channel last
- * @GST_VIDEO_FORMAT_BGRA: reverse rgb with alpha channel last
- * @GST_VIDEO_FORMAT_ARGB: rgb with alpha channel first
- * @GST_VIDEO_FORMAT_ABGR: reverse rgb with alpha channel first
- * @GST_VIDEO_FORMAT_RGB: rgb
- * @GST_VIDEO_FORMAT_BGR: reverse rgb
- * @GST_VIDEO_FORMAT_Y41B: planar 4:1:1 YUV (Since: 0.10.18)
- * @GST_VIDEO_FORMAT_Y42B: planar 4:2:2 YUV (Since: 0.10.18)
- * @GST_VIDEO_FORMAT_YVYU: packed 4:2:2 YUV (Y0-V0-Y1-U0 Y2-V2-Y3-U2 Y4 ...) (Since: 0.10.23)
- * @GST_VIDEO_FORMAT_Y444: planar 4:4:4 YUV (Since: 0.10.24)
- * @GST_VIDEO_FORMAT_v210: packed 4:2:2 10-bit YUV, complex format (Since: 0.10.24)
- * @GST_VIDEO_FORMAT_v216: packed 4:2:2 16-bit YUV, Y0-U0-Y1-V1 order (Since: 0.10.24)
- * @GST_VIDEO_FORMAT_NV12: planar 4:2:0 YUV with interleaved UV plane (Since: 0.10.26)
- * @GST_VIDEO_FORMAT_NV21: planar 4:2:0 YUV with interleaved VU plane (Since: 0.10.26)
- * @GST_VIDEO_FORMAT_GRAY8: 8-bit grayscale (Since: 0.10.29)
- * @GST_VIDEO_FORMAT_GRAY16_BE: 16-bit grayscale, most significant byte first (Since: 0.10.29)
- * @GST_VIDEO_FORMAT_GRAY16_LE: 16-bit grayscale, least significant byte first (Since: 0.10.29)
- * @GST_VIDEO_FORMAT_v308: packed 4:4:4 YUV (Since: 0.10.29)
- * @GST_VIDEO_FORMAT_Y800: same as GST_VIDEO_FORMAT_GRAY8 (Since: 0.10.30)
- * @GST_VIDEO_FORMAT_Y16: same as GST_VIDEO_FORMAT_GRAY16_LE (Since: 0.10.30)
- * @GST_VIDEO_FORMAT_RGB16: rgb 5-6-5 bits per component (Since: 0.10.30)
- * @GST_VIDEO_FORMAT_BGR16: reverse rgb 5-6-5 bits per component (Since: 0.10.30)
- * @GST_VIDEO_FORMAT_RGB15: rgb 5-5-5 bits per component (Since: 0.10.30)
- * @GST_VIDEO_FORMAT_BGR15: reverse rgb 5-5-5 bits per component (Since: 0.10.30)
- * @GST_VIDEO_FORMAT_UYVP: packed 10-bit 4:2:2 YUV (U0-Y0-V0-Y1 U2-Y2-V2-Y3 U4 ...) (Since: 0.10.31)
- * @GST_VIDEO_FORMAT_A420: planar 4:4:2:0 AYUV (Since: 0.10.31)
- * @GST_VIDEO_FORMAT_RGB8_PALETTED: 8-bit paletted RGB (Since: 0.10.32)
- * @GST_VIDEO_FORMAT_YUV9: planar 4:1:0 YUV (Since: 0.10.32)
- * @GST_VIDEO_FORMAT_YVU9: planar 4:1:0 YUV (like YUV9 but UV planes swapped) (Since: 0.10.32)
- * @GST_VIDEO_FORMAT_IYU1: packed 4:1:1 YUV (Cb-Y0-Y1-Cr-Y2-Y3 ...) (Since: 0.10.32)
- * @GST_VIDEO_FORMAT_ARGB64: rgb with alpha channel first, 16 bits per channel (Since: 0.10.33)
- * @GST_VIDEO_FORMAT_AYUV64: packed 4:4:4 YUV with alpha channel, 16 bits per channel (A0-Y0-U0-V0 ...) (Since: 0.10.33)
- * @GST_VIDEO_FORMAT_r210: packed 4:4:4 RGB, 10 bits per channel (Since: 0.10.33)
- * @GST_VIDEO_FORMAT_I420_10BE: planar 4:2:0 YUV, 10 bits per channel
- * @GST_VIDEO_FORMAT_I420_10LE: planar 4:2:0 YUV, 10 bits per channel
- * @GST_VIDEO_FORMAT_I422_10BE: planar 4:2:2 YUV, 10 bits per channel
- * @GST_VIDEO_FORMAT_I422_10LE: planar 4:2:2 YUV, 10 bits per channel
- * @GST_VIDEO_FORMAT_Y444_10BE: planar 4:4:4 YUV, 10 bits per channel
- * @GST_VIDEO_FORMAT_Y444_10LE: planar 4:4:4 YUV, 10 bits per channel
- *
- * Enum value describing the most common video formats.
- */
-typedef enum {
-  GST_VIDEO_FORMAT_UNKNOWN,
-  GST_VIDEO_FORMAT_I420,
-  GST_VIDEO_FORMAT_YV12,
-  GST_VIDEO_FORMAT_YUY2,
-  GST_VIDEO_FORMAT_UYVY,
-  GST_VIDEO_FORMAT_AYUV,
-  GST_VIDEO_FORMAT_RGBx,
-  GST_VIDEO_FORMAT_BGRx,
-  GST_VIDEO_FORMAT_xRGB,
-  GST_VIDEO_FORMAT_xBGR,
-  GST_VIDEO_FORMAT_RGBA,
-  GST_VIDEO_FORMAT_BGRA,
-  GST_VIDEO_FORMAT_ARGB,
-  GST_VIDEO_FORMAT_ABGR,
-  GST_VIDEO_FORMAT_RGB,
-  GST_VIDEO_FORMAT_BGR,
-  GST_VIDEO_FORMAT_Y41B,
-  GST_VIDEO_FORMAT_Y42B,
-  GST_VIDEO_FORMAT_YVYU,
-  GST_VIDEO_FORMAT_Y444,
-  GST_VIDEO_FORMAT_v210,
-  GST_VIDEO_FORMAT_v216,
-  GST_VIDEO_FORMAT_NV12,
-  GST_VIDEO_FORMAT_NV21,
-  GST_VIDEO_FORMAT_GRAY8,
-  GST_VIDEO_FORMAT_GRAY16_BE,
-  GST_VIDEO_FORMAT_GRAY16_LE,
-  GST_VIDEO_FORMAT_v308,
-  GST_VIDEO_FORMAT_Y800,
-  GST_VIDEO_FORMAT_Y16,
-  GST_VIDEO_FORMAT_RGB16,
-  GST_VIDEO_FORMAT_BGR16,
-  GST_VIDEO_FORMAT_RGB15,
-  GST_VIDEO_FORMAT_BGR15,
-  GST_VIDEO_FORMAT_UYVP,
-  GST_VIDEO_FORMAT_A420,
-  GST_VIDEO_FORMAT_RGB8_PALETTED,
-  GST_VIDEO_FORMAT_YUV9,
-  GST_VIDEO_FORMAT_YVU9,
-  GST_VIDEO_FORMAT_IYU1,
-  GST_VIDEO_FORMAT_ARGB64,
-  GST_VIDEO_FORMAT_AYUV64,
-  GST_VIDEO_FORMAT_r210,
-  GST_VIDEO_FORMAT_ENCODED,
-  GST_VIDEO_FORMAT_I420_10BE,
-  GST_VIDEO_FORMAT_I420_10LE,
-  GST_VIDEO_FORMAT_I422_10BE,
-  GST_VIDEO_FORMAT_I422_10LE,
-  GST_VIDEO_FORMAT_Y444_10BE,
-  GST_VIDEO_FORMAT_Y444_10LE
-} GstVideoFormat;
-
-#define GST_VIDEO_BYTE1_MASK_32  "0xFF000000"
-#define GST_VIDEO_BYTE2_MASK_32  "0x00FF0000"
-#define GST_VIDEO_BYTE3_MASK_32  "0x0000FF00"
-#define GST_VIDEO_BYTE4_MASK_32  "0x000000FF"
-
-#define GST_VIDEO_BYTE1_MASK_24  "0x00FF0000"
-#define GST_VIDEO_BYTE2_MASK_24  "0x0000FF00"
-#define GST_VIDEO_BYTE3_MASK_24  "0x000000FF"
-
-#define GST_VIDEO_BYTE1_MASK_32_INT  0xFF000000
-#define GST_VIDEO_BYTE2_MASK_32_INT  0x00FF0000
-#define GST_VIDEO_BYTE3_MASK_32_INT  0x0000FF00
-#define GST_VIDEO_BYTE4_MASK_32_INT  0x000000FF
-
-#define GST_VIDEO_BYTE1_MASK_24_INT  0x00FF0000
-#define GST_VIDEO_BYTE2_MASK_24_INT  0x0000FF00
-#define GST_VIDEO_BYTE3_MASK_24_INT  0x000000FF
-
-#define GST_VIDEO_COMP1_MASK_16 "0xf800"
-#define GST_VIDEO_COMP2_MASK_16 "0x07e0"
-#define GST_VIDEO_COMP3_MASK_16 "0x001f"
-
-#define GST_VIDEO_COMP1_MASK_15 "0x7c00"
-#define GST_VIDEO_COMP2_MASK_15 "0x03e0"
-#define GST_VIDEO_COMP3_MASK_15 "0x001f"
-
-#define GST_VIDEO_COMP1_MASK_16_INT 0xf800
-#define GST_VIDEO_COMP2_MASK_16_INT 0x07e0
-#define GST_VIDEO_COMP3_MASK_16_INT 0x001f
-
-#define GST_VIDEO_COMP1_MASK_15_INT 0x7c00
-#define GST_VIDEO_COMP2_MASK_15_INT 0x03e0
-#define GST_VIDEO_COMP3_MASK_15_INT 0x001f
-
-#ifndef GST_DISABLE_DEPRECATED
-#define GST_VIDEO_RED_MASK_16 GST_VIDEO_COMP1_MASK_16
-#define GST_VIDEO_GREEN_MASK_16 GST_VIDEO_COMP2_MASK_16
-#define GST_VIDEO_BLUE_MASK_16 GST_VIDEO_COMP3_MASK_16
-
-#define GST_VIDEO_RED_MASK_15 GST_VIDEO_COMP1_MASK_15
-#define GST_VIDEO_GREEN_MASK_15 GST_VIDEO_COMP2_MASK_15
-#define GST_VIDEO_BLUE_MASK_15 GST_VIDEO_COMP3_MASK_15
-
-#define GST_VIDEO_RED_MASK_16_INT GST_VIDEO_COMP1_MASK_16_INT
-#define GST_VIDEO_GREEN_MASK_16_INT GST_VIDEO_COMP2_MASK_16_INT
-#define GST_VIDEO_BLUE_MASK_16_INT GST_VIDEO_COMP3_MASK_16_INT
-
-#define GST_VIDEO_RED_MASK_15_INT GST_VIDEO_COMP1_MASK_15_INT
-#define GST_VIDEO_GREEN_MASK_15_INT GST_VIDEO_COMP2_MASK_15_INT
-#define GST_VIDEO_BLUE_MASK_15_INT GST_VIDEO_COMP3_MASK_15_INT
-#endif
-
-#define GST_VIDEO_SIZE_RANGE "(int) [ 1, max ]"
-#define GST_VIDEO_FPS_RANGE "(fraction) [ 0, max ]"
-
-/* consider the next 2 protected */
-#define __GST_VIDEO_CAPS_MAKE_32A(R, G, B, A)                           \
-    "video/x-raw-rgb, "                                                 \
-    "bpp = (int) 32, "                                                  \
-    "depth = (int) 32, "                                                \
-    "endianness = (int) BIG_ENDIAN, "                                   \
-    "red_mask = (int) " GST_VIDEO_BYTE ## R ## _MASK_32 ", "            \
-    "green_mask = (int) " GST_VIDEO_BYTE ## G ## _MASK_32 ", "          \
-    "blue_mask = (int) " GST_VIDEO_BYTE ## B ## _MASK_32 ", "           \
-    "alpha_mask = (int) " GST_VIDEO_BYTE ## A ## _MASK_32 ", "          \
-    "width = " GST_VIDEO_SIZE_RANGE ", "                                \
-    "height = " GST_VIDEO_SIZE_RANGE ", "                               \
-    "framerate = " GST_VIDEO_FPS_RANGE
-
-#define __GST_VIDEO_CAPS_MAKE_32(R, G, B)                               \
-    "video/x-raw-rgb, "                                                 \
-    "bpp = (int) 32, "                                                  \
-    "depth = (int) 24, "                                                \
-    "endianness = (int) BIG_ENDIAN, "                                   \
-    "red_mask = (int) " GST_VIDEO_BYTE ## R ## _MASK_32 ", "            \
-    "green_mask = (int) " GST_VIDEO_BYTE ## G ## _MASK_32 ", "          \
-    "blue_mask = (int) " GST_VIDEO_BYTE ## B ## _MASK_32 ", "           \
-    "width = " GST_VIDEO_SIZE_RANGE ", "                                \
-    "height = " GST_VIDEO_SIZE_RANGE ", "                               \
-    "framerate = " GST_VIDEO_FPS_RANGE
-
-#define __GST_VIDEO_CAPS_MAKE_24(R, G, B)                               \
-    "video/x-raw-rgb, "                                                 \
-    "bpp = (int) 24, "                                                  \
-    "depth = (int) 24, "                                                \
-    "endianness = (int) BIG_ENDIAN, "                                   \
-    "red_mask = (int) " GST_VIDEO_BYTE ## R ## _MASK_24 ", "            \
-    "green_mask = (int) " GST_VIDEO_BYTE ## G ## _MASK_24 ", "          \
-    "blue_mask = (int) " GST_VIDEO_BYTE ## B ## _MASK_24 ", "           \
-    "width = " GST_VIDEO_SIZE_RANGE ", "                                \
-    "height = " GST_VIDEO_SIZE_RANGE ", "                               \
-    "framerate = " GST_VIDEO_FPS_RANGE
-
-#define __GST_VIDEO_CAPS_MAKE_16(R, G, B)                               \
-    "video/x-raw-rgb, "                                                 \
-    "bpp = (int) 16, "                                                  \
-    "depth = (int) 16, "                                                \
-    "endianness = (int) BYTE_ORDER, "                                   \
-    "red_mask = (int) " GST_VIDEO_COMP ## R ## _MASK_16 ", "            \
-    "green_mask = (int) " GST_VIDEO_COMP ## G ## _MASK_16 ", "          \
-    "blue_mask = (int) " GST_VIDEO_COMP ## B ## _MASK_16 ", "           \
-    "width = " GST_VIDEO_SIZE_RANGE ", "                                \
-    "height = " GST_VIDEO_SIZE_RANGE ", "                               \
-    "framerate = " GST_VIDEO_FPS_RANGE
-
-#define __GST_VIDEO_CAPS_MAKE_15(R, G, B)                               \
-    "video/x-raw-rgb, "                                                 \
-    "bpp = (int) 16, "                                                  \
-    "depth = (int) 15, "                                                \
-    "endianness = (int) BYTE_ORDER, "                                   \
-    "red_mask = (int) " GST_VIDEO_COMP ## R ## _MASK_15 ", "            \
-    "green_mask = (int) " GST_VIDEO_COMP ## G ## _MASK_15 ", "          \
-    "blue_mask = (int) " GST_VIDEO_COMP ## B ## _MASK_15 ", "           \
-    "width = " GST_VIDEO_SIZE_RANGE ", "                                \
-    "height = " GST_VIDEO_SIZE_RANGE ", "                               \
-    "framerate = " GST_VIDEO_FPS_RANGE
-
-#define __GST_VIDEO_CAPS_MAKE_64A(R, G, B, A)                           \
-    "video/x-raw-rgb, "                                                 \
-    "bpp = (int) 64, "                                                  \
-    "depth = (int) 64, "                                                \
-    "endianness = (int) BIG_ENDIAN, "                                   \
-    "red_mask = (int) " GST_VIDEO_BYTE ## R ## _MASK_32 ", "            \
-    "green_mask = (int) " GST_VIDEO_BYTE ## G ## _MASK_32 ", "          \
-    "blue_mask = (int) " GST_VIDEO_BYTE ## B ## _MASK_32 ", "           \
-    "alpha_mask = (int) " GST_VIDEO_BYTE ## A ## _MASK_32 ", "          \
-    "width = " GST_VIDEO_SIZE_RANGE ", "                                \
-    "height = " GST_VIDEO_SIZE_RANGE ", "                               \
-    "framerate = " GST_VIDEO_FPS_RANGE
-
-
-/* 24 bit */
-
-#define GST_VIDEO_CAPS_RGB \
-    __GST_VIDEO_CAPS_MAKE_24 (1, 2, 3)
-
-#define GST_VIDEO_CAPS_BGR \
-    __GST_VIDEO_CAPS_MAKE_24 (3, 2, 1)
-
-/* 32 bit */
-
-#define GST_VIDEO_CAPS_RGBx \
-    __GST_VIDEO_CAPS_MAKE_32 (1, 2, 3)
-  
-#define GST_VIDEO_CAPS_xRGB \
-    __GST_VIDEO_CAPS_MAKE_32 (2, 3, 4)
-  
-#define GST_VIDEO_CAPS_BGRx \
-    __GST_VIDEO_CAPS_MAKE_32 (3, 2, 1)
-  
-#define GST_VIDEO_CAPS_xBGR \
-    __GST_VIDEO_CAPS_MAKE_32 (4, 3, 2)
-
-/* 32 bit alpha */
-
-#define GST_VIDEO_CAPS_RGBA \
-    __GST_VIDEO_CAPS_MAKE_32A (1, 2, 3, 4)
-  
-#define GST_VIDEO_CAPS_ARGB \
-    __GST_VIDEO_CAPS_MAKE_32A (2, 3, 4, 1)
-  
-#define GST_VIDEO_CAPS_BGRA \
-    __GST_VIDEO_CAPS_MAKE_32A (3, 2, 1, 4)
-  
-#define GST_VIDEO_CAPS_ABGR \
-    __GST_VIDEO_CAPS_MAKE_32A (4, 3, 2, 1)
-
-/* note: the macro name uses the order on BE systems */
-#if G_BYTE_ORDER == G_BIG_ENDIAN
-  #define GST_VIDEO_CAPS_xRGB_HOST_ENDIAN \
-      GST_VIDEO_CAPS_xRGB
-  #define GST_VIDEO_CAPS_BGRx_HOST_ENDIAN \
-      GST_VIDEO_CAPS_BGRx
-#else
-  #define GST_VIDEO_CAPS_xRGB_HOST_ENDIAN \
-      GST_VIDEO_CAPS_BGRx
-  #define GST_VIDEO_CAPS_BGRx_HOST_ENDIAN \
-      GST_VIDEO_CAPS_xRGB
-#endif
-      
-/* 15/16 bit */
-  
-#define GST_VIDEO_CAPS_RGB_16 \
-    __GST_VIDEO_CAPS_MAKE_16 (1, 2, 3)
-
-#define GST_VIDEO_CAPS_BGR_16 \
-    __GST_VIDEO_CAPS_MAKE_16 (3, 2, 1)
-
-#define GST_VIDEO_CAPS_RGB_15 \
-    __GST_VIDEO_CAPS_MAKE_15 (1, 2, 3)
-
-#define GST_VIDEO_CAPS_BGR_15 \
-    __GST_VIDEO_CAPS_MAKE_15 (3, 2, 1)
-
-/* 30 bit */
-#define GST_VIDEO_CAPS_r210 \
-    "video/x-raw-rgb, "                                                 \
-    "bpp = (int) 32, "                                                  \
-    "depth = (int) 30, "                                                \
-    "endianness = (int) BIG_ENDIAN, "                                   \
-    "red_mask = (int) 0x3ff00000, "                                     \
-    "green_mask = (int) 0x000ffc00, "                                   \
-    "blue_mask = (int) 0x000003ff, "                                    \
-    "width = " GST_VIDEO_SIZE_RANGE ", "                                \
-    "height = " GST_VIDEO_SIZE_RANGE ", "                               \
-    "framerate = " GST_VIDEO_FPS_RANGE
-
-/* 64 bit alpha */
-
-#define GST_VIDEO_CAPS_ARGB_64 \
-    __GST_VIDEO_CAPS_MAKE_64A (2, 3, 4, 1)
-
-/**
- * GST_VIDEO_CAPS_RGB8_PALETTED:
- *
- * Generic caps string for 8-bit paletted RGB video, for use in pad templates.
- *
- * Since: 0.10.32
- */
-#define GST_VIDEO_CAPS_RGB8_PALETTED \
-  "video/x-raw-rgb, bpp = (int)8, depth = (int)8, "                     \
-      "width = " GST_VIDEO_SIZE_RANGE " , "		                \
-      "height = " GST_VIDEO_SIZE_RANGE ", "                             \
-      "framerate = " GST_VIDEO_FPS_RANGE
-
-/**
- * GST_VIDEO_CAPS_YUV:
- * @fourcc: YUV fourcc format that describes the pixel layout, as string
- *     (e.g. "I420", "YV12", "YUY2", "AYUV", etc.)
- *
- * Generic caps string for YUV video, for use in pad templates.
- */
-#define GST_VIDEO_CAPS_YUV(fourcc)                                      \
-        "video/x-raw-yuv, "                                             \
-        "format = (fourcc) " fourcc ", "                                \
-        "width = " GST_VIDEO_SIZE_RANGE ", "                            \
-        "height = " GST_VIDEO_SIZE_RANGE ", "                           \
-        "framerate = " GST_VIDEO_FPS_RANGE
-
-/**
- * GST_VIDEO_CAPS_GRAY8:
- *
- * Generic caps string for 8-bit grayscale video, for use in pad templates.
- *
- * Since: 0.10.29
- */
-#define GST_VIDEO_CAPS_GRAY8                                            \
-        "video/x-raw-gray, "                                            \
-        "bpp = (int) 8, "                                               \
-        "depth = (int) 8, "                                             \
-        "width = " GST_VIDEO_SIZE_RANGE ", "                            \
-        "height = " GST_VIDEO_SIZE_RANGE ", "                           \
-        "framerate = " GST_VIDEO_FPS_RANGE
-
-/**
- * GST_VIDEO_CAPS_GRAY16:
- * @endianness: endianness as string, ie. either "1234", "4321", "BIG_ENDIAN"
- *     or "LITTLE_ENDIAN"
- *
- * Generic caps string for 16-bit grayscale video, for use in pad templates.
- *
- * Since: 0.10.29
- */
-#define GST_VIDEO_CAPS_GRAY16(endianness)                               \
-        "video/x-raw-gray, "                                            \
-        "bpp = (int) 16, "                                              \
-        "depth = (int) 16, "                                            \
-        "endianness = (int) " endianness ", "                           \
-        "width = " GST_VIDEO_SIZE_RANGE ", "                            \
-        "height = " GST_VIDEO_SIZE_RANGE ", "                           \
-        "framerate = " GST_VIDEO_FPS_RANGE
-
-/* buffer flags */
-
-/**
- * GST_VIDEO_BUFFER_TFF:
- *
- * If the #GstBuffer is interlaced, then the first field in the video frame is
- * the top field.  If unset, the bottom field is first.
- *
- * Since: 0.10.23
- */
-#define GST_VIDEO_BUFFER_TFF GST_BUFFER_FLAG_MEDIA1
-
-/**
- * GST_VIDEO_BUFFER_RFF:
- *
- * If the #GstBuffer is interlaced, then the first field (as defined by the
- * %GST_VIDEO_BUFFER_TFF flag setting) is repeated.
- *
- * Since: 0.10.23
- */
-#define GST_VIDEO_BUFFER_RFF GST_BUFFER_FLAG_MEDIA2
-
-/**
- * GST_VIDEO_BUFFER_ONEFIELD:
- *
- * If the #GstBuffer is interlaced, then only the first field (as defined by the
- * %GST_VIDEO_BUFFER_TFF flag setting) is to be displayed.
- *
- * Since: 0.10.23
- */
-#define GST_VIDEO_BUFFER_ONEFIELD GST_BUFFER_FLAG_MEDIA3
-
-/**
- * GST_VIDEO_BUFFER_PROGRESSIVE:
- *
- * If the #GstBuffer is telecined, then the buffer is progressive if the
- * %GST_VIDEO_BUFFER_PROGRESSIVE flag is set, else it is telecine mixed.
- *
- * Since: 0.10.33
- */
-#define GST_VIDEO_BUFFER_PROGRESSIVE GST_BUFFER_FLAG_MEDIA4
-
-/* Backported from 0.11 */
-
-#define GST_VIDEO_MAX_PLANES 4
-#define GST_VIDEO_MAX_COMPONENTS 4
-
-typedef struct _GstVideoFormatInfo GstVideoFormatInfo;
-
-/**
- * GstVideoFormatFlags:
- * @GST_VIDEO_FORMAT_FLAG_YUV: The video format is YUV, components are numbered
- *   0=Y, 1=U, 2=V.
- * @GST_VIDEO_FORMAT_FLAG_RGB: The video format is RGB, components are numbered
- *   0=R, 1=G, 2=B.
- * @GST_VIDEO_FORMAT_FLAG_GRAY: The video is gray, there is one gray component
- *   with index 0.
- * @GST_VIDEO_FORMAT_FLAG_ALPHA: The video format has an alpha components with
- *   the number 3.
- * @GST_VIDEO_FORMAT_FLAG_LE: The video format has data stored in little
- *   endianness.
- * @GST_VIDEO_FORMAT_FLAG_PALETTE: The video format has a palette.
- * @GST_VIDEO_FORMAT_FLAG_COMPLEX: The video format has a complex layout that
- *   can't be described with the usual information in the #GstVideoFormatInfo.
- *
- * The different video flags that a format info can have.
- */
-typedef enum
-{
-  GST_VIDEO_FORMAT_FLAG_YUV      = (1 << 0),
-  GST_VIDEO_FORMAT_FLAG_RGB      = (1 << 1),
-  GST_VIDEO_FORMAT_FLAG_GRAY     = (1 << 2),
-  GST_VIDEO_FORMAT_FLAG_ALPHA    = (1 << 3),
-  GST_VIDEO_FORMAT_FLAG_LE       = (1 << 4),
-  GST_VIDEO_FORMAT_FLAG_PALETTE  = (1 << 5),
-  GST_VIDEO_FORMAT_FLAG_COMPLEX  = (1 << 6)
-} GstVideoFormatFlags;
-
-#define GST_VIDEO_COMP_Y  0
-#define GST_VIDEO_COMP_U  1
-#define GST_VIDEO_COMP_V  2
-
-#define GST_VIDEO_COMP_R  0
-#define GST_VIDEO_COMP_G  1
-#define GST_VIDEO_COMP_B  2
-
-#define GST_VIDEO_COMP_A  3
-
-/**
- * GstVideoFormatUnpack:
- * @info: a #GstVideoFormatInfo
- * @dest: a destination array
- * @data: pointers to the data planes
- * @stride: strides of the planes
- * @x: the x position in the image to start from
- * @y: the y position in the image to start from
- * @width: the amount of pixels to unpack.
- *
- * Unpacks @width pixels from the given planes and strides containing data of
- * format @info. The pixels will be unpacked into @dest which each component
- * interleaved. @dest should at least be big enough to hold @width *
- * n_components * size(unpack_format) bytes.
- */
-typedef void (*GstVideoFormatUnpack)         (GstVideoFormatInfo *info, gpointer dest,
-                                              const gpointer data[GST_VIDEO_MAX_PLANES],
-                                              const gint stride[GST_VIDEO_MAX_PLANES],
-                                              gint x, gint y, gint width);
-/**
- * GstVideoFormatPack:
- * @info: a #GstVideoFormatInfo
- * @src: a source array
- * @data: pointers to the destination data planes
- * @stride: strides of the destination planes
- * @x: the x position in the image to pack to
- * @y: the y position in the image to pack to
- * @width: the amount of pixels to pack.
- *
- * Packs @width pixels from @src to the given planes and strides in the
- * format @info. The pixels from source have each component interleaved
- * and will be packed into the planes in @data.
- */
-typedef void (*GstVideoFormatPack)           (GstVideoFormatInfo *info, const gpointer src,
-                                              gpointer data[GST_VIDEO_MAX_PLANES],
-                                              const gint stride[GST_VIDEO_MAX_PLANES],
-                                              gint x, gint y, gint width);
-
-/**
- * GstVideoFormatInfo:
- * @format: #GstVideoFormat
- * @name: string representation of the format
- * @description: use readable description of the format
- * @flags: #GstVideoFormatFlags
- * @bits: The number of bits used to pack data items. This can be less than 8
- *    when multiple pixels are stored in a byte. for values > 8 multiple bytes
- *    should be read according to the endianness flag before applying the shift
- *    and mask.
- * @n_components: the number of components in the video format.
- * @shift: the number of bits to shift away to get the component data
- * @depth: the depth in bits for each component
- * @pixel_stride: the pixel stride of each component. This is the amount of
- *    bytes to the pixel immediately to the right. When bits < 8, the stride is
- *    expressed in bits.
- * @n_planes: the number of planes for this format. The number of planes can be
- *    less than the amount of components when multiple components are packed into
- *    one plane.
- * @plane: the plane number where a component can be found
- * @poffset: the offset in the plane where the first pixel of the components
- *    can be found. If bits < 8 the amount is specified in bits.
- * @w_sub: subsampling factor of the width for the component. Use
- *     GST_VIDEO_SUB_SCALE to scale a width.
- * @h_sub: subsampling factor of the height for the component. Use
- *     GST_VIDEO_SUB_SCALE to scale a height.
- * @unpack_format: the format of the unpacked pixels.
- * @unpack_func: an unpack function for this format
- * @pack_func: an pack function for this format
- *
- * Information for a video format.
- */
-struct _GstVideoFormatInfo {
-  GstVideoFormat format;
-  const gchar *name;
-  const gchar *description;
-  GstVideoFormatFlags flags;
-  guint bits;
-  guint n_components;
-  guint shift[GST_VIDEO_MAX_COMPONENTS];
-  guint depth[GST_VIDEO_MAX_COMPONENTS];
-  gint  pixel_stride[GST_VIDEO_MAX_COMPONENTS];
-  guint n_planes;
-  guint plane[GST_VIDEO_MAX_COMPONENTS];
-  guint poffset[GST_VIDEO_MAX_COMPONENTS];
-  guint w_sub[GST_VIDEO_MAX_COMPONENTS];
-  guint h_sub[GST_VIDEO_MAX_COMPONENTS];
-
-  GstVideoFormat unpack_format;
-  GstVideoFormatUnpack unpack_func;
-  GstVideoFormatPack pack_func;
-};
-
-#define GST_VIDEO_FORMAT_INFO_FORMAT(info)       ((info)->format)
-#define GST_VIDEO_FORMAT_INFO_NAME(info)         ((info)->name)
-#define GST_VIDEO_FORMAT_INFO_FLAGS(info)        ((info)->flags)
-
-#define GST_VIDEO_FORMAT_INFO_IS_YUV(info)       ((info)->flags & GST_VIDEO_FORMAT_FLAG_YUV)
-#define GST_VIDEO_FORMAT_INFO_IS_RGB(info)       ((info)->flags & GST_VIDEO_FORMAT_FLAG_RGB)
-#define GST_VIDEO_FORMAT_INFO_IS_GRAY(info)      ((info)->flags & GST_VIDEO_FORMAT_FLAG_GRAY)
-#define GST_VIDEO_FORMAT_INFO_HAS_ALPHA(info)    ((info)->flags & GST_VIDEO_FORMAT_FLAG_ALPHA)
-#define GST_VIDEO_FORMAT_INFO_IS_LE(info)        ((info)->flags & GST_VIDEO_FORMAT_FLAG_LE)
-#define GST_VIDEO_FORMAT_INFO_HAS_PALETTE(info)  ((info)->flags & GST_VIDEO_FORMAT_FLAG_PALETTE)
-#define GST_VIDEO_FORMAT_INFO_IS_COMPLEX(info)   ((info)->flags & GST_VIDEO_FORMAT_FLAG_COMPLEX)
-
-#define GST_VIDEO_FORMAT_INFO_BITS(info)         ((info)->bits)
-#define GST_VIDEO_FORMAT_INFO_N_COMPONENTS(info) ((info)->n_components)
-#define GST_VIDEO_FORMAT_INFO_SHIFT(info,c)      ((info)->shift[c])
-#define GST_VIDEO_FORMAT_INFO_DEPTH(info,c)      ((info)->depth[c])
-#define GST_VIDEO_FORMAT_INFO_PSTRIDE(info,c)    ((info)->pixel_stride[c])
-#define GST_VIDEO_FORMAT_INFO_N_PLANES(info)     ((info)->n_planes)
-#define GST_VIDEO_FORMAT_INFO_PLANE(info,c)      ((info)->plane[c])
-#define GST_VIDEO_FORMAT_INFO_POFFSET(info,c)    ((info)->poffset[c])
-#define GST_VIDEO_FORMAT_INFO_W_SUB(info,c)      ((info)->w_sub[c])
-#define GST_VIDEO_FORMAT_INFO_H_SUB(info,c)      ((info)->h_sub[c])
-
-#define GST_VIDEO_SUB_SCALE(scale,val)   (-((-((gint)val))>>(scale)))
-
-#define GST_VIDEO_FORMAT_INFO_SCALE_WIDTH(info,c,w)  GST_VIDEO_SUB_SCALE ((info)->w_sub[(c)],(w))
-#define GST_VIDEO_FORMAT_INFO_SCALE_HEIGHT(info,c,h) GST_VIDEO_SUB_SCALE ((info)->h_sub[(c)],(h))
-
-#define GST_VIDEO_FORMAT_INFO_DATA(info,planes,comp) \
-  (((guint8*)(planes)[info->plane[comp]]) + info->poffset[comp])
-#define GST_VIDEO_FORMAT_INFO_STRIDE(info,strides,comp) ((strides)[info->plane[comp]])
-#define GST_VIDEO_FORMAT_INFO_OFFSET(info,offsets,comp) \
-  (((offsets)[info->plane[comp]]) + info->poffset[comp])
-
-typedef struct _GstVideoInfo GstVideoInfo;
-
-const GstVideoFormatInfo *
-               gst_video_format_get_info             (GstVideoFormat format) G_GNUC_CONST;
-/**
- * GstVideoInterlaceMode:
- * @GST_VIDEO_INTERLACE_MODE_PROGRESSIVE: all frames are progressive
- * @GST_VIDEO_INTERLACE_MODE_INTERLEAVED: video is interlaced and all fields
- *     are interlaced in one frame.
- * @GST_VIDEO_INTERLACE_MODE_MIXED: video contains both interlaced and
- *     progressive frames, the buffer flags describe the frame and fields.
- *
- * The possible values of the #GstVideoInterlaceMode describing the interlace
- * mode of the stream.
- */
-typedef enum {
-  GST_VIDEO_INTERLACE_MODE_PROGRESSIVE = 0,
-  GST_VIDEO_INTERLACE_MODE_INTERLEAVED,
-  GST_VIDEO_INTERLACE_MODE_MIXED
-} GstVideoInterlaceMode;
-
-/**
- * GstVideoFlags:
- * @GST_VIDEO_FLAG_NONE: no flags
- * @GST_VIDEO_FLAG_VARIABLE_FPS: a variable fps is selected, fps_n and fps_d
- * denote the maximum fps of the video
- *
- * Extra video flags
- */
-typedef enum {
-  GST_VIDEO_FLAG_NONE         = 0,
-  GST_VIDEO_FLAG_VARIABLE_FPS = (1 << 1)
-} GstVideoFlags;
-
-/**
- * GstVideoChroma:
- * @GST_VIDEO_CHROMA_SITE_UNKNOWN: unknown cositing
- * @GST_VIDEO_CHROMA_SITE_NONE: no cositing
- * @GST_VIDEO_CHROMA_SITE_H_COSITED: chroma is horizontally cosited
- * @GST_VIDEO_CHROMA_SITE_V_COSITED: chroma is vertically cosited
- * @GST_VIDEO_CHROMA_SITE_ALT_LINE: choma samples are sited on alternate lines
- * @GST_VIDEO_CHROMA_SITE_COSITED: chroma samples cosited with luma samples
- * @GST_VIDEO_CHROMA_SITE_JPEG: jpeg style cositing, also for mpeg1 and mjpeg
- * @GST_VIDEO_CHROMA_SITE_MPEG2: mpeg2 style cositing
- * @GST_VIDEO_CHROMA_SITE_DV: DV style cositing
- *
- * Various Chroma sitings.
- */
-typedef enum {
-  GST_VIDEO_CHROMA_SITE_UNKNOWN   =  0,
-  GST_VIDEO_CHROMA_SITE_NONE      = (1 << 0),
-  GST_VIDEO_CHROMA_SITE_H_COSITED = (1 << 1),
-  GST_VIDEO_CHROMA_SITE_V_COSITED = (1 << 2),
-  GST_VIDEO_CHROMA_SITE_ALT_LINE  = (1 << 3),
-  /* some common chroma cositing */
-  GST_VIDEO_CHROMA_SITE_COSITED   = (GST_VIDEO_CHROMA_SITE_H_COSITED | GST_VIDEO_CHROMA_SITE_V_COSITED),
-  GST_VIDEO_CHROMA_SITE_JPEG      = (GST_VIDEO_CHROMA_SITE_NONE),
-  GST_VIDEO_CHROMA_SITE_MPEG2     = (GST_VIDEO_CHROMA_SITE_H_COSITED),
-  GST_VIDEO_CHROMA_SITE_DV        = (GST_VIDEO_CHROMA_SITE_COSITED | GST_VIDEO_CHROMA_SITE_ALT_LINE),
-} GstVideoChromaSite;
-
-
-/**
- * GstVideoColorRange:
- * @GST_VIDEO_COLOR_RANGE_UNKNOWN: unknown range
- * @GST_VIDEO_COLOR_RANGE_0_255: [0..255] for 8 bit components
- * @GST_VIDEO_COLOR_RANGE_16_235: [16..235] for 8 bit components. Chroma has
- *                 [16..240] range.
- *
- * Possible color range values. These constants are defined for 8 bit color
- * values and can be scaled for other bit depths.
- */
-typedef enum {
-  GST_VIDEO_COLOR_RANGE_UNKNOWN = 0,
-  GST_VIDEO_COLOR_RANGE_0_255,
-  GST_VIDEO_COLOR_RANGE_16_235
-} GstVideoColorRange;
-
-/**
- * GstVideoColorMatrix:
- * @GST_VIDEO_COLOR_MATRIX_UNKNOWN: unknown matrix
- * @GST_VIDEO_COLOR_MATRIX_RGB: identity matrix
- * @GST_VIDEO_COLOR_MATRIX_FCC: FCC color matrix
- * @GST_VIDEO_COLOR_MATRIX_BT709: ITU-R BT.709 color matrix
- * @GST_VIDEO_COLOR_MATRIX_BT601: ITU-R BT.601 color matrix
- * @GST_VIDEO_COLOR_MATRIX_SMPTE240M: SMPTE 240M color matrix
- *
- * The color matrix is used to convert between Y'PbPr and
- * non-linear RGB (R'G'B')
- */
-typedef enum {
-  GST_VIDEO_COLOR_MATRIX_UNKNOWN = 0,
-  GST_VIDEO_COLOR_MATRIX_RGB,
-  GST_VIDEO_COLOR_MATRIX_FCC,
-  GST_VIDEO_COLOR_MATRIX_BT709,
-  GST_VIDEO_COLOR_MATRIX_BT601,
-  GST_VIDEO_COLOR_MATRIX_SMPTE240M
-} GstVideoColorMatrix;
-
-/**
- * GstVideoTransferFunction:
- * @GST_VIDEO_TRANSFER_UNKNOWN: unknown transfer function
- * @GST_VIDEO_TRANSFER_GAMMA10: linear RGB, gamma 1.0 curve
- * @GST_VIDEO_TRANSFER_GAMMA18: Gamma 1.8 curve
- * @GST_VIDEO_TRANSFER_GAMMA20: Gamma 2.0 curve
- * @GST_VIDEO_TRANSFER_GAMMA22: Gamma 2.2 curve
- * @GST_VIDEO_TRANSFER_BT709: Gamma 2.2 curve with a linear segment in the lower
- *                           range
- * @GST_VIDEO_TRANSFER_SMPTE240M: Gamma 2.2 curve with a linear segment in the
- *                               lower range
- * @GST_VIDEO_TRANSFER_SRGB: Gamma 2.4 curve with a linear segment in the lower
- *                          range
- * @GST_VIDEO_TRANSFER_GAMMA28: Gamma 2.8 curve
- * @GST_VIDEO_TRANSFER_LOG100: Logarithmic transfer characteristic
- *                             100:1 range
- * @GST_VIDEO_TRANSFER_LOG316: Logarithmic transfer characteristic
- *                             316.22777:1 range
- *
- * The video transfer function defines the formula for converting between
- * non-linear RGB (R'G'B') and linear RGB
- */
-typedef enum {
-  GST_VIDEO_TRANSFER_UNKNOWN = 0,
-  GST_VIDEO_TRANSFER_GAMMA10,
-  GST_VIDEO_TRANSFER_GAMMA18,
-  GST_VIDEO_TRANSFER_GAMMA20,
-  GST_VIDEO_TRANSFER_GAMMA22,
-  GST_VIDEO_TRANSFER_BT709,
-  GST_VIDEO_TRANSFER_SMPTE240M,
-  GST_VIDEO_TRANSFER_SRGB,
-  GST_VIDEO_TRANSFER_GAMMA28,
-  GST_VIDEO_TRANSFER_LOG100,
-  GST_VIDEO_TRANSFER_LOG316
-} GstVideoTransferFunction;
-
-/**
- * GstVideoColorPrimaries:
- * @GST_VIDEO_COLOR_PRIMARIES_UNKNOWN: unknown color primaries
- * @GST_VIDEO_COLOR_PRIMARIES_BT709: BT709 primaries
- * @GST_VIDEO_COLOR_PRIMARIES_BT470M: BT470M primaries
- * @GST_VIDEO_COLOR_PRIMARIES_BT470BG: BT470BG primaries
- * @GST_VIDEO_COLOR_PRIMARIES_SMPTE170M: SMPTE170M primaries
- * @GST_VIDEO_COLOR_PRIMARIES_SMPTE240M: SMPTE240M primaries
- *
- * The color primaries define the how to transform linear RGB values to and from
- * the CIE XYZ colorspace.
- */
-typedef enum {
-  GST_VIDEO_COLOR_PRIMARIES_UNKNOWN = 0,
-  GST_VIDEO_COLOR_PRIMARIES_BT709,
-  GST_VIDEO_COLOR_PRIMARIES_BT470M,
-  GST_VIDEO_COLOR_PRIMARIES_BT470BG,
-  GST_VIDEO_COLOR_PRIMARIES_SMPTE170M,
-  GST_VIDEO_COLOR_PRIMARIES_SMPTE240M
-} GstVideoColorPrimaries;
-
-/**
- * GstVideoColorimetry:
- * @range: the color range. This is the valid range for the samples.
- *         It is used to convert the samples to Y'PbPr values.
- * @matrix: the color matrix. Used to convert between Y'PbPr and
- *          non-linear RGB (R'G'B')
- * @transfer: the transfer function. used to convert between R'G'B' and RGB
- * @primaries: color primaries. used to convert between R'G'B' and CIE XYZ
- *
- * Structure describing the color info.
- */
-typedef struct {
-  GstVideoColorRange        range;
-  GstVideoColorMatrix       matrix;
-  GstVideoTransferFunction  transfer;
-  GstVideoColorPrimaries    primaries;
-} GstVideoColorimetry;
-
-/* predefined colorimetry */
-#define GST_VIDEO_COLORIMETRY_BT601       "bt601"
-#define GST_VIDEO_COLORIMETRY_BT709       "bt709"
-#define GST_VIDEO_COLORIMETRY_SMPTE240M   "smpte240m"
-
-gboolean     gst_video_colorimetry_matches     (GstVideoColorimetry *cinfo, const gchar *color);
-gboolean     gst_video_colorimetry_from_string (GstVideoColorimetry *cinfo, const gchar *color);
-gchar *      gst_video_colorimetry_to_string   (GstVideoColorimetry *cinfo);
-
-/**
- * GstVideoInfo:
- * @finfo: the format info of the video
- * @interlace_mode: the interlace mode
- * @flags: additional video flags
- * @width: the width of the video
- * @height: the height of the video
- * @size: the default size of one frame
- * @chroma_site: a #GstVideoChromaSite.
- * @colorimetry: the colorimetry info
- * @palette: a buffer with palette data
- * @par_n: the pixel-aspect-ratio numerator
- * @par_d: the pixel-aspect-ratio demnominator
- * @fps_n: the framerate numerator
- * @fps_d: the framerate demnominator
- * @offset: offsets of the planes
- * @stride: strides of the planes
- *
- * Information describing image properties. This information can be filled
- * in from GstCaps with gst_video_info_from_caps(). The information is also used
- * to store the specific video info when mapping a video frame with
- * gst_video_frame_map().
- *
- * Use the provided macros to access the info in this structure.
- */
-struct _GstVideoInfo {
-  const GstVideoFormatInfo *finfo;
-
-  GstVideoInterlaceMode     interlace_mode;
-  GstVideoFlags             flags;
-  gint                      width;
-  gint                      height;
-  gsize                     size;
-
-  GstVideoChromaSite        chroma_site;
-  GstVideoColorimetry       colorimetry;
-
-  GstBuffer                *palette;
-
-  gint                      par_n;
-  gint                      par_d;
-  gint                      fps_n;
-  gint                      fps_d;
-
-  gsize                     offset[GST_VIDEO_MAX_PLANES];
-  gint                      stride[GST_VIDEO_MAX_PLANES];
-};
-
-/* general info */
-#define GST_VIDEO_INFO_FORMAT(i)         (GST_VIDEO_FORMAT_INFO_FORMAT((i)->finfo))
-#define GST_VIDEO_INFO_NAME(i)           (GST_VIDEO_FORMAT_INFO_NAME((i)->finfo))
-#define GST_VIDEO_INFO_IS_YUV(i)         (GST_VIDEO_FORMAT_INFO_IS_YUV((i)->finfo))
-#define GST_VIDEO_INFO_IS_RGB(i)         (GST_VIDEO_FORMAT_INFO_IS_RGB((i)->finfo))
-#define GST_VIDEO_INFO_IS_GRAY(i)        (GST_VIDEO_FORMAT_INFO_IS_GRAY((i)->finfo))
-#define GST_VIDEO_INFO_HAS_ALPHA(i)      (GST_VIDEO_FORMAT_INFO_HAS_ALPHA((i)->finfo))
-
-#define GST_VIDEO_INFO_INTERLACE_MODE(i) ((i)->interlace_mode)
-#define GST_VIDEO_INFO_IS_INTERLACED(i)  ((i)->interlace_mode != GST_VIDEO_INTERLACE_MODE_PROGRESSIVE)
-#define GST_VIDEO_INFO_FLAGS(i)          ((i)->flags)
-#define GST_VIDEO_INFO_WIDTH(i)          ((i)->width)
-#define GST_VIDEO_INFO_HEIGHT(i)         ((i)->height)
-#define GST_VIDEO_INFO_SIZE(i)           ((i)->size)
-#define GST_VIDEO_INFO_PAR_N(i)          ((i)->par_n)
-#define GST_VIDEO_INFO_PAR_D(i)          ((i)->par_d)
-#define GST_VIDEO_INFO_FPS_N(i)          ((i)->fps_n)
-#define GST_VIDEO_INFO_FPS_D(i)          ((i)->fps_d)
-
-/* dealing with GstVideoInfo flags */
-#define GST_VIDEO_INFO_FLAG_IS_SET(i,flag) ((GST_VIDEO_INFO_FLAGS(i) & (flag)) == (flag))
-#define GST_VIDEO_INFO_FLAG_SET(i,flag)    (GST_VIDEO_INFO_FLAGS(i) |= (flag))
-#define GST_VIDEO_INFO_FLAG_UNSET(i,flag)  (GST_VIDEO_INFO_FLAGS(i) &= ~(flag))
-
-/* dealing with planes */
-#define GST_VIDEO_INFO_N_PLANES(i)       (GST_VIDEO_FORMAT_INFO_N_PLANES((i)->finfo))
-#define GST_VIDEO_INFO_PLANE_OFFSET(i,p) ((i)->offset[p])
-#define GST_VIDEO_INFO_PLANE_STRIDE(i,p) ((i)->stride[p])
-
-/* dealing with components */
-#define GST_VIDEO_INFO_N_COMPONENTS(i)   GST_VIDEO_FORMAT_INFO_N_COMPONENTS((i)->finfo)
-#define GST_VIDEO_INFO_COMP_DEPTH(i,c)   GST_VIDEO_FORMAT_INFO_DEPTH((i)->finfo,c)
-#define GST_VIDEO_INFO_COMP_BITS(i,c)    GST_VIDEO_FORMAT_INFO_BITS((i)->finfo,c)
-#define GST_VIDEO_INFO_COMP_DATA(i,d,c)  GST_VIDEO_FORMAT_INFO_DATA((i)->finfo,d,c)
-#define GST_VIDEO_INFO_COMP_OFFSET(i,c)  GST_VIDEO_FORMAT_INFO_OFFSET((i)->finfo,(i)->offset,c)
-#define GST_VIDEO_INFO_COMP_STRIDE(i,c)  GST_VIDEO_FORMAT_INFO_STRIDE((i)->finfo,(i)->stride,c)
-#define GST_VIDEO_INFO_COMP_WIDTH(i,c)   GST_VIDEO_FORMAT_INFO_SCALE_WIDTH((i)->finfo,c,(i)->width)
-#define GST_VIDEO_INFO_COMP_HEIGHT(i,c)  GST_VIDEO_FORMAT_INFO_SCALE_HEIGHT((i)->finfo,c,(i)->height)
-#define GST_VIDEO_INFO_COMP_PLANE(i,c)   GST_VIDEO_FORMAT_INFO_PLANE((i)->finfo,c)
-#define GST_VIDEO_INFO_COMP_PSTRIDE(i,c) GST_VIDEO_FORMAT_INFO_PSTRIDE((i)->finfo,c)
-#define GST_VIDEO_INFO_COMP_POFFSET(i,c) GST_VIDEO_FORMAT_INFO_POFFSET((i)->finfo,c)
-
-void         gst_video_info_init        (GstVideoInfo *info);
-
-void         gst_video_info_set_format  (GstVideoInfo *info, GstVideoFormat format,
-                                         guint width, guint height);
-
-gboolean     gst_video_info_from_caps   (GstVideoInfo *info, const GstCaps  * caps);
-
-GstCaps *    gst_video_info_to_caps     (GstVideoInfo *info);
-
-gboolean     gst_video_info_convert     (GstVideoInfo *info,
-                                         GstFormat     src_format,
-                                         gint64        src_value,
-                                         GstFormat     dest_format,
-                                         gint64       *dest_value);
-gboolean     gst_video_info_is_equal    (const GstVideoInfo *info,
-					 const GstVideoInfo *other);
-/* functions */
-
-const GValue * gst_video_frame_rate (GstPad * pad);
-
-gboolean       gst_video_get_size   (GstPad * pad,
-                                     gint   * width,
-                                     gint   * height);
-
-gboolean       gst_video_calculate_display_ratio (guint * dar_n,
-                                                  guint * dar_d,
-                                                  guint   video_width,
-                                                  guint   video_height,
-                                                  guint   video_par_n,
-                                                  guint   video_par_d,
-                                                  guint   display_par_n,
-                                                  guint   display_par_d);
-
-gboolean       gst_video_format_parse_caps (const GstCaps  * caps,
-                                            GstVideoFormat * format,
-                                            int            * width,
-                                            int            * height);
-
-gboolean       gst_video_format_parse_caps_interlaced  (GstCaps  * caps,
-                                                        gboolean * interlaced);
-
-
-gboolean       gst_video_parse_caps_pixel_aspect_ratio (GstCaps  * caps,
-                                                        int      * par_n,
-                                                        int      * par_d);
-
-gboolean       gst_video_parse_caps_framerate    (GstCaps * caps,
-                                                  int     * fps_n,
-                                                  int     * fps_d);
-
-const char *   gst_video_parse_caps_color_matrix (GstCaps * caps);
-
-const char *   gst_video_parse_caps_chroma_site  (GstCaps * caps);
-
-GstBuffer *    gst_video_parse_caps_palette      (GstCaps * caps);
-
-/* create caps given format and details */
-
-GstCaps *      gst_video_format_new_caps (GstVideoFormat format,
-                                          int width, int height,
-                                          int framerate_n,
-                                          int framerate_d,
-                                          int par_n, int par_d);
-
-GstCaps *      gst_video_format_new_caps_interlaced (GstVideoFormat format,
-                                                     int width, int height,
-                                                     int framerate_n,
-                                                     int framerate_d,
-                                                     int par_n, int par_d,
-                                                     gboolean interlaced);
-
-GstCaps *      gst_video_format_new_template_caps (GstVideoFormat format);
-
-/* format properties */
-GstVideoFormat gst_video_format_from_masks (gint depth, gint bpp, gint endianness,
-					    gint red_mask, gint green_mask,
-					    gint blue_mask, gint alpha_mask) G_GNUC_CONST;
-
-
-GstVideoFormat gst_video_format_from_fourcc (guint32 fourcc) G_GNUC_CONST;
-
-guint32        gst_video_format_to_fourcc (GstVideoFormat format) G_GNUC_CONST;
-
-const gchar *  gst_video_format_to_string (GstVideoFormat format) G_GNUC_CONST;
-
-gboolean       gst_video_format_is_rgb    (GstVideoFormat format) G_GNUC_CONST;
-
-gboolean       gst_video_format_is_yuv    (GstVideoFormat format) G_GNUC_CONST;
-
-gboolean       gst_video_format_is_gray   (GstVideoFormat format) G_GNUC_CONST;
-
-gboolean       gst_video_format_has_alpha (GstVideoFormat format) G_GNUC_CONST;
-
-
-int            gst_video_format_get_component_depth  (GstVideoFormat format,
-                                                      int            component) G_GNUC_CONST;
-
-int            gst_video_format_get_row_stride       (GstVideoFormat format,
-                                                      int            component,
-                                                      int            width) G_GNUC_CONST;
-
-int            gst_video_format_get_pixel_stride     (GstVideoFormat format,
-                                                      int            component) G_GNUC_CONST;
-
-int            gst_video_format_get_component_width  (GstVideoFormat format,
-                                                      int            component,
-                                                      int            width) G_GNUC_CONST;
-
-int            gst_video_format_get_component_height (GstVideoFormat format,
-                                                      int            component,
-                                                      int            height) G_GNUC_CONST;
-
-int            gst_video_format_get_component_offset (GstVideoFormat format,
-                                                      int            component,
-                                                      int            width,
-                                                      int            height) G_GNUC_CONST;
-
-int            gst_video_format_get_size             (GstVideoFormat format,
-                                                      int            width,
-                                                      int            height) G_GNUC_CONST;
-
-gboolean       gst_video_get_size_from_caps (const GstCaps * caps, gint * size);
-
-gboolean       gst_video_format_convert (GstVideoFormat  format,
-                                         int             width,
-                                         int             height,
-                                         int             fps_n,
-                                         int             fps_d,
-                                         GstFormat       src_format,
-                                         gint64          src_value,
-                                         GstFormat       dest_format,
-                                         gint64        * dest_value);
-
-/* video still frame event creation and parsing */
-
-GstEvent *     gst_video_event_new_still_frame   (gboolean in_still);
-
-gboolean       gst_video_event_parse_still_frame (GstEvent * event, gboolean * in_still);
-
-/* video force key unit event creation and parsing */
-
-GstEvent * gst_video_event_new_downstream_force_key_unit (GstClockTime timestamp,
-                                                          GstClockTime streamtime,
-                                                          GstClockTime runningtime,
-                                                          gboolean all_headers,
-                                                          guint count);
-
-gboolean gst_video_event_parse_downstream_force_key_unit (GstEvent * event,
-                                                          GstClockTime * timestamp,
-                                                          GstClockTime * streamtime,
-                                                          GstClockTime * runningtime,
-                                                          gboolean * all_headers,
-                                                          guint * count);
-
-GstEvent * gst_video_event_new_upstream_force_key_unit (GstClockTime running_time,
-                                                        gboolean all_headers,
-                                                        guint count);
-
-gboolean gst_video_event_parse_upstream_force_key_unit (GstEvent * event,
-                                                        GstClockTime * running_time,
-                                                        gboolean * all_headers,
-                                                        guint * count);
-
-gboolean gst_video_event_is_force_key_unit(GstEvent *event);
-
-/* convert/encode video frame from one format to another */
-
-typedef void (*GstVideoConvertFrameCallback) (GstBuffer * buf, GError *error, gpointer user_data);
-
-void           gst_video_convert_frame_async (GstBuffer                    * buf,
-                                              const GstCaps                * to_caps,
-                                              GstClockTime                   timeout,
-                                              GstVideoConvertFrameCallback   callback,
-                                              gpointer                       user_data,
-                                              GDestroyNotify                 destroy_notify);
-
-GstBuffer *    gst_video_convert_frame       (GstBuffer     * buf,
-                                              const GstCaps * to_caps,
-                                              GstClockTime    timeout,
-                                              GError       ** error);
-
-G_END_DECLS
-
-#endif /* __GST_VIDEO_H__ */
diff -Nru gstreamer-vaapi-0.5.10/gst/Makefile.am gstreamer-vaapi-0.6.0/gst/Makefile.am
--- gstreamer-vaapi-0.5.10/gst/Makefile.am	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst/Makefile.am	2015-07-15 12:47:43.000000000 +0000
@@ -1,4 +1,3 @@
 SUBDIRS = vaapi
 
-# Extra clean files so that maintainer-clean removes *everything*
-MAINTAINERCLEANFILES = Makefile.in
+-include $(top_srcdir)/git.mk
diff -Nru gstreamer-vaapi-0.5.10/gst/Makefile.in gstreamer-vaapi-0.6.0/gst/Makefile.in
--- gstreamer-vaapi-0.5.10/gst/Makefile.in	2015-02-03 08:39:54.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst/Makefile.in	2015-07-15 12:50:34.000000000 +0000
@@ -197,10 +197,16 @@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
+EGL_CFLAGS = @EGL_CFLAGS@
+EGL_LIBS = @EGL_LIBS@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GIT = @GIT@
+GLES2_CFLAGS = @GLES2_CFLAGS@
+GLES2_LIBS = @GLES2_LIBS@
+GLES3_CFLAGS = @GLES3_CFLAGS@
+GLES3_LIBS = @GLES3_LIBS@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_VERSION_REQUIRED = @GLIB_VERSION_REQUIRED@
@@ -218,6 +224,8 @@
 GST_CFLAGS = @GST_CFLAGS@
 GST_CODEC_PARSERS_CFLAGS = @GST_CODEC_PARSERS_CFLAGS@
 GST_CODEC_PARSERS_LIBS = @GST_CODEC_PARSERS_LIBS@
+GST_GL_CFLAGS = @GST_GL_CFLAGS@
+GST_GL_LIBS = @GST_GL_LIBS@
 GST_INTERFACES_CFLAGS = @GST_INTERFACES_CFLAGS@
 GST_INTERFACES_LIBS = @GST_INTERFACES_LIBS@
 GST_LIBS = @GST_LIBS@
@@ -227,7 +235,6 @@
 GST_PLUGINS_BASE_LIBS = @GST_PLUGINS_BASE_LIBS@
 GST_PLUGINS_BASE_VERSION_REQUIRED = @GST_PLUGINS_BASE_VERSION_REQUIRED@
 GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
-GST_PLUGIN_PATH = @GST_PLUGIN_PATH@
 GST_PLUGIN_PATH_1_0 = @GST_PLUGIN_PATH_1_0@
 GST_VAAPI_LT_LDFLAGS = @GST_VAAPI_LT_LDFLAGS@
 GST_VAAPI_LT_VERSION = @GST_VAAPI_LT_VERSION@
@@ -365,9 +372,6 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 SUBDIRS = vaapi
-
-# Extra clean files so that maintainer-clean removes *everything*
-MAINTAINERCLEANFILES = Makefile.in
 all: all-recursive
 
 .SUFFIXES:
@@ -597,7 +601,6 @@
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
 clean: clean-recursive
 
 clean-am: clean-generic clean-libtool mostlyclean-am
@@ -680,6 +683,8 @@
 	ps ps-am tags tags-am uninstall uninstall-am
 
 
+-include $(top_srcdir)/git.mk
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -Nru gstreamer-vaapi-0.5.10/gst/vaapi/gstcompat.h gstreamer-vaapi-0.6.0/gst/vaapi/gstcompat.h
--- gstreamer-vaapi-0.5.10/gst/vaapi/gstcompat.h	1970-01-01 00:00:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst/vaapi/gstcompat.h	2015-07-15 12:47:43.000000000 +0000
@@ -0,0 +1,28 @@
+/*
+ *  gstcompat.h - Compatibility glue for GStreamer
+ *
+ *  Copyright (C) 2013 Intel Corporation
+ *    Author: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public License
+ *  as published by the Free Software Foundation; either version 2.1
+ *  of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free
+ *  Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ *  Boston, MA 02110-1301 USA
+ */
+
+#ifndef GST_COMPAT_H
+#define GST_COMPAT_H
+
+#include "gst/vaapi/sysdeps.h"
+
+#endif /* GST_COMPAT_H */
diff -Nru gstreamer-vaapi-0.5.10/gst/vaapi/gsth264parse.c gstreamer-vaapi-0.6.0/gst/vaapi/gsth264parse.c
--- gstreamer-vaapi-0.5.10/gst/vaapi/gsth264parse.c	2015-02-03 08:41:45.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst/vaapi/gsth264parse.c	2015-07-15 12:51:54.000000000 +0000
@@ -42,8 +42,7 @@
 enum
 {
   PROP_0,
-  PROP_CONFIG_INTERVAL,
-  PROP_LAST
+  PROP_CONFIG_INTERVAL
 };
 
 enum
@@ -199,8 +198,10 @@
 }
 
 static void
-gst_h264_parse_reset (GstH264Parse * h264parse)
+gst_h264_parse_reset_stream_info (GstH264Parse * h264parse)
 {
+  gint i;
+
   h264parse->width = 0;
   h264parse->height = 0;
   h264parse->fps_num = 0;
@@ -209,19 +210,32 @@
   h264parse->upstream_par_d = -1;
   h264parse->parsed_par_n = 0;
   h264parse->parsed_par_d = 0;
-  gst_buffer_replace (&h264parse->codec_data, NULL);
-  gst_buffer_replace (&h264parse->codec_data_in, NULL);
-  h264parse->nal_length_size = 4;
-  h264parse->packetized = FALSE;
-  h264parse->transform = FALSE;
+  h264parse->have_pps = FALSE;
+  h264parse->have_sps = FALSE;
 
   h264parse->align = GST_H264_PARSE_ALIGN_NONE;
   h264parse->format = GST_H264_PARSE_FORMAT_NONE;
 
-  h264parse->last_report = GST_CLOCK_TIME_NONE;
+  h264parse->transform = FALSE;
+  h264parse->nal_length_size = 4;
+  h264parse->packetized = FALSE;
   h264parse->push_codec = FALSE;
-  h264parse->have_pps = FALSE;
-  h264parse->have_sps = FALSE;
+
+  gst_buffer_replace (&h264parse->codec_data, NULL);
+  gst_buffer_replace (&h264parse->codec_data_in, NULL);
+
+  gst_h264_parse_reset_frame (h264parse);
+
+  for (i = 0; i < GST_H264_MAX_SPS_COUNT; i++)
+    gst_buffer_replace (&h264parse->sps_nals[i], NULL);
+  for (i = 0; i < GST_H264_MAX_PPS_COUNT; i++)
+    gst_buffer_replace (&h264parse->pps_nals[i], NULL);
+}
+
+static void
+gst_h264_parse_reset (GstH264Parse * h264parse)
+{
+  h264parse->last_report = GST_CLOCK_TIME_NONE;
 
   h264parse->dts = GST_CLOCK_TIME_NONE;
   h264parse->ts_trn_nb = GST_CLOCK_TIME_NONE;
@@ -234,7 +248,7 @@
 
   h264parse->discont = FALSE;
 
-  gst_h264_parse_reset_frame (h264parse);
+  gst_h264_parse_reset_stream_info (h264parse);
 }
 
 static gboolean
@@ -261,17 +275,11 @@
 static gboolean
 gst_h264_parse_stop (GstBaseParse * parse)
 {
-  guint i;
   GstH264Parse *h264parse = GST_H264_PARSE (parse);
 
   GST_DEBUG_OBJECT (parse, "stop");
   gst_h264_parse_reset (h264parse);
 
-  for (i = 0; i < GST_H264_MAX_SPS_COUNT; i++)
-    gst_buffer_replace (&h264parse->sps_nals[i], NULL);
-  for (i = 0; i < GST_H264_MAX_PPS_COUNT; i++)
-    gst_buffer_replace (&h264parse->pps_nals[i], NULL);
-
   gst_h264_nal_parser_free (h264parse->nalparser);
 
   return TRUE;
@@ -356,7 +364,7 @@
   caps = gst_pad_get_allowed_caps (GST_BASE_PARSE_SRC_PAD (h264parse));
   GST_DEBUG_OBJECT (h264parse, "allowed caps: %" GST_PTR_FORMAT, caps);
 
-  /* concentrate on leading structure, since decodebin2 parser
+  /* concentrate on leading structure, since decodebin parser
    * capsfilter always includes parser template caps */
   if (caps) {
     caps = gst_caps_truncate (caps);
@@ -541,6 +549,16 @@
             sei.payload.recovery_point.broken_link_flag,
             sei.payload.recovery_point.changing_slice_group_idc);
         break;
+
+        /* Additional messages that are not innerly useful to the
+         * element but for debugging purposes */
+      case GST_H264_SEI_STEREO_VIDEO_INFO:
+        GST_LOG_OBJECT (h264parse, "stereo video information message");
+        break;
+      case GST_H264_SEI_FRAME_PACKING:
+        GST_LOG_OBJECT (h264parse, "frame packing arrangement message: type %d",
+            sei.payload.frame_packing.frame_packing_type);
+        break;
     }
   }
   g_array_free (messages, TRUE);
@@ -642,6 +660,7 @@
       if (!GST_H264_PARSE_STATE_VALID (h264parse, GST_H264_PARSE_STATE_GOT_SPS))
         return FALSE;
 
+      h264parse->header |= TRUE;
       gst_h264_parse_process_sei (h264parse, nalu);
       /* mark SEI pos */
       if (h264parse->sei_pos == -1) {
@@ -873,7 +892,6 @@
     if (h264parse->split_packetized) {
       GST_ELEMENT_ERROR (h264parse, STREAM, FAILED, (NULL),
           ("invalid AVC input data"));
-      gst_buffer_unref (buffer);
 
       return GST_FLOW_ERROR;
     } else {
@@ -1383,6 +1401,121 @@
   gst_caps_unref (filter_caps);
 }
 
+static const gchar *
+digit_to_string (guint digit)
+{
+  static const char itoa[][2] = {
+    "0", "1", "2", "3", "4", "5", "6", "7", "8", "9"
+  };
+
+  if (G_LIKELY (digit < 10))
+    return itoa[digit];
+  else
+    return NULL;
+}
+
+static const gchar *
+get_profile_string (GstH264SPS * sps)
+{
+  const gchar *profile = NULL;
+
+  switch (sps->profile_idc) {
+    case 66:
+      if (sps->constraint_set1_flag)
+        profile = "constrained-baseline";
+      else
+        profile = "baseline";
+      break;
+    case 77:
+      profile = "main";
+      break;
+    case 88:
+      profile = "extended";
+      break;
+    case 100:
+      profile = "high";
+      break;
+    case 110:
+      if (sps->constraint_set3_flag)
+        profile = "high-10-intra";
+      else
+        profile = "high-10";
+      break;
+    case 122:
+      if (sps->constraint_set3_flag)
+        profile = "high-4:2:2-intra";
+      else
+        profile = "high-4:2:2";
+      break;
+    case 244:
+      if (sps->constraint_set3_flag)
+        profile = "high-4:4:4-intra";
+      else
+        profile = "high-4:4:4";
+      break;
+    case 44:
+      profile = "cavlc-4:4:4-intra";
+      break;
+    case 118:
+      profile = "multiview-high";
+      break;
+    case 128:
+      profile = "stereo-high";
+      break;
+    case 83:
+      if (sps->constraint_set5_flag)
+        profile = "scalable-constrained-baseline";
+      else
+        profile = "scalable-baseline";
+      break;
+    case 86:
+      profile = "scalable-high";
+      break;
+    default:
+      return NULL;
+  }
+
+  return profile;
+}
+
+static const gchar *
+get_level_string (GstH264SPS * sps)
+{
+  if ((sps->level_idc == 11 && sps->constraint_set3_flag)
+      || sps->level_idc == 9)
+    return "1b";
+  else if (sps->level_idc % 10 == 0)
+    return digit_to_string (sps->level_idc / 10);
+  else {
+    switch (sps->level_idc) {
+      case 11:
+        return "1.1";
+      case 12:
+        return "1.2";
+      case 13:
+        return "1.3";
+      case 21:
+        return "2.1";
+      case 22:
+        return "2.2";
+      case 31:
+        return "3.1";
+      case 32:
+        return "3.2";
+      case 41:
+        return "4.1";
+      case 42:
+        return "4.2";
+      case 51:
+        return "5.1";
+      case 52:
+        return "5.2";
+      default:
+        return NULL;
+    }
+  }
+}
+
 static void
 gst_h264_parse_update_src_caps (GstH264Parse * h264parse, GstCaps * caps)
 {
@@ -1542,17 +1675,18 @@
 
     /* set profile and level in caps */
     if (sps) {
-      GstMapInfo map;
-      GstBuffer *sps_buf = h264parse->sps_nals[sps->id];
+      const gchar *profile, *level;
 
-      if (sps_buf) {
-        gst_buffer_map (sps_buf, &map, GST_MAP_READ);
-        gst_codec_utils_h264_caps_set_level_and_profile (caps,
-            map.data + 1, map.size - 1);
-        gst_buffer_unmap (sps_buf, &map);
-        /* relax the profile constraint to find a suitable decoder */
-        ensure_caps_profile (h264parse, caps, sps);
-      }
+      profile = get_profile_string (sps);
+      if (profile != NULL)
+        gst_caps_set_simple (caps, "profile", G_TYPE_STRING, profile, NULL);
+
+      level = get_level_string (sps);
+      if (level != NULL)
+        gst_caps_set_simple (caps, "level", G_TYPE_STRING, level, NULL);
+
+      /* relax the profile constraint to find a suitable decoder */
+      ensure_caps_profile (h264parse, caps, sps);
     }
 
     src_caps = gst_pad_get_current_caps (GST_BASE_PARSE_SRC_PAD (h264parse));
@@ -2068,18 +2202,26 @@
 {
   GstH264Parse *h264parse;
   GstStructure *str;
-  const GValue *value;
+  const GValue *codec_data_value;
   GstBuffer *codec_data = NULL;
   gsize size;
   guint format, align, off;
   GstH264NalUnit nalu;
   GstH264ParserResult parseres;
+  GstCaps *old_caps;
 
   h264parse = GST_H264_PARSE (parse);
 
   /* reset */
   h264parse->push_codec = FALSE;
 
+  old_caps = gst_pad_get_current_caps (GST_BASE_PARSE_SINK_PAD (parse));
+  if (old_caps) {
+    if (!gst_caps_is_equal (old_caps, caps))
+      gst_h264_parse_reset_stream_info (h264parse);
+    gst_caps_unref (old_caps);
+  }
+
   str = gst_caps_get_structure (caps, 0);
 
   /* accept upstream info if provided */
@@ -2093,9 +2235,45 @@
   /* get upstream format and align from caps */
   gst_h264_parse_format_from_caps (caps, &format, &align);
 
-  /* packetized video has a codec_data */
-  if (format != GST_H264_PARSE_FORMAT_BYTE &&
-      (value = gst_structure_get_value (str, "codec_data"))) {
+  codec_data_value = gst_structure_get_value (str, "codec_data");
+
+  /* fix up caps without stream-format for max. backwards compatibility */
+  if (format == GST_H264_PARSE_FORMAT_NONE) {
+    /* codec_data implies avc */
+    if (codec_data_value != NULL) {
+      GST_ERROR ("video/x-h264 caps with codec_data but no stream-format=avc");
+      format = GST_H264_PARSE_FORMAT_AVC;
+    } else {
+      /* otherwise assume bytestream input */
+      GST_ERROR ("video/x-h264 caps without codec_data or stream-format");
+      format = GST_H264_PARSE_FORMAT_BYTE;
+    }
+  }
+
+  /* avc caps sanity checks */
+  if (format == GST_H264_PARSE_FORMAT_AVC) {
+    /* AVC requires codec_data, AVC3 might have one and/or SPS/PPS inline */
+    if (codec_data_value == NULL)
+      goto avc_caps_codec_data_missing;
+
+    /* AVC implies alignment=au, everything else is not allowed */
+    if (align == GST_H264_PARSE_ALIGN_NONE)
+      align = GST_H264_PARSE_ALIGN_AU;
+    else if (align != GST_H264_PARSE_ALIGN_AU)
+      goto avc_caps_wrong_alignment;
+  }
+
+  /* bytestream caps sanity checks */
+  if (format == GST_H264_PARSE_FORMAT_BYTE) {
+    if (align == GST_H264_PARSE_ALIGN_NONE)
+      align = GST_H264_PARSE_ALIGN_NAL;
+    /* should have SPS/PSS in-band (and/or oob in streamheader field) */
+    if (codec_data_value != NULL)
+      goto bytestream_caps_with_codec_data;
+  }
+
+  /* packetized video has codec_data (required for AVC, optional for AVC3) */
+  if (codec_data_value != NULL) {
     GstMapInfo map;
     guint8 *data;
     guint num_sps, num_pps;
@@ -2108,9 +2286,13 @@
     /* make note for optional split processing */
     h264parse->packetized = TRUE;
 
-    codec_data = gst_value_get_buffer (value);
+    /* codec_data field should hold a buffer */
+    if (!GST_VALUE_HOLDS_BUFFER (codec_data_value))
+      goto avc_caps_codec_data_wrong_type;
+
+    codec_data = gst_value_get_buffer (codec_data_value);
     if (!codec_data)
-      goto wrong_type;
+      goto avc_caps_codec_data_missing;
     gst_buffer_map (codec_data, &map, GST_MAP_READ);
     data = map.data;
     size = map.size;
@@ -2172,24 +2354,14 @@
     gst_buffer_unmap (codec_data, &map);
 
     gst_buffer_replace (&h264parse->codec_data_in, codec_data);
-
-    /* if upstream sets codec_data without setting stream-format and alignment, we
-     * assume stream-format=avc,alignment=au */
-    if (format == GST_H264_PARSE_FORMAT_NONE)
-      format = GST_H264_PARSE_FORMAT_AVC;
-    if (align == GST_H264_PARSE_ALIGN_NONE)
-      align = GST_H264_PARSE_ALIGN_AU;
-  } else {
+  } else if (format == GST_H264_PARSE_FORMAT_BYTE) {
     GST_DEBUG_OBJECT (h264parse, "have bytestream h264");
     /* nothing to pre-process */
     h264parse->packetized = FALSE;
     /* we have 4 sync bytes */
     h264parse->nal_length_size = 4;
-
-    if (format == GST_H264_PARSE_FORMAT_NONE) {
-      format = GST_H264_PARSE_FORMAT_BYTE;
-      align = GST_H264_PARSE_ALIGN_NAL;
-    }
+  } else {
+    /* probably AVC3 without codec_data field, anything to do here? */
   }
 
   {
@@ -2231,6 +2403,27 @@
   return TRUE;
 
   /* ERRORS */
+avc_caps_codec_data_wrong_type:
+  {
+    GST_WARNING_OBJECT (parse, "H.264 AVC caps, codec_data field not a buffer");
+    goto refuse_caps;
+  }
+avc_caps_codec_data_missing:
+  {
+    GST_WARNING_OBJECT (parse, "H.264 AVC caps, but no codec_data");
+    goto refuse_caps;
+  }
+avc_caps_wrong_alignment:
+  {
+    GST_WARNING_OBJECT (parse, "H.264 AVC caps with NAL alignment, must be AU");
+    goto refuse_caps;
+  }
+bytestream_caps_with_codec_data:
+  {
+    GST_WARNING_OBJECT (parse, "H.264 bytestream caps with codec_data is not "
+        "expected, send SPS/PPS in-band with data or in streamheader field");
+    goto refuse_caps;
+  }
 avcc_too_small:
   {
     GST_DEBUG_OBJECT (h264parse, "avcC size %" G_GSIZE_FORMAT " < 8", size);
@@ -2241,11 +2434,6 @@
     GST_DEBUG_OBJECT (h264parse, "wrong avcC version");
     goto refuse_caps;
   }
-wrong_type:
-  {
-    GST_DEBUG_OBJECT (h264parse, "wrong codec-data type");
-    goto refuse_caps;
-  }
 refuse_caps:
   {
     GST_WARNING_OBJECT (h264parse, "refused caps %" GST_PTR_FORMAT, caps);
diff -Nru gstreamer-vaapi-0.5.10/gst/vaapi/gsth265parse.c gstreamer-vaapi-0.6.0/gst/vaapi/gsth265parse.c
--- gstreamer-vaapi-0.5.10/gst/vaapi/gsth265parse.c	1970-01-01 00:00:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst/vaapi/gsth265parse.c	2015-07-15 12:51:54.000000000 +0000
@@ -0,0 +1,2170 @@
+/* GStreamer H.265 Parser
+ * Copyright (C) 2013 Intel Corporation
+ *  Contact:Sreerenj Balachandran <sreerenj.balachandran@intel.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
+#include "gstvaapiparse.h"
+#include <gst/base/base.h>
+#include <gst/pbutils/pbutils.h>
+#include <gst/video/video.h>
+#include "gsth265parse.h"
+
+#include <string.h>
+
+GST_DEBUG_CATEGORY (h265_parse_debug);
+#define GST_CAT_DEFAULT h265_parse_debug
+
+#define DEFAULT_CONFIG_INTERVAL      (0)
+
+enum
+{
+  PROP_0,
+  PROP_CONFIG_INTERVAL,
+  PROP_LAST
+};
+
+enum
+{
+  GST_H265_PARSE_FORMAT_NONE,
+  GST_H265_PARSE_FORMAT_HVC1,
+  GST_H265_PARSE_FORMAT_HEV1,
+  GST_H265_PARSE_FORMAT_BYTE
+};
+
+enum
+{
+  GST_H265_PARSE_ALIGN_NONE = 0,
+  GST_H265_PARSE_ALIGN_NAL,
+  GST_H265_PARSE_ALIGN_AU
+};
+
+static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE ("sink",
+    GST_PAD_SINK,
+    GST_PAD_ALWAYS,
+    GST_STATIC_CAPS ("video/x-h265"));
+
+static GstStaticPadTemplate srctemplate = GST_STATIC_PAD_TEMPLATE ("src",
+    GST_PAD_SRC,
+    GST_PAD_ALWAYS,
+    GST_STATIC_CAPS ("video/x-h265, parsed = (boolean) true, "
+        "stream-format=(string) { hvc1, hev1, byte-stream }, "
+        "alignment=(string) { au, nal }"));
+
+#define parent_class gst_h265_parse_parent_class
+G_DEFINE_TYPE (GstH265Parse, gst_h265_parse, GST_TYPE_BASE_PARSE);
+
+static void gst_h265_parse_finalize (GObject * object);
+
+static gboolean gst_h265_parse_start (GstBaseParse * parse);
+static gboolean gst_h265_parse_stop (GstBaseParse * parse);
+static GstFlowReturn gst_h265_parse_handle_frame (GstBaseParse * parse,
+    GstBaseParseFrame * frame, gint * skipsize);
+static GstFlowReturn gst_h265_parse_parse_frame (GstBaseParse * parse,
+    GstBaseParseFrame * frame);
+static GstFlowReturn gst_h265_parse_pre_push_frame (GstBaseParse * parse,
+    GstBaseParseFrame * frame);
+
+static void gst_h265_parse_set_property (GObject * object, guint prop_id,
+    const GValue * value, GParamSpec * pspec);
+static void gst_h265_parse_get_property (GObject * object, guint prop_id,
+    GValue * value, GParamSpec * pspec);
+
+static gboolean gst_h265_parse_set_caps (GstBaseParse * parse, GstCaps * caps);
+static GstCaps *gst_h265_parse_get_caps (GstBaseParse * parse,
+    GstCaps * filter);
+static gboolean gst_h265_parse_event (GstBaseParse * parse, GstEvent * event);
+static gboolean gst_h265_parse_src_event (GstBaseParse * parse,
+    GstEvent * event);
+
+static void
+gst_h265_parse_class_init (GstH265ParseClass * klass)
+{
+  GObjectClass *gobject_class = (GObjectClass *) klass;
+  GstBaseParseClass *parse_class = GST_BASE_PARSE_CLASS (klass);
+  GstElementClass *gstelement_class = GST_ELEMENT_CLASS (klass);
+
+  GST_DEBUG_CATEGORY_INIT (h265_parse_debug, "vaapiparse_h265", 0, "h265 parser");
+
+  gobject_class->finalize = gst_h265_parse_finalize;
+  gobject_class->set_property = gst_h265_parse_set_property;
+  gobject_class->get_property = gst_h265_parse_get_property;
+
+  g_object_class_install_property (gobject_class, PROP_CONFIG_INTERVAL,
+      g_param_spec_uint ("config-interval",
+          "VPS SPS PPS Send Interval",
+          "Send VPS, SPS and PPS Insertion Interval in seconds (sprop parameter sets "
+          "will be multiplexed in the data stream when detected.) (0 = disabled)",
+          0, 3600, DEFAULT_CONFIG_INTERVAL,
+          G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS));
+  /* Override BaseParse vfuncs */
+  parse_class->start = GST_DEBUG_FUNCPTR (gst_h265_parse_start);
+  parse_class->stop = GST_DEBUG_FUNCPTR (gst_h265_parse_stop);
+  parse_class->handle_frame = GST_DEBUG_FUNCPTR (gst_h265_parse_handle_frame);
+  parse_class->pre_push_frame =
+      GST_DEBUG_FUNCPTR (gst_h265_parse_pre_push_frame);
+  parse_class->set_sink_caps = GST_DEBUG_FUNCPTR (gst_h265_parse_set_caps);
+  parse_class->get_sink_caps = GST_DEBUG_FUNCPTR (gst_h265_parse_get_caps);
+  parse_class->sink_event = GST_DEBUG_FUNCPTR (gst_h265_parse_event);
+  parse_class->src_event = GST_DEBUG_FUNCPTR (gst_h265_parse_src_event);
+
+  gst_element_class_add_pad_template (gstelement_class,
+      gst_static_pad_template_get (&srctemplate));
+  gst_element_class_add_pad_template (gstelement_class,
+      gst_static_pad_template_get (&sinktemplate));
+
+  gst_element_class_set_static_metadata (gstelement_class, "H.265 parser",
+      "Codec/Parser/Converter/Video",
+      "Parses H.265 streams",
+      "Sreerenj Balachandran <sreerenj.balachandran@intel.com>");
+}
+
+static void
+gst_h265_parse_init (GstH265Parse * h265parse)
+{
+  h265parse->frame_out = gst_adapter_new ();
+  gst_base_parse_set_pts_interpolation (GST_BASE_PARSE (h265parse), FALSE);
+  GST_PAD_SET_ACCEPT_INTERSECT (GST_BASE_PARSE_SINK_PAD (h265parse));
+}
+
+
+static void
+gst_h265_parse_finalize (GObject * object)
+{
+  GstH265Parse *h265parse = GST_H265_PARSE (object);
+
+  g_object_unref (h265parse->frame_out);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gst_h265_parse_reset_frame (GstH265Parse * h265parse)
+{
+  GST_DEBUG_OBJECT (h265parse, "reset frame");
+
+  /* done parsing; reset state */
+  h265parse->current_off = -1;
+
+  h265parse->picture_start = FALSE;
+  h265parse->update_caps = FALSE;
+  h265parse->idr_pos = -1;
+  h265parse->sei_pos = -1;
+  h265parse->keyframe = FALSE;
+  h265parse->header = FALSE;
+  gst_adapter_clear (h265parse->frame_out);
+}
+
+static void
+gst_h265_parse_reset (GstH265Parse * h265parse)
+{
+  h265parse->width = 0;
+  h265parse->height = 0;
+  h265parse->fps_num = 0;
+  h265parse->fps_den = 0;
+  h265parse->upstream_par_n = -1;
+  h265parse->upstream_par_d = -1;
+  h265parse->parsed_par_n = 0;
+  h265parse->parsed_par_n = 0;
+  gst_buffer_replace (&h265parse->codec_data, NULL);
+  gst_buffer_replace (&h265parse->codec_data_in, NULL);
+  h265parse->nal_length_size = 4;
+  h265parse->packetized = FALSE;
+  h265parse->transform = FALSE;
+
+  h265parse->align = GST_H265_PARSE_ALIGN_NONE;
+  h265parse->format = GST_H265_PARSE_FORMAT_NONE;
+
+  h265parse->last_report = GST_CLOCK_TIME_NONE;
+  h265parse->push_codec = FALSE;
+  h265parse->have_pps = FALSE;
+  h265parse->have_sps = FALSE;
+  h265parse->have_vps = FALSE;
+
+  h265parse->sent_codec_tag = FALSE;
+
+  h265parse->pending_key_unit_ts = GST_CLOCK_TIME_NONE;
+  h265parse->force_key_unit_event = NULL;
+
+  gst_h265_parse_reset_frame (h265parse);
+}
+
+static gboolean
+gst_h265_parse_start (GstBaseParse * parse)
+{
+  GstH265Parse *h265parse = GST_H265_PARSE (parse);
+
+  GST_DEBUG_OBJECT (parse, "start");
+  gst_h265_parse_reset (h265parse);
+
+  h265parse->nalparser = gst_h265_parser_new ();
+
+  gst_base_parse_set_min_frame_size (parse, 7);
+
+  return TRUE;
+}
+
+static gboolean
+gst_h265_parse_stop (GstBaseParse * parse)
+{
+  guint i;
+  GstH265Parse *h265parse = GST_H265_PARSE (parse);
+
+  GST_DEBUG_OBJECT (parse, "stop");
+  gst_h265_parse_reset (h265parse);
+
+  for (i = 0; i < GST_H265_MAX_VPS_COUNT; i++)
+    gst_buffer_replace (&h265parse->vps_nals[i], NULL);
+  for (i = 0; i < GST_H265_MAX_SPS_COUNT; i++)
+    gst_buffer_replace (&h265parse->sps_nals[i], NULL);
+  for (i = 0; i < GST_H265_MAX_PPS_COUNT; i++)
+    gst_buffer_replace (&h265parse->pps_nals[i], NULL);
+
+  gst_h265_parser_free (h265parse->nalparser);
+
+  return TRUE;
+}
+
+static const gchar *
+gst_h265_parse_get_string (GstH265Parse * parse, gboolean format, gint code)
+{
+  if (format) {
+    switch (code) {
+      case GST_H265_PARSE_FORMAT_HVC1:
+        return "hvc1";
+      case GST_H265_PARSE_FORMAT_HEV1:
+        return "hev1";
+      case GST_H265_PARSE_FORMAT_BYTE:
+        return "byte-stream";
+      default:
+        return "none";
+    }
+  } else {
+    switch (code) {
+      case GST_H265_PARSE_ALIGN_NAL:
+        return "nal";
+      case GST_H265_PARSE_ALIGN_AU:
+        return "au";
+      default:
+        return "none";
+    }
+  }
+}
+
+static void
+gst_h265_parse_format_from_caps (GstCaps * caps, guint * format, guint * align)
+{
+  g_return_if_fail (gst_caps_is_fixed (caps));
+
+  GST_DEBUG ("parsing caps: %" GST_PTR_FORMAT, caps);
+
+  if (format)
+    *format = GST_H265_PARSE_FORMAT_NONE;
+
+  if (align)
+    *align = GST_H265_PARSE_ALIGN_NONE;
+
+  if (caps && gst_caps_get_size (caps) > 0) {
+    GstStructure *s = gst_caps_get_structure (caps, 0);
+    const gchar *str = NULL;
+
+    if (format) {
+      if ((str = gst_structure_get_string (s, "stream-format"))) {
+        if (strcmp (str, "hvc1") == 0)
+          *format = GST_H265_PARSE_FORMAT_HVC1;
+        else if (strcmp (str, "hev1") == 0)
+          *format = GST_H265_PARSE_FORMAT_HEV1;
+        else if (strcmp (str, "byte-stream") == 0)
+          *format = GST_H265_PARSE_FORMAT_BYTE;
+      }
+    }
+
+    if (align) {
+      if ((str = gst_structure_get_string (s, "alignment"))) {
+        if (strcmp (str, "au") == 0)
+          *align = GST_H265_PARSE_ALIGN_AU;
+        else if (strcmp (str, "nal") == 0)
+          *align = GST_H265_PARSE_ALIGN_NAL;
+      }
+    }
+  }
+}
+
+/* check downstream caps to configure format and alignment */
+static void
+gst_h265_parse_negotiate (GstH265Parse * h265parse, gint in_format,
+    GstCaps * in_caps)
+{
+  GstCaps *caps;
+  guint format = GST_H265_PARSE_FORMAT_NONE;
+  guint align = GST_H265_PARSE_ALIGN_NONE;
+
+  g_return_if_fail ((in_caps == NULL) || gst_caps_is_fixed (in_caps));
+
+  caps = gst_pad_get_allowed_caps (GST_BASE_PARSE_SRC_PAD (h265parse));
+  GST_DEBUG_OBJECT (h265parse, "allowed caps: %" GST_PTR_FORMAT, caps);
+
+  /* concentrate on leading structure, since decodebin2 parser
+   * capsfilter always includes parser template caps */
+  if (caps) {
+    caps = gst_caps_truncate (caps);
+    GST_DEBUG_OBJECT (h265parse, "negotiating with caps: %" GST_PTR_FORMAT,
+        caps);
+  }
+
+  if (in_caps && caps) {
+    if (gst_caps_can_intersect (in_caps, caps)) {
+      GST_DEBUG_OBJECT (h265parse, "downstream accepts upstream caps");
+      gst_h265_parse_format_from_caps (in_caps, &format, &align);
+      gst_caps_unref (caps);
+      caps = NULL;
+    }
+  }
+
+  if (caps) {
+    /* fixate to avoid ambiguity with lists when parsing */
+    caps = gst_caps_fixate (caps);
+    gst_h265_parse_format_from_caps (caps, &format, &align);
+    gst_caps_unref (caps);
+  }
+
+  /* default */
+  if (!format)
+    format = GST_H265_PARSE_FORMAT_BYTE;
+  if (!align)
+    align = GST_H265_PARSE_ALIGN_AU;
+
+  GST_DEBUG_OBJECT (h265parse, "selected format %s, alignment %s",
+      gst_h265_parse_get_string (h265parse, TRUE, format),
+      gst_h265_parse_get_string (h265parse, FALSE, align));
+
+  h265parse->format = format;
+  h265parse->align = align;
+
+  h265parse->transform = (in_format != h265parse->format);
+}
+
+static GstBuffer *
+gst_h265_parse_wrap_nal (GstH265Parse * h265parse, guint format, guint8 * data,
+    guint size)
+{
+  GstBuffer *buf;
+  guint nl = h265parse->nal_length_size;
+  guint32 tmp;
+
+  GST_DEBUG_OBJECT (h265parse, "nal length %d", size);
+
+  buf = gst_buffer_new_allocate (NULL, 4 + size, NULL);
+  if (format == GST_H265_PARSE_FORMAT_HVC1
+      || format == GST_H265_PARSE_FORMAT_HEV1) {
+    tmp = GUINT32_TO_BE (size << (32 - 8 * nl));
+  } else {
+    /* HACK: nl should always be 4 here, otherwise this won't work.
+     * There are legit cases where nl in hevc stream is 2, but byte-stream
+     * SC is still always 4 bytes. */
+    nl = 4;
+    tmp = GUINT32_TO_BE (1);
+  }
+
+  gst_buffer_fill (buf, 0, &tmp, sizeof (guint32));
+  gst_buffer_fill (buf, nl, data, size);
+  gst_buffer_set_size (buf, size + nl);
+
+  return buf;
+}
+
+static void
+gst_h265_parser_store_nal (GstH265Parse * h265parse, guint id,
+    GstH265NalUnitType naltype, GstH265NalUnit * nalu)
+{
+  GstBuffer *buf, **store;
+  guint size = nalu->size, store_size;
+
+  if (naltype == GST_H265_NAL_VPS) {
+    store_size = GST_H265_MAX_VPS_COUNT;
+    store = h265parse->vps_nals;
+    GST_DEBUG_OBJECT (h265parse, "storing vps %u", id);
+  } else if (naltype == GST_H265_NAL_SPS) {
+    store_size = GST_H265_MAX_SPS_COUNT;
+    store = h265parse->sps_nals;
+    GST_DEBUG_OBJECT (h265parse, "storing sps %u", id);
+  } else if (naltype == GST_H265_NAL_PPS) {
+    store_size = GST_H265_MAX_PPS_COUNT;
+    store = h265parse->pps_nals;
+    GST_DEBUG_OBJECT (h265parse, "storing pps %u", id);
+  } else
+    return;
+
+  if (id >= store_size) {
+    GST_DEBUG_OBJECT (h265parse, "unable to store nal, id out-of-range %d", id);
+    return;
+  }
+
+  buf = gst_buffer_new_allocate (NULL, size, NULL);
+  gst_buffer_fill (buf, 0, nalu->data + nalu->offset, size);
+
+  /* Indicate that buffer contain a header needed for decoding */
+  if (naltype >= GST_H265_NAL_VPS && naltype <= GST_H265_NAL_PPS)
+    GST_BUFFER_FLAG_SET (buf, GST_BUFFER_FLAG_HEADER);
+
+  if (store[id])
+    gst_buffer_unref (store[id]);
+
+  store[id] = buf;
+}
+
+#ifndef GST_DISABLE_GST_DEBUG
+static const gchar *nal_names[] = {
+  "Slice_TRAIL_N",
+  "Slice_TRAIL_R",
+  "Slice_TSA_N",
+  "Slice_TSA_R",
+  "Slice_STSA_N",
+  "Slice_STSA_R",
+  "Slice_RADL_N",
+  "Slice_RADL_R",
+  "SLICE_RASL_N",
+  "SLICE_RASL_R",
+  "Invalid (10)",
+  "Invalid (11)",
+  "Invalid (12)",
+  "Invalid (13)",
+  "Invalid (14)",
+  "Invalid (15)",
+  "SLICE_BLA_W_LP",
+  "SLICE_BLA_W_RADL",
+  "SLICE_BLA_N_LP",
+  "SLICE_IDR_W_RADL",
+  "SLICE_IDR_N_LP",
+  "SLICE_CRA_NUT",
+  "Invalid (22)",
+  "Invalid (23)",
+  "Invalid (24)",
+  "Invalid (25)",
+  "Invalid (26)",
+  "Invalid (27)",
+  "Invalid (28)",
+  "Invalid (29)",
+  "Invalid (30)",
+  "Invalid (31)",
+  "VPS",
+  "SPS",
+  "PPS",
+  "AUD",
+  "EOS",
+  "EOB",
+  "FD",
+  "PREFIX_SEI",
+  "SUFFIX_SEI"
+};
+
+static const gchar *
+_nal_name (GstH265NalUnitType nal_type)
+{
+  if (nal_type <= GST_H265_NAL_SUFFIX_SEI)
+    return nal_names[nal_type];
+  return "Invalid";
+}
+#endif
+
+/* caller guarantees 2 bytes of nal payload */
+static void
+gst_h265_parse_process_nal (GstH265Parse * h265parse, GstH265NalUnit * nalu)
+{
+  GstH265PPS pps = { 0, };
+  GstH265SPS sps = { 0, };
+  GstH265VPS vps = { 0, };
+  gboolean is_irap;
+  guint nal_type;
+  GstH265Parser *nalparser = h265parse->nalparser;
+  GstH265ParserResult pres = GST_H265_PARSER_ERROR;
+
+  /* nothing to do for broken input */
+  if (G_UNLIKELY (nalu->size < 3)) {
+    GST_DEBUG_OBJECT (h265parse, "not processing nal size %u", nalu->size);
+    return;
+  }
+
+  /* we have a peek as well */
+  nal_type = nalu->type;
+
+  GST_DEBUG_OBJECT (h265parse, "processing nal of type %u %s, size %u",
+      nal_type, _nal_name (nal_type), nalu->size);
+  switch (nal_type) {
+    case GST_H265_NAL_VPS:
+      /* It is not mandatory to have VPS in the stream. But it might
+       * be needed for other extensions like svc */
+      pres = gst_h265_parser_parse_vps (nalparser, nalu, &vps);
+      if (pres != GST_H265_PARSER_OK)
+        GST_WARNING_OBJECT (h265parse, "failed to parse VPS");
+
+      GST_DEBUG_OBJECT (h265parse, "triggering src caps check");
+      h265parse->update_caps = TRUE;
+      h265parse->have_vps = TRUE;
+      if (h265parse->push_codec && h265parse->have_pps) {
+        /* VPS/SPS/PPS found in stream before the first pre_push_frame, no need
+         * to forcibly push at start */
+        GST_INFO_OBJECT (h265parse, "have VPS/SPS/PPS in stream");
+        h265parse->push_codec = FALSE;
+        h265parse->have_vps = FALSE;
+        h265parse->have_sps = FALSE;
+        h265parse->have_pps = FALSE;
+      }
+
+      gst_h265_parser_store_nal (h265parse, vps.id, nal_type, nalu);
+      h265parse->header |= TRUE;
+      break;
+    case GST_H265_NAL_SPS:
+      pres = gst_h265_parser_parse_sps (nalparser, nalu, &sps, TRUE);
+
+
+      /* arranged for a fallback sps.id, so use that one and only warn */
+      if (pres != GST_H265_PARSER_OK)
+        GST_WARNING_OBJECT (h265parse, "failed to parse SPS:");
+
+      GST_DEBUG_OBJECT (h265parse, "triggering src caps check");
+      h265parse->update_caps = TRUE;
+      h265parse->have_sps = TRUE;
+      if (h265parse->push_codec && h265parse->have_pps) {
+        /* SPS and PPS found in stream before the first pre_push_frame, no need
+         * to forcibly push at start */
+        GST_INFO_OBJECT (h265parse, "have SPS/PPS in stream");
+        h265parse->push_codec = FALSE;
+        h265parse->have_sps = FALSE;
+        h265parse->have_pps = FALSE;
+      }
+
+      gst_h265_parser_store_nal (h265parse, sps.id, nal_type, nalu);
+      h265parse->header |= TRUE;
+      break;
+    case GST_H265_NAL_PPS:
+      pres = gst_h265_parser_parse_pps (nalparser, nalu, &pps);
+
+
+      /* arranged for a fallback pps.id, so use that one and only warn */
+      if (pres != GST_H265_PARSER_OK)
+        GST_WARNING_OBJECT (h265parse, "failed to parse PPS:");
+
+      /* parameters might have changed, force caps check */
+      if (!h265parse->have_pps) {
+        GST_DEBUG_OBJECT (h265parse, "triggering src caps check");
+        h265parse->update_caps = TRUE;
+      }
+      h265parse->have_pps = TRUE;
+      if (h265parse->push_codec && h265parse->have_sps) {
+        /* SPS and PPS found in stream before the first pre_push_frame, no need
+         * to forcibly push at start */
+        GST_INFO_OBJECT (h265parse, "have SPS/PPS in stream");
+        h265parse->push_codec = FALSE;
+        h265parse->have_sps = FALSE;
+        h265parse->have_pps = FALSE;
+      }
+
+      gst_h265_parser_store_nal (h265parse, pps.id, nal_type, nalu);
+      h265parse->header |= TRUE;
+      break;
+    case GST_H265_NAL_PREFIX_SEI:
+    case GST_H265_NAL_SUFFIX_SEI:
+      /*Fixme: parse sei messages */
+      /* mark SEI pos */
+      if (h265parse->sei_pos == -1) {
+        if (h265parse->transform)
+          h265parse->sei_pos = gst_adapter_available (h265parse->frame_out);
+        else
+          h265parse->sei_pos = nalu->sc_offset;
+        GST_DEBUG_OBJECT (h265parse, "marking SEI in frame at offset %d",
+            h265parse->sei_pos);
+      }
+      break;
+
+    case GST_H265_NAL_SLICE_TRAIL_N:
+    case GST_H265_NAL_SLICE_TRAIL_R:
+    case GST_H265_NAL_SLICE_TSA_N:
+    case GST_H265_NAL_SLICE_TSA_R:
+    case GST_H265_NAL_SLICE_STSA_N:
+    case GST_H265_NAL_SLICE_STSA_R:
+    case GST_H265_NAL_SLICE_RADL_N:
+    case GST_H265_NAL_SLICE_RADL_R:
+    case GST_H265_NAL_SLICE_RASL_N:
+    case GST_H265_NAL_SLICE_RASL_R:
+    case GST_H265_NAL_SLICE_BLA_W_LP:
+    case GST_H265_NAL_SLICE_BLA_W_RADL:
+    case GST_H265_NAL_SLICE_BLA_N_LP:
+    case GST_H265_NAL_SLICE_IDR_W_RADL:
+    case GST_H265_NAL_SLICE_IDR_N_LP:
+    case GST_H265_NAL_SLICE_CRA_NUT:
+    {
+      GstH265SliceHdr slice;
+
+      pres = gst_h265_parser_parse_slice_hdr (nalparser, nalu, &slice);
+
+      if (pres == GST_H265_PARSER_OK) {
+        if (GST_H265_IS_I_SLICE (&slice))
+          h265parse->keyframe |= TRUE;
+      }
+      if (slice.first_slice_segment_in_pic_flag == 1)
+        GST_DEBUG_OBJECT (h265parse,
+            "frame start, first_slice_segment_in_pic_flag = 1");
+
+      GST_DEBUG_OBJECT (h265parse,
+          "parse result %d, first slice_segment: %u, slice type: %u",
+          pres, slice.first_slice_segment_in_pic_flag, slice.type);
+
+      gst_h265_slice_hdr_free (&slice);
+    }
+
+      is_irap = ((nal_type >= GST_H265_NAL_SLICE_BLA_W_LP)
+          && (nal_type <= GST_H265_NAL_SLICE_CRA_NUT)) ? TRUE : FALSE;
+      if (G_LIKELY (!is_irap && !h265parse->push_codec))
+        break;
+
+      /* if we need to sneak codec NALs into the stream,
+       * this is a good place, so fake it as IDR
+       * (which should be at start anyway) */
+      /* mark where config needs to go if interval expired */
+      /* mind replacement buffer if applicable */
+      if (h265parse->idr_pos == -1) {
+        if (h265parse->transform)
+          h265parse->idr_pos = gst_adapter_available (h265parse->frame_out);
+        else
+          h265parse->idr_pos = nalu->sc_offset;
+        GST_DEBUG_OBJECT (h265parse, "marking IDR in frame at offset %d",
+            h265parse->idr_pos);
+      }
+      /* if SEI preceeds (faked) IDR, then we have to insert config there */
+      if (h265parse->sei_pos >= 0 && h265parse->idr_pos > h265parse->sei_pos) {
+        h265parse->idr_pos = h265parse->sei_pos;
+        GST_DEBUG_OBJECT (h265parse, "moved IDR mark to SEI position %d",
+            h265parse->idr_pos);
+      }
+      break;
+    default:
+      gst_h265_parser_parse_nal (nalparser, nalu);
+  }
+
+  /* if HEVC output needed, collect properly prefixed nal in adapter,
+   * and use that to replace outgoing buffer data later on */
+  if (h265parse->transform) {
+    GstBuffer *buf;
+
+    GST_LOG_OBJECT (h265parse, "collecting NAL in HEVC frame");
+    buf = gst_h265_parse_wrap_nal (h265parse, h265parse->format,
+        nalu->data + nalu->offset, nalu->size);
+    gst_adapter_push (h265parse->frame_out, buf);
+  }
+}
+
+/* caller guarantees at least 3 bytes of nal payload for each nal
+ * returns TRUE if next_nal indicates that nal terminates an AU */
+static inline gboolean
+gst_h265_parse_collect_nal (GstH265Parse * h265parse, const guint8 * data,
+    guint size, GstH265NalUnit * nalu)
+{
+  gboolean complete;
+  GstH265ParserResult parse_res;
+  GstH265NalUnitType nal_type = nalu->type;
+  GstH265NalUnit nnalu;
+
+  GST_DEBUG_OBJECT (h265parse, "parsing collected nal");
+  parse_res = gst_h265_parser_identify_nalu (h265parse->nalparser, data,
+      nalu->offset + nalu->size, size, &nnalu);
+
+  if (parse_res == GST_H265_PARSER_ERROR)
+    return FALSE;
+
+  /* determine if AU complete */
+  GST_LOG_OBJECT (h265parse, "nal type: %d %s", nal_type, _nal_name (nal_type));
+  /* coded slice NAL starts a picture,
+   * i.e. other types become aggregated in front of it */
+  h265parse->picture_start |= ((nal_type >= GST_H265_NAL_SLICE_TRAIL_N
+          && nal_type <= GST_H265_NAL_SLICE_TRAIL_R)
+      || (nal_type >= GST_H265_NAL_SLICE_BLA_W_LP
+          && nal_type <= RESERVED_IRAP_NAL_TYPE_MAX));
+
+  /* consider a coded slices (IRAP or not) to start a picture,
+   * (so ending the previous one) if first_slice_segment_in_pic_flag == 1*/
+  nal_type = nnalu.type;
+  complete = h265parse->picture_start && ((nal_type >= GST_H265_NAL_VPS
+          && nal_type <= GST_H265_NAL_AUD)
+      || nal_type == GST_H265_NAL_PREFIX_SEI || (nal_type >= 41
+          && nal_type <= 44) || (nal_type >= 48 && nal_type <= 55));
+
+  GST_LOG_OBJECT (h265parse, "next nal type: %d %s", nal_type,
+      _nal_name (nal_type));
+
+  /* Any VCL Nal unit with first_slice_segment_in_pic_flag == 1 considered start of frame */
+  complete |= h265parse->picture_start
+      && (((nal_type >= GST_H265_NAL_SLICE_TRAIL_N
+              && nal_type <= GST_H265_NAL_SLICE_TRAIL_R)
+          || (nal_type >= GST_H265_NAL_SLICE_BLA_W_LP
+              && nal_type <= RESERVED_IRAP_NAL_TYPE_MAX))
+      && (nnalu.data[nnalu.offset + 2] & 0x80));
+
+  GST_LOG_OBJECT (h265parse, "au complete: %d", complete);
+  return complete;
+}
+
+static GstFlowReturn
+gst_h265_parse_handle_frame_packetized (GstBaseParse * parse,
+    GstBaseParseFrame * frame)
+{
+  GstH265Parse *h265parse = GST_H265_PARSE (parse);
+  GstBuffer *buffer = frame->buffer;
+  GstFlowReturn ret = GST_FLOW_OK;
+  GstH265ParserResult parse_res;
+  GstH265NalUnit nalu;
+  const guint nl = h265parse->nal_length_size;
+  GstMapInfo map;
+  gint left;
+
+  if (nl < 1 || nl > 4) {
+    GST_DEBUG_OBJECT (h265parse, "insufficient data to split input");
+    return GST_FLOW_NOT_NEGOTIATED;
+  }
+
+  /* need to save buffer from invalidation upon _finish_frame */
+  if (h265parse->split_packetized)
+    buffer = gst_buffer_copy (frame->buffer);
+
+  gst_buffer_map (buffer, &map, GST_MAP_READ);
+
+  left = map.size;
+
+  GST_LOG_OBJECT (h265parse,
+      "processing packet buffer of size %" G_GSIZE_FORMAT, map.size);
+
+  parse_res = gst_h265_parser_identify_nalu_hevc (h265parse->nalparser,
+      map.data, 0, map.size, nl, &nalu);
+
+  while (parse_res == GST_H265_PARSER_OK) {
+    GST_DEBUG_OBJECT (h265parse, "HEVC nal offset %d", nalu.offset + nalu.size);
+
+    /* either way, have a look at it */
+    gst_h265_parse_process_nal (h265parse, &nalu);
+
+    /* dispatch per NALU if needed */
+    if (h265parse->split_packetized) {
+      /* note we don't need to come up with a sub-buffer, since
+       * subsequent code only considers input buffer's metadata.
+       * Real data is either taken from input by baseclass or
+       * a replacement output buffer is provided anyway. */
+      gst_h265_parse_parse_frame (parse, frame);
+      ret = gst_base_parse_finish_frame (parse, frame, nl + nalu.size);
+      left -= nl + nalu.size;
+    }
+
+    parse_res = gst_h265_parser_identify_nalu_hevc (h265parse->nalparser,
+        map.data, nalu.offset + nalu.size, map.size, nl, &nalu);
+  }
+
+  gst_buffer_unmap (buffer, &map);
+
+  if (!h265parse->split_packetized) {
+    gst_h265_parse_parse_frame (parse, frame);
+    ret = gst_base_parse_finish_frame (parse, frame, map.size);
+  } else {
+    gst_buffer_unref (buffer);
+    if (G_UNLIKELY (left)) {
+      /* should not be happening for nice HEVC */
+      GST_WARNING_OBJECT (parse, "skipping leftover HEVC data %d", left);
+      frame->flags |= GST_BASE_PARSE_FRAME_FLAG_DROP;
+      ret = gst_base_parse_finish_frame (parse, frame, map.size);
+    }
+  }
+
+  if (parse_res == GST_H265_PARSER_NO_NAL_END ||
+      parse_res == GST_H265_PARSER_BROKEN_DATA) {
+
+    if (h265parse->split_packetized) {
+      GST_ELEMENT_ERROR (h265parse, STREAM, FAILED, (NULL),
+          ("invalid HEVC input data"));
+      gst_buffer_unref (buffer);
+
+      return GST_FLOW_ERROR;
+    } else {
+      /* do not meddle to much in this case */
+      GST_DEBUG_OBJECT (h265parse, "parsing packet failed");
+    }
+  }
+
+  return ret;
+}
+
+static GstFlowReturn
+gst_h265_parse_handle_frame (GstBaseParse * parse,
+    GstBaseParseFrame * frame, gint * skipsize)
+{
+  GstH265Parse *h265parse = GST_H265_PARSE (parse);
+  GstBuffer *buffer = frame->buffer;
+  GstMapInfo map;
+  guint8 *data;
+  gsize size;
+  gint current_off = 0;
+  gboolean drain, nonext;
+  GstH265Parser *nalparser = h265parse->nalparser;
+  GstH265NalUnit nalu;
+  GstH265ParserResult pres;
+  gint framesize;
+
+  /* delegate in packetized case, no skipping should be needed */
+  if (h265parse->packetized)
+    return gst_h265_parse_handle_frame_packetized (parse, frame);
+
+  gst_buffer_map (buffer, &map, GST_MAP_READ);
+  data = map.data;
+  size = map.size;
+
+  /* expect at least 3 bytes startcode == sc, and 3 bytes NALU payload */
+  if (G_UNLIKELY (size < 6)) {
+    gst_buffer_unmap (buffer, &map);
+    *skipsize = 1;
+    return GST_FLOW_OK;
+  }
+
+  /* need to configure aggregation */
+  if (G_UNLIKELY (h265parse->format == GST_H265_PARSE_FORMAT_NONE))
+    gst_h265_parse_negotiate (h265parse, GST_H265_PARSE_FORMAT_BYTE, NULL);
+
+  /* avoid stale cached parsing state */
+  if (frame->flags & GST_BASE_PARSE_FRAME_FLAG_NEW_FRAME) {
+    GST_LOG_OBJECT (h265parse, "parsing new frame");
+    gst_h265_parse_reset_frame (h265parse);
+  } else {
+    GST_LOG_OBJECT (h265parse, "resuming frame parsing");
+  }
+
+  drain = GST_BASE_PARSE_DRAINING (parse);
+  nonext = FALSE;
+
+  current_off = h265parse->current_off;
+  if (current_off < 0)
+    current_off = 0;
+  g_assert (current_off < size);
+  GST_DEBUG_OBJECT (h265parse, "last parse position %d", current_off);
+
+  /* check for initial skip */
+  if (h265parse->current_off == -1) {
+    pres =
+        gst_h265_parser_identify_nalu_unchecked (nalparser, data, current_off,
+        size, &nalu);
+    switch (pres) {
+      case GST_H265_PARSER_OK:
+        if (nalu.sc_offset > 0) {
+          *skipsize = nalu.sc_offset;
+          goto skip;
+        }
+        break;
+      case GST_H265_PARSER_NO_NAL:
+        *skipsize = size - 3;
+        goto skip;
+      default:
+        g_assert_not_reached ();
+        break;
+    }
+  }
+
+  while (TRUE) {
+    pres =
+        gst_h265_parser_identify_nalu (nalparser, data, current_off, size,
+        &nalu);
+
+    switch (pres) {
+      case GST_H265_PARSER_OK:
+        GST_DEBUG_OBJECT (h265parse, "complete nal (offset, size): (%u, %u) ",
+            nalu.offset, nalu.size);
+        break;
+      case GST_H265_PARSER_NO_NAL_END:
+        GST_DEBUG_OBJECT (h265parse, "not a complete nal found at offset %u",
+            nalu.offset);
+        /* if draining, accept it as complete nal */
+        if (drain) {
+          nonext = TRUE;
+          nalu.size = size - nalu.offset;
+          GST_DEBUG_OBJECT (h265parse, "draining, accepting with size %u",
+              nalu.size);
+          /* if it's not too short at least */
+          if (nalu.size < 3)
+            goto broken;
+          break;
+        }
+        /* otherwise need more */
+        goto more;
+      case GST_H265_PARSER_BROKEN_LINK:
+        GST_ELEMENT_ERROR (h265parse, STREAM, FORMAT,
+            ("Error parsing H.265 stream"),
+            ("The link to structure needed for the parsing couldn't be found"));
+        goto invalid_stream;
+      case GST_H265_PARSER_ERROR:
+        /* should not really occur either */
+        GST_ELEMENT_ERROR (h265parse, STREAM, FORMAT,
+            ("Error parsing H.265 stream"), ("Invalid H.265 stream"));
+        goto invalid_stream;
+      case GST_H265_PARSER_NO_NAL:
+        GST_ELEMENT_ERROR (h265parse, STREAM, FORMAT,
+            ("Error parsing H.265 stream"), ("No H.265 NAL unit found"));
+        goto invalid_stream;
+      case GST_H265_PARSER_BROKEN_DATA:
+        GST_WARNING_OBJECT (h265parse, "input stream is corrupt; "
+            "it contains a NAL unit of length %u", nalu.size);
+      broken:
+        /* broken nal at start -> arrange to skip it,
+         * otherwise have it terminate current au
+         * (and so it will be skipped on next frame round) */
+        if (current_off == 0) {
+          GST_DEBUG_OBJECT (h265parse, "skipping broken nal");
+          *skipsize = nalu.offset;
+          goto skip;
+        } else {
+          GST_DEBUG_OBJECT (h265parse, "terminating au");
+          nalu.size = 0;
+          nalu.offset = nalu.sc_offset;
+          goto end;
+        }
+      default:
+        g_assert_not_reached ();
+        break;
+    }
+
+    GST_DEBUG_OBJECT (h265parse, "%p complete nal found. Off: %u, Size: %u",
+        data, nalu.offset, nalu.size);
+
+    /* simulate no next nal if none needed */
+    nonext = nonext || (h265parse->align == GST_H265_PARSE_ALIGN_NAL);
+
+    if (!nonext) {
+      if (nalu.offset + nalu.size + 5 + 2 > size) {
+        GST_DEBUG_OBJECT (h265parse, "not enough data for next NALU");
+        if (drain) {
+          GST_DEBUG_OBJECT (h265parse, "but draining anyway");
+          nonext = TRUE;
+        } else {
+          goto more;
+        }
+      }
+    }
+
+    if (nalu.type == GST_H265_NAL_VPS ||
+        nalu.type == GST_H265_NAL_SPS ||
+        nalu.type == GST_H265_NAL_PPS ||
+        (h265parse->have_sps && h265parse->have_pps)) {
+      gst_h265_parse_process_nal (h265parse, &nalu);
+    } else {
+      GST_WARNING_OBJECT (h265parse,
+          "no SPS/PPS yet, nal Type: %d %s, Size: %u will be dropped",
+          nalu.type, _nal_name (nalu.type), nalu.size);
+      *skipsize = nalu.size;
+      goto skip;
+    }
+
+    if (nonext)
+      break;
+
+    /* if no next nal, we know it's complete here */
+    if (gst_h265_parse_collect_nal (h265parse, data, size, &nalu))
+      break;
+
+    GST_DEBUG_OBJECT (h265parse, "Looking for more");
+    current_off = nalu.offset + nalu.size;
+  }
+
+end:
+  framesize = nalu.offset + nalu.size;
+
+  gst_buffer_unmap (buffer, &map);
+
+  gst_h265_parse_parse_frame (parse, frame);
+
+  return gst_base_parse_finish_frame (parse, frame, framesize);
+
+more:
+  *skipsize = 0;
+
+  /* Restart parsing from here next time */
+  if (current_off > 0)
+    h265parse->current_off = current_off;
+
+  /* Fall-through. */
+out:
+  gst_buffer_unmap (buffer, &map);
+  return GST_FLOW_OK;
+
+skip:
+  GST_DEBUG_OBJECT (h265parse, "skipping %d", *skipsize);
+  gst_h265_parse_reset_frame (h265parse);
+  goto out;
+
+invalid_stream:
+  gst_buffer_unmap (buffer, &map);
+  return GST_FLOW_ERROR;
+}
+
+/* byte together hevc codec data based on collected pps and sps so far */
+static GstBuffer *
+gst_h265_parse_make_codec_data (GstH265Parse * h265parse)
+{
+  GstBuffer *buf, *nal;
+  gint i, j, k = 0;
+  guint vps_size = 0, sps_size = 0, pps_size = 0;
+  guint num_vps = 0, num_sps = 0, num_pps = 0;
+  gboolean found = FALSE;
+  GstMapInfo map;
+  guint8 *data;
+  gint nl;
+  guint8 num_arrays = 0;
+  GstH265SPS *sps = NULL;
+  guint16 min_spatial_segmentation_idc = 0;
+  GstH265ProfileTierLevel *pft;
+
+  /* only nal payload in stored nals */
+  /* Fixme: Current implementation is not embedding SEI in codec_data */
+  for (i = 0; i < GST_H265_MAX_VPS_COUNT; i++) {
+    if ((nal = h265parse->vps_nals[i])) {
+      num_vps++;
+      /* size bytes also count */
+      vps_size += gst_buffer_get_size (nal) + 2;
+    }
+  }
+  if (num_vps > 0)
+    num_arrays++;
+
+  for (i = 0; i < GST_H265_MAX_SPS_COUNT; i++) {
+    if ((nal = h265parse->sps_nals[i])) {
+      num_sps++;
+      /* size bytes also count */
+      sps_size += gst_buffer_get_size (nal) + 2;
+      found = TRUE;
+    }
+  }
+  if (num_sps > 0)
+    num_arrays++;
+
+  for (i = 0; i < GST_H265_MAX_PPS_COUNT; i++) {
+    if ((nal = h265parse->pps_nals[i])) {
+      num_pps++;
+      /* size bytes also count */
+      pps_size += gst_buffer_get_size (nal) + 2;
+    }
+  }
+  if (num_pps > 0)
+    num_arrays++;
+
+  GST_DEBUG_OBJECT (h265parse,
+      "constructing codec_data: num_vps =%d num_sps=%d, num_pps=%d", num_vps,
+      num_sps, num_pps);
+
+  if (!found)
+    return NULL;
+
+  buf =
+      gst_buffer_new_allocate (NULL,
+      23 + num_arrays + (3 * num_arrays) + vps_size + sps_size + pps_size,
+      NULL);
+  gst_buffer_map (buf, &map, GST_MAP_WRITE);
+  data = map.data;
+  memset (data, 0, map.size);
+  nl = h265parse->nal_length_size;
+
+  sps = h265parse->nalparser->last_sps;
+  if (!sps)
+    return NULL;
+  pft = &sps->profile_tier_level;
+  if (sps->vui_parameters_present_flag)
+    min_spatial_segmentation_idc = sps->vui_params.min_spatial_segmentation_idc;
+
+  /* HEVCDecoderConfigurationVersion = 1
+   * profile_space | tier_flat | profile_idc |
+   * profile_compatibility_flags | constraint_indicator_flags |
+   * level_idc */
+  data[0] = 1;
+  data[1] =
+      (pft->profile_space << 5) | (pft->tier_flag << 5) | pft->profile_idc;
+  for (i = 2; i < 6; i++) {
+    for (j = 7; j >= 0; j--) {
+      data[i] |= (pft->profile_compatibility_flag[k] << j);
+      k++;
+    }
+  }
+  data[6] |=
+      (pft->progressive_source_flag << 7) | (pft->interlaced_source_flag << 6) |
+      (pft->non_packed_constraint_flag << 5) | (pft->
+      frame_only_constraint_flag << 4);
+  data[12] = pft->level_idc;
+  /* min_spatial_segmentation_idc */
+  GST_WRITE_UINT16_BE (data + 13, min_spatial_segmentation_idc);
+  data[13] |= 0xf0;
+  data[15] = 0xfc;              /* keeping parrallelismType as zero (unknown) */
+  data[16] = 0xfc | sps->chroma_format_idc;
+  data[17] = 0xf8 | sps->bit_depth_luma_minus8;
+  data[18] = 0xf8 | sps->bit_depth_chroma_minus8;
+  data[19] = 0x00;              /* keep avgFrameRate as unspecified */
+  data[20] = 0x00;              /* keep avgFrameRate as unspecified */
+  /* constFrameRate(2 bits): 0, stream may or may not be of constant framerate
+   * numTemporalLayers (3 bits): number of temporal layers, value from SPS
+   * TemporalIdNested (1 bit): sps_temporal_id_nesting_flag from SPS
+   * lengthSizeMinusOne (2 bits): plus 1 indicates the length of the NALUnitLength */
+  data[21] =
+      0x00 | ((sps->max_sub_layers_minus1 +
+          1) << 3) | (sps->temporal_id_nesting_flag << 2) | (nl - 1);
+  GST_WRITE_UINT8 (data + 22, num_arrays);      /* numOfArrays */
+
+  data += 23;
+
+  /* VPS */
+  if (num_vps > 0) {
+    /* array_completeness | reserved_zero bit | nal_unit_type */
+    data[0] = 0x00 | 0x20;
+    data++;
+
+    GST_WRITE_UINT16_BE (data, num_vps);
+    data += 2;
+
+    for (i = 0; i < num_vps; i++) {
+      if ((nal = h265parse->vps_nals[i])) {
+        gsize nal_size = gst_buffer_get_size (nal);
+        GST_WRITE_UINT16_BE (data, nal_size);
+        gst_buffer_extract (nal, 0, data + 2, nal_size);
+        data += 2 + nal_size;
+      }
+    }
+  }
+
+  /* SPS */
+  if (num_sps > 0) {
+    /* array_completeness | reserved_zero bit | nal_unit_type */
+    data[0] = 0x00 | 0x21;
+    data++;
+
+    GST_WRITE_UINT16_BE (data, num_sps);
+    data += 2;
+
+    for (i = 0; i < num_sps; i++) {
+      if ((nal = h265parse->sps_nals[i])) {
+        gsize nal_size = gst_buffer_get_size (nal);
+        GST_WRITE_UINT16_BE (data, nal_size);
+        gst_buffer_extract (nal, 0, data + 2, nal_size);
+        data += 2 + nal_size;
+      }
+    }
+  }
+
+  /* PPS */
+  if (num_pps > 0) {
+    /* array_completeness | reserved_zero bit | nal_unit_type */
+    data[0] = 0x00 | 0x22;
+    data++;
+
+    GST_WRITE_UINT16_BE (data, num_pps);
+    data += 2;
+
+    for (i = 0; i < num_pps; i++) {
+      if ((nal = h265parse->pps_nals[i])) {
+        gsize nal_size = gst_buffer_get_size (nal);
+        GST_WRITE_UINT16_BE (data, nal_size);
+        gst_buffer_extract (nal, 0, data + 2, nal_size);
+        data += 2 + nal_size;
+      }
+    }
+  }
+  gst_buffer_unmap (buf, &map);
+
+  return buf;
+}
+
+static void
+gst_h265_parse_get_par (GstH265Parse * h265parse, gint * num, gint * den)
+{
+  if (h265parse->upstream_par_n != -1 && h265parse->upstream_par_d != -1) {
+    *num = h265parse->upstream_par_n;
+    *den = h265parse->upstream_par_d;
+  } else {
+    *num = h265parse->parsed_par_n;
+    *den = h265parse->parsed_par_d;
+  }
+}
+
+static const gchar *
+digit_to_string (guint digit)
+{
+  static const char itoa[][2] = {
+    "0", "1", "2", "3", "4", "5", "6", "7", "8", "9"
+  };
+
+  if (G_LIKELY (digit < 10))
+    return itoa[digit];
+  else
+    return NULL;
+}
+
+static const gchar *
+get_profile_string (guint8 profile_idc)
+{
+  const gchar *profile = NULL;
+
+  if (profile_idc == 1)
+    profile = "main";
+  else if (profile_idc == 2)
+    profile = "main-10";
+  else if (profile_idc == 3)
+    profile = "main-still-picture";
+
+  return profile;
+}
+
+static const gchar *
+get_tier_string (guint8 tier_flag)
+{
+  const gchar *tier = NULL;
+
+  if (tier_flag)
+    tier = "high";
+  else
+    tier = "main";
+
+  return tier;
+}
+
+static const gchar *
+get_level_string (guint8 level_idc)
+{
+  if (level_idc % 30 == 0)
+    return digit_to_string (level_idc / 30);
+  else {
+    switch (level_idc) {
+      case 63:
+        return "2.1";
+        break;
+      case 93:
+        return "3.1";
+        break;
+      case 123:
+        return "4.1";
+        break;
+      case 153:
+        return "5.1";
+        break;
+      case 156:
+        return "5.2";
+        break;
+      case 183:
+        return "6.1";
+        break;
+      case 186:
+        return "6.2";
+        break;
+      default:
+        return NULL;
+    }
+  }
+}
+
+static void
+gst_h265_parse_update_src_caps (GstH265Parse * h265parse, GstCaps * caps)
+{
+  GstH265SPS *sps;
+  GstCaps *sink_caps, *src_caps;
+  gboolean modified = FALSE;
+  GstBuffer *buf = NULL;
+  GstStructure *s = NULL;
+
+  if (G_UNLIKELY (!gst_pad_has_current_caps (GST_BASE_PARSE_SRC_PAD
+              (h265parse))))
+    modified = TRUE;
+  else if (G_UNLIKELY (!h265parse->update_caps))
+    return;
+
+  /* if this is being called from the first _setcaps call, caps on the sinkpad
+   * aren't set yet and so they need to be passed as an argument */
+  if (caps)
+    sink_caps = gst_caps_ref (caps);
+  else
+    sink_caps = gst_pad_get_current_caps (GST_BASE_PARSE_SINK_PAD (h265parse));
+
+  /* carry over input caps as much as possible; override with our own stuff */
+  if (!sink_caps)
+    sink_caps = gst_caps_new_empty_simple ("video/x-h265");
+  else
+    s = gst_caps_get_structure (sink_caps, 0);
+
+  sps = h265parse->nalparser->last_sps;
+  GST_DEBUG_OBJECT (h265parse, "sps: %p", sps);
+
+  /* only codec-data for nice-and-clean au aligned packetized hevc format */
+  if ((h265parse->format == GST_H265_PARSE_FORMAT_HVC1
+          || h265parse->format == GST_H265_PARSE_FORMAT_HEV1)
+      && h265parse->align == GST_H265_PARSE_ALIGN_AU) {
+    buf = gst_h265_parse_make_codec_data (h265parse);
+    if (buf && h265parse->codec_data) {
+      GstMapInfo map;
+
+      gst_buffer_map (buf, &map, GST_MAP_READ);
+      if (map.size != gst_buffer_get_size (h265parse->codec_data) ||
+          gst_buffer_memcmp (h265parse->codec_data, 0, map.data, map.size))
+        modified = TRUE;
+
+      gst_buffer_unmap (buf, &map);
+    } else {
+      if (!buf && h265parse->codec_data_in)
+        buf = gst_buffer_ref (h265parse->codec_data_in);
+      modified = TRUE;
+    }
+  }
+
+  caps = NULL;
+  if (G_UNLIKELY (!sps)) {
+    caps = gst_caps_copy (sink_caps);
+  } else {
+    gint crop_width, crop_height;
+
+    if (sps->conformance_window_flag) {
+      crop_width = sps->crop_rect_width;
+      crop_height = sps->crop_rect_height;
+    } else {
+      crop_width = sps->width;
+      crop_height = sps->height;
+    }
+
+    if (G_UNLIKELY (h265parse->width != crop_width ||
+            h265parse->height != crop_height)) {
+      GST_INFO_OBJECT (h265parse, "resolution changed %dx%d",
+          crop_width, crop_height);
+      h265parse->width = crop_width;
+      h265parse->height = crop_height;
+      modified = TRUE;
+    }
+
+    /* 0/1 is set as the default in the codec parser */
+    if (sps->vui_params.timing_info_present_flag &&
+        !(sps->fps_num == 0 && sps->fps_den == 1)) {
+      if (G_UNLIKELY (h265parse->fps_num != sps->fps_num
+              || h265parse->fps_den != sps->fps_den)) {
+        GST_INFO_OBJECT (h265parse, "framerate changed %d/%d",
+            sps->fps_num, sps->fps_den);
+        h265parse->fps_num = sps->fps_num;
+        h265parse->fps_den = sps->fps_den;
+        modified = TRUE;
+      }
+    }
+
+    if (sps->vui_params.aspect_ratio_info_present_flag) {
+      if (G_UNLIKELY ((h265parse->parsed_par_n != sps->vui_params.par_n)
+              && (h265parse->parsed_par_d != sps->vui_params.par_d))) {
+        h265parse->parsed_par_n = sps->vui_params.par_n;
+        h265parse->parsed_par_d = sps->vui_params.par_d;
+        GST_INFO_OBJECT (h265parse, "pixel aspect ratio has been changed %d/%d",
+            h265parse->parsed_par_n, h265parse->parsed_par_d);
+        modified = TRUE;
+      }
+
+    }
+
+    if (G_UNLIKELY (modified || h265parse->update_caps)) {
+      gint fps_num = h265parse->fps_num;
+      gint fps_den = h265parse->fps_den;
+      gint width, height;
+      GstClockTime latency;
+
+      caps = gst_caps_copy (sink_caps);
+
+      /* sps should give this but upstream overrides */
+      if (s && gst_structure_has_field (s, "width"))
+        gst_structure_get_int (s, "width", &width);
+      else
+        width = h265parse->width;
+
+      if (s && gst_structure_has_field (s, "height"))
+        gst_structure_get_int (s, "height", &height);
+      else
+        height = h265parse->height;
+
+      gst_caps_set_simple (caps, "width", G_TYPE_INT, width,
+          "height", G_TYPE_INT, height, NULL);
+
+      /* upstream overrides */
+      if (s && gst_structure_has_field (s, "framerate"))
+        gst_structure_get_fraction (s, "framerate", &fps_num, &fps_den);
+
+      /* but not necessarily or reliably this */
+      if (fps_num > 0 && fps_den > 0) {
+        GST_INFO_OBJECT (h265parse, "setting framerate in caps");
+        gst_caps_set_simple (caps, "framerate",
+            GST_TYPE_FRACTION, fps_num, fps_den, NULL);
+        gst_base_parse_set_frame_rate (GST_BASE_PARSE (h265parse),
+            fps_num, fps_den, 0, 0);
+        latency = gst_util_uint64_scale (GST_SECOND, fps_den, fps_num);
+        gst_base_parse_set_latency (GST_BASE_PARSE (h265parse), latency,
+            latency);
+      }
+    }
+  }
+
+  if (caps) {
+    gint par_n, par_d;
+
+    gst_caps_set_simple (caps, "parsed", G_TYPE_BOOLEAN, TRUE,
+        "stream-format", G_TYPE_STRING,
+        gst_h265_parse_get_string (h265parse, TRUE, h265parse->format),
+        "alignment", G_TYPE_STRING,
+        gst_h265_parse_get_string (h265parse, FALSE, h265parse->align), NULL);
+
+    gst_h265_parse_get_par (h265parse, &par_n, &par_d);
+    if (par_n != 0 && par_d != 0 &&
+        (!s || !gst_structure_has_field (s, "pixel-aspect-ratio"))) {
+      GST_INFO_OBJECT (h265parse, "PAR %d/%d", par_n, par_d);
+      gst_caps_set_simple (caps, "pixel-aspect-ratio", GST_TYPE_FRACTION,
+          par_n, par_d, NULL);
+    }
+
+    /* set profile and level in caps */
+    if (sps) {
+      const gchar *profile, *tier, *level;
+
+      profile = get_profile_string (sps->profile_tier_level.profile_idc);
+      if (profile != NULL)
+        gst_caps_set_simple (caps, "profile", G_TYPE_STRING, profile, NULL);
+
+      tier = get_tier_string (sps->profile_tier_level.tier_flag);
+      if (tier != NULL)
+        gst_caps_set_simple (caps, "tier", G_TYPE_STRING, tier, NULL);
+
+      level = get_level_string (sps->profile_tier_level.level_idc);
+      if (level != NULL)
+        gst_caps_set_simple (caps, "level", G_TYPE_STRING, level, NULL);
+    }
+
+    src_caps = gst_pad_get_current_caps (GST_BASE_PARSE_SRC_PAD (h265parse));
+
+    if (src_caps
+        && gst_structure_has_field (gst_caps_get_structure (src_caps, 0),
+            "codec_data")) {
+      /* use codec data from old caps for comparison; we don't want to resend caps
+         if everything is same except codec data; */
+      gst_caps_set_value (caps, "codec_data",
+          gst_structure_get_value (gst_caps_get_structure (src_caps, 0),
+              "codec_data"));
+    }
+    if (!(src_caps && gst_caps_is_strictly_equal (src_caps, caps))) {
+      /* update codec data to new value */
+      if (buf) {
+        gst_caps_set_simple (caps, "codec_data", GST_TYPE_BUFFER, buf, NULL);
+        gst_buffer_replace (&h265parse->codec_data, buf);
+        gst_buffer_unref (buf);
+        buf = NULL;
+      } else {
+        GstStructure *s;
+        /* remove any left-over codec-data hanging around */
+        s = gst_caps_get_structure (caps, 0);
+        gst_structure_remove_field (s, "codec_data");
+        gst_buffer_replace (&h265parse->codec_data, NULL);
+      }
+
+      gst_pad_set_caps (GST_BASE_PARSE_SRC_PAD (h265parse), caps);
+    }
+
+    if (src_caps)
+      gst_caps_unref (src_caps);
+    gst_caps_unref (caps);
+  }
+
+  gst_caps_unref (sink_caps);
+  if (buf)
+    gst_buffer_unref (buf);
+
+}
+
+static GstFlowReturn
+gst_h265_parse_parse_frame (GstBaseParse * parse, GstBaseParseFrame * frame)
+{
+  GstH265Parse *h265parse;
+  GstBuffer *buffer;
+  guint av;
+
+  h265parse = GST_H265_PARSE (parse);
+  buffer = frame->buffer;
+
+  gst_h265_parse_update_src_caps (h265parse, NULL);
+
+  /* Fixme: Implement timestamp interpolation based on SEI Messagses */
+  GST_FIXME_OBJECT (h265parse,
+      "Implement timestamp/duration interpolation based on SEI message");
+
+  if (h265parse->keyframe)
+    GST_BUFFER_FLAG_UNSET (buffer, GST_BUFFER_FLAG_DELTA_UNIT);
+  else
+    GST_BUFFER_FLAG_SET (buffer, GST_BUFFER_FLAG_DELTA_UNIT);
+
+  if (h265parse->header)
+    GST_BUFFER_FLAG_SET (buffer, GST_BUFFER_FLAG_HEADER);
+  else
+    GST_BUFFER_FLAG_UNSET (buffer, GST_BUFFER_FLAG_HEADER);
+
+  /* replace with transformed HEVC output if applicable */
+  av = gst_adapter_available (h265parse->frame_out);
+  if (av) {
+    GstBuffer *buf;
+
+    buf = gst_adapter_take_buffer (h265parse->frame_out, av);
+    gst_buffer_copy_into (buf, buffer, GST_BUFFER_COPY_METADATA, 0, -1);
+    gst_buffer_replace (&frame->out_buffer, buf);
+    gst_buffer_unref (buf);
+  }
+
+  return GST_FLOW_OK;
+}
+
+/* sends a codec NAL downstream, decorating and transforming as needed.
+ * No ownership is taken of @nal */
+static GstFlowReturn
+gst_h265_parse_push_codec_buffer (GstH265Parse * h265parse, GstBuffer * nal,
+    GstClockTime ts)
+{
+  GstMapInfo map;
+
+  gst_buffer_map (nal, &map, GST_MAP_READ);
+  nal = gst_h265_parse_wrap_nal (h265parse, h265parse->format,
+      map.data, map.size);
+  gst_buffer_unmap (nal, &map);
+
+  GST_BUFFER_TIMESTAMP (nal) = ts;
+  GST_BUFFER_DURATION (nal) = 0;
+
+  return gst_pad_push (GST_BASE_PARSE_SRC_PAD (h265parse), nal);
+}
+
+static GstEvent *
+check_pending_key_unit_event (GstEvent * pending_event, GstSegment * segment,
+    GstClockTime timestamp, guint flags, GstClockTime pending_key_unit_ts)
+{
+  GstClockTime running_time, stream_time;
+  gboolean all_headers;
+  guint count;
+  GstEvent *event = NULL;
+
+  g_return_val_if_fail (segment != NULL, NULL);
+
+  if (pending_event == NULL)
+    goto out;
+
+  if (GST_CLOCK_TIME_IS_VALID (pending_key_unit_ts) &&
+      timestamp == GST_CLOCK_TIME_NONE)
+    goto out;
+
+  running_time = gst_segment_to_running_time (segment,
+      GST_FORMAT_TIME, timestamp);
+
+  GST_INFO ("now %" GST_TIME_FORMAT " wanted %" GST_TIME_FORMAT,
+      GST_TIME_ARGS (running_time), GST_TIME_ARGS (pending_key_unit_ts));
+  if (GST_CLOCK_TIME_IS_VALID (pending_key_unit_ts) &&
+      running_time < pending_key_unit_ts)
+    goto out;
+
+  if (flags & GST_BUFFER_FLAG_DELTA_UNIT) {
+    GST_DEBUG ("pending force key unit, waiting for keyframe");
+    goto out;
+  }
+
+  stream_time = gst_segment_to_stream_time (segment,
+      GST_FORMAT_TIME, timestamp);
+
+  gst_video_event_parse_upstream_force_key_unit (pending_event,
+      NULL, &all_headers, &count);
+
+  event =
+      gst_video_event_new_downstream_force_key_unit (timestamp, stream_time,
+      running_time, all_headers, count);
+  gst_event_set_seqnum (event, gst_event_get_seqnum (pending_event));
+
+out:
+  return event;
+}
+
+static void
+gst_h265_parse_prepare_key_unit (GstH265Parse * parse, GstEvent * event)
+{
+  GstClockTime running_time;
+  guint count;
+#ifndef GST_DISABLE_GST_DEBUG
+  gboolean have_vps, have_sps, have_pps;
+  gint i;
+#endif
+
+  parse->pending_key_unit_ts = GST_CLOCK_TIME_NONE;
+  gst_event_replace (&parse->force_key_unit_event, NULL);
+
+  gst_video_event_parse_downstream_force_key_unit (event,
+      NULL, NULL, &running_time, NULL, &count);
+
+  GST_INFO_OBJECT (parse, "pushing downstream force-key-unit event %d "
+      "%" GST_TIME_FORMAT " count %d", gst_event_get_seqnum (event),
+      GST_TIME_ARGS (running_time), count);
+  gst_pad_push_event (GST_BASE_PARSE_SRC_PAD (parse), event);
+
+#ifndef GST_DISABLE_GST_DEBUG
+  have_vps = have_sps = have_pps = FALSE;
+  for (i = 0; i < GST_H265_MAX_VPS_COUNT; i++) {
+    if (parse->vps_nals[i] != NULL) {
+      have_vps = TRUE;
+      break;
+    }
+  }
+  for (i = 0; i < GST_H265_MAX_SPS_COUNT; i++) {
+    if (parse->sps_nals[i] != NULL) {
+      have_sps = TRUE;
+      break;
+    }
+  }
+  for (i = 0; i < GST_H265_MAX_PPS_COUNT; i++) {
+    if (parse->pps_nals[i] != NULL) {
+      have_pps = TRUE;
+      break;
+    }
+  }
+
+  GST_INFO_OBJECT (parse,
+      "preparing key unit, have vps %d have sps %d have pps %d", have_vps,
+      have_sps, have_pps);
+#endif
+
+  /* set push_codec to TRUE so that pre_push_frame sends VPS/SPS/PPS again */
+  parse->push_codec = TRUE;
+}
+
+static GstFlowReturn
+gst_h265_parse_pre_push_frame (GstBaseParse * parse, GstBaseParseFrame * frame)
+{
+  GstH265Parse *h265parse;
+  GstBuffer *buffer;
+  GstEvent *event;
+
+  h265parse = GST_H265_PARSE (parse);
+
+  if (!h265parse->sent_codec_tag) {
+    GstTagList *taglist;
+    GstCaps *caps;
+
+    taglist = gst_tag_list_new_empty ();
+
+    /* codec tag */
+    caps = gst_pad_get_current_caps (GST_BASE_PARSE_SRC_PAD (parse));
+    gst_pb_utils_add_codec_description_to_tag_list (taglist,
+        GST_TAG_VIDEO_CODEC, caps);
+    gst_caps_unref (caps);
+
+    gst_pad_push_event (GST_BASE_PARSE_SRC_PAD (h265parse),
+        gst_event_new_tag (taglist));
+
+    /* also signals the end of first-frame processing */
+    h265parse->sent_codec_tag = TRUE;
+  }
+
+  buffer = frame->buffer;
+
+  if ((event = check_pending_key_unit_event (h265parse->force_key_unit_event,
+              &parse->segment, GST_BUFFER_TIMESTAMP (buffer),
+              GST_BUFFER_FLAGS (buffer), h265parse->pending_key_unit_ts))) {
+    gst_h265_parse_prepare_key_unit (h265parse, event);
+  }
+
+  /* periodic VPS/SPS/PPS sending */
+  if (h265parse->interval > 0 || h265parse->push_codec) {
+    GstClockTime timestamp = GST_BUFFER_TIMESTAMP (buffer);
+    guint64 diff;
+
+    /* init */
+    if (!GST_CLOCK_TIME_IS_VALID (h265parse->last_report)) {
+      h265parse->last_report = timestamp;
+    }
+
+    if (h265parse->idr_pos >= 0) {
+      GST_LOG_OBJECT (h265parse, "IDR nal at offset %d", h265parse->idr_pos);
+
+      if (timestamp > h265parse->last_report)
+        diff = timestamp - h265parse->last_report;
+      else
+        diff = 0;
+
+      GST_LOG_OBJECT (h265parse,
+          "now %" GST_TIME_FORMAT ", last VPS/SPS/PPS %" GST_TIME_FORMAT,
+          GST_TIME_ARGS (timestamp), GST_TIME_ARGS (h265parse->last_report));
+
+      GST_DEBUG_OBJECT (h265parse,
+          "interval since last VPS/SPS/PPS %" GST_TIME_FORMAT,
+          GST_TIME_ARGS (diff));
+
+      if (GST_TIME_AS_SECONDS (diff) >= h265parse->interval ||
+          h265parse->push_codec) {
+        GstBuffer *codec_nal;
+        gint i;
+        GstClockTime new_ts;
+
+        /* avoid overwriting a perfectly fine timestamp */
+        new_ts = GST_CLOCK_TIME_IS_VALID (timestamp) ? timestamp :
+            h265parse->last_report;
+
+        if (h265parse->align == GST_H265_PARSE_ALIGN_NAL) {
+          /* send separate config NAL buffers */
+          GST_DEBUG_OBJECT (h265parse, "- sending VPS/SPS/PPS");
+          for (i = 0; i < GST_H265_MAX_VPS_COUNT; i++) {
+            if ((codec_nal = h265parse->vps_nals[i])) {
+              GST_DEBUG_OBJECT (h265parse, "sending VPS nal");
+              gst_h265_parse_push_codec_buffer (h265parse, codec_nal,
+                  timestamp);
+              h265parse->last_report = new_ts;
+            }
+          }
+          for (i = 0; i < GST_H265_MAX_SPS_COUNT; i++) {
+            if ((codec_nal = h265parse->sps_nals[i])) {
+              GST_DEBUG_OBJECT (h265parse, "sending SPS nal");
+              gst_h265_parse_push_codec_buffer (h265parse, codec_nal,
+                  timestamp);
+              h265parse->last_report = new_ts;
+            }
+          }
+          for (i = 0; i < GST_H265_MAX_PPS_COUNT; i++) {
+            if ((codec_nal = h265parse->pps_nals[i])) {
+              GST_DEBUG_OBJECT (h265parse, "sending PPS nal");
+              gst_h265_parse_push_codec_buffer (h265parse, codec_nal,
+                  timestamp);
+              h265parse->last_report = new_ts;
+            }
+          }
+        } else {
+          /* insert config NALs into AU */
+          GstByteWriter bw;
+          GstBuffer *new_buf;
+          const gboolean bs = h265parse->format == GST_H265_PARSE_FORMAT_BYTE;
+          const gint nls = 4 - h265parse->nal_length_size;
+          gboolean ok;
+
+          gst_byte_writer_init_with_size (&bw, gst_buffer_get_size (buffer),
+              FALSE);
+          ok = gst_byte_writer_put_buffer (&bw, buffer, 0, h265parse->idr_pos);
+          GST_DEBUG_OBJECT (h265parse, "- inserting VPS/SPS/PPS");
+          for (i = 0; i < GST_H265_MAX_VPS_COUNT; i++) {
+            if ((codec_nal = h265parse->vps_nals[i])) {
+              gsize nal_size = gst_buffer_get_size (codec_nal);
+              GST_DEBUG_OBJECT (h265parse, "inserting VPS nal");
+              if (bs) {
+                ok &= gst_byte_writer_put_uint32_be (&bw, 1);
+              } else {
+                ok &= gst_byte_writer_put_uint32_be (&bw,
+                    (nal_size << (nls * 8)));
+                ok &= gst_byte_writer_set_pos (&bw,
+                    gst_byte_writer_get_pos (&bw) - nls);
+              }
+
+              ok &= gst_byte_writer_put_buffer (&bw, codec_nal, 0, nal_size);
+              h265parse->last_report = new_ts;
+            }
+          }
+          for (i = 0; i < GST_H265_MAX_SPS_COUNT; i++) {
+            if ((codec_nal = h265parse->sps_nals[i])) {
+              gsize nal_size = gst_buffer_get_size (codec_nal);
+              GST_DEBUG_OBJECT (h265parse, "inserting SPS nal");
+              if (bs) {
+                ok &= gst_byte_writer_put_uint32_be (&bw, 1);
+              } else {
+                ok &= gst_byte_writer_put_uint32_be (&bw,
+                    (nal_size << (nls * 8)));
+                ok &= gst_byte_writer_set_pos (&bw,
+                    gst_byte_writer_get_pos (&bw) - nls);
+              }
+
+              ok &= gst_byte_writer_put_buffer (&bw, codec_nal, 0, nal_size);
+              h265parse->last_report = new_ts;
+            }
+          }
+          for (i = 0; i < GST_H265_MAX_PPS_COUNT; i++) {
+            if ((codec_nal = h265parse->pps_nals[i])) {
+              gsize nal_size = gst_buffer_get_size (codec_nal);
+              GST_DEBUG_OBJECT (h265parse, "inserting PPS nal");
+              if (bs) {
+                ok &= gst_byte_writer_put_uint32_be (&bw, 1);
+              } else {
+                ok &= gst_byte_writer_put_uint32_be (&bw,
+                    (nal_size << (nls * 8)));
+                ok &= gst_byte_writer_set_pos (&bw,
+                    gst_byte_writer_get_pos (&bw) - nls);
+              }
+              ok &= gst_byte_writer_put_buffer (&bw, codec_nal, 0, nal_size);
+              h265parse->last_report = new_ts;
+            }
+          }
+          ok &=
+              gst_byte_writer_put_buffer (&bw, buffer, h265parse->idr_pos, -1);
+          /* collect result and push */
+          new_buf = gst_byte_writer_reset_and_get_buffer (&bw);
+          gst_buffer_copy_into (new_buf, buffer, GST_BUFFER_COPY_METADATA, 0,
+              -1);
+          /* should already be keyframe/IDR, but it may not have been,
+           * so mark it as such to avoid being discarded by picky decoder */
+          GST_BUFFER_FLAG_UNSET (new_buf, GST_BUFFER_FLAG_DELTA_UNIT);
+          gst_buffer_replace (&frame->out_buffer, new_buf);
+          gst_buffer_unref (new_buf);
+          /* some result checking seems to make some compilers happy */
+          if (G_UNLIKELY (!ok)) {
+            GST_ERROR_OBJECT (h265parse, "failed to insert SPS/PPS");
+          }
+        }
+      }
+      /* we pushed whatever we had */
+      h265parse->push_codec = FALSE;
+      h265parse->have_vps = FALSE;
+      h265parse->have_sps = FALSE;
+      h265parse->have_pps = FALSE;
+    }
+  }
+
+  gst_h265_parse_reset_frame (h265parse);
+
+  return GST_FLOW_OK;
+}
+
+static gboolean
+gst_h265_parse_set_caps (GstBaseParse * parse, GstCaps * caps)
+{
+  GstH265Parse *h265parse;
+  GstStructure *str;
+  const GValue *value;
+  GstBuffer *codec_data = NULL;
+  gsize off, size;
+  guint format, align;
+  guint num_nals, i, j;
+  GstH265NalUnit nalu;
+  GstH265ParserResult parseres;
+
+  h265parse = GST_H265_PARSE (parse);
+
+  /* reset */
+  h265parse->push_codec = FALSE;
+
+  str = gst_caps_get_structure (caps, 0);
+
+  /* accept upstream info if provided */
+  gst_structure_get_int (str, "width", &h265parse->width);
+  gst_structure_get_int (str, "height", &h265parse->height);
+  gst_structure_get_fraction (str, "framerate", &h265parse->fps_num,
+      &h265parse->fps_den);
+  gst_structure_get_fraction (str, "pixel-aspect-ratio",
+      &h265parse->upstream_par_n, &h265parse->upstream_par_d);
+
+  /* get upstream format and align from caps */
+  gst_h265_parse_format_from_caps (caps, &format, &align);
+
+  /* packetized video has a codec_data */
+  if (format != GST_H265_PARSE_FORMAT_BYTE &&
+      (value = gst_structure_get_value (str, "codec_data"))) {
+    GstMapInfo map;
+    guint8 *data;
+
+    GST_DEBUG_OBJECT (h265parse, "have packetized h265");
+    /* make note for optional split processing */
+    h265parse->packetized = TRUE;
+
+    codec_data = gst_value_get_buffer (value);
+    if (!codec_data)
+      goto wrong_type;
+    gst_buffer_map (codec_data, &map, GST_MAP_READ);
+    data = map.data;
+    size = map.size;
+
+    /* parse the hvcC data */
+    if (size < 23) {
+      gst_buffer_unmap (codec_data, &map);
+      goto hvcc_too_small;
+    }
+    /* parse the version, this must be one but
+     * is zero until the spec is finalized */
+    if (data[0] != 0 && data[0] != 1) {
+      gst_buffer_unmap (codec_data, &map);
+      goto wrong_version;
+    }
+
+    h265parse->nal_length_size = (data[21] & 0x03) + 1;
+    GST_DEBUG_OBJECT (h265parse, "nal length size %u",
+        h265parse->nal_length_size);
+
+    off = 23;
+    for (i = 0; i < data[22]; i++) {
+      num_nals = GST_READ_UINT16_BE (data + off + 1);
+      for (j = 0; j < num_nals; j++) {
+        parseres = gst_h265_parser_identify_nalu_hevc (h265parse->nalparser,
+            data, off + 3, size, 2, &nalu);
+
+        if (parseres != GST_H265_PARSER_OK) {
+          gst_buffer_unmap (codec_data, &map);
+          goto hvcc_too_small;
+        }
+
+        gst_h265_parse_process_nal (h265parse, &nalu);
+        off = nalu.offset + nalu.size;
+      }
+    }
+
+  } else {
+    GST_DEBUG_OBJECT (h265parse, "have bytestream h265");
+    /* nothing to pre-process */
+    h265parse->packetized = FALSE;
+    /* we have 4 sync bytes */
+    h265parse->nal_length_size = 4;
+
+    if (format == GST_H265_PARSE_FORMAT_NONE) {
+      format = GST_H265_PARSE_FORMAT_BYTE;
+      align = GST_H265_PARSE_ALIGN_AU;
+    }
+  }
+
+  {
+    GstCaps *in_caps;
+
+    /* prefer input type determined above */
+    in_caps = gst_caps_new_simple ("video/x-h265",
+        "parsed", G_TYPE_BOOLEAN, TRUE,
+        "stream-format", G_TYPE_STRING,
+        gst_h265_parse_get_string (h265parse, TRUE, format),
+        "alignment", G_TYPE_STRING,
+        gst_h265_parse_get_string (h265parse, FALSE, align), NULL);
+    /* negotiate with downstream, sets ->format and ->align */
+    gst_h265_parse_negotiate (h265parse, format, in_caps);
+    gst_caps_unref (in_caps);
+  }
+
+  if (format == h265parse->format && align == h265parse->align) {
+    /* do not set CAPS and passthrough mode if VPS/SPS/PPS have not been parsed */
+    if (h265parse->have_vps && h265parse->have_sps && h265parse->have_pps) {
+      gst_base_parse_set_passthrough (parse, TRUE);
+
+      /* we did parse codec-data and might supplement src caps */
+      gst_h265_parse_update_src_caps (h265parse, caps);
+    }
+  } else if (format == GST_H265_PARSE_FORMAT_HVC1
+      || format == GST_H265_PARSE_FORMAT_HEV1) {
+    /* if input != output, and input is hevc, must split before anything else */
+    /* arrange to insert codec-data in-stream if needed.
+     * src caps are only arranged for later on */
+    h265parse->push_codec = TRUE;
+    h265parse->have_vps = FALSE;
+    h265parse->have_sps = FALSE;
+    h265parse->have_pps = FALSE;
+    if (h265parse->align == GST_H265_PARSE_ALIGN_NAL)
+      h265parse->split_packetized = TRUE;
+    h265parse->packetized = TRUE;
+  }
+
+  return TRUE;
+
+  /* ERRORS */
+hvcc_too_small:
+  {
+    GST_DEBUG_OBJECT (h265parse, "hvcC size %" G_GSIZE_FORMAT " < 23", size);
+    goto refuse_caps;
+  }
+wrong_version:
+  {
+    GST_DEBUG_OBJECT (h265parse, "wrong hvcC version");
+    goto refuse_caps;
+  }
+wrong_type:
+  {
+    GST_DEBUG_OBJECT (h265parse, "wrong codec-data type");
+    goto refuse_caps;
+  }
+refuse_caps:
+  {
+    GST_WARNING_OBJECT (h265parse, "refused caps %" GST_PTR_FORMAT, caps);
+    return FALSE;
+  }
+}
+
+static void
+remove_fields (GstCaps * caps)
+{
+  guint i, n;
+
+  n = gst_caps_get_size (caps);
+  for (i = 0; i < n; i++) {
+    GstStructure *s = gst_caps_get_structure (caps, i);
+
+    gst_structure_remove_field (s, "alignment");
+    gst_structure_remove_field (s, "stream-format");
+    gst_structure_remove_field (s, "parsed");
+  }
+}
+
+static GstCaps *
+gst_h265_parse_get_caps (GstBaseParse * parse, GstCaps * filter)
+{
+  GstCaps *peercaps, *templ;
+  GstCaps *res;
+
+  templ = gst_pad_get_pad_template_caps (GST_BASE_PARSE_SINK_PAD (parse));
+  if (filter) {
+    GstCaps *fcopy = gst_caps_copy (filter);
+    /* Remove the fields we convert */
+    remove_fields (fcopy);
+    peercaps = gst_pad_peer_query_caps (GST_BASE_PARSE_SRC_PAD (parse), fcopy);
+    gst_caps_unref (fcopy);
+  } else
+    peercaps = gst_pad_peer_query_caps (GST_BASE_PARSE_SRC_PAD (parse), NULL);
+
+  if (peercaps) {
+    peercaps = gst_caps_make_writable (peercaps);
+    remove_fields (peercaps);
+
+    res = gst_caps_intersect_full (peercaps, templ, GST_CAPS_INTERSECT_FIRST);
+    gst_caps_unref (peercaps);
+    gst_caps_unref (templ);
+  } else {
+    res = templ;
+  }
+
+  if (filter) {
+    GstCaps *tmp = gst_caps_intersect_full (res, filter,
+        GST_CAPS_INTERSECT_FIRST);
+    gst_caps_unref (res);
+    res = tmp;
+  }
+
+  return res;
+}
+
+static gboolean
+gst_h265_parse_event (GstBaseParse * parse, GstEvent * event)
+{
+  gboolean res;
+  GstH265Parse *h265parse = GST_H265_PARSE (parse);
+
+  switch (GST_EVENT_TYPE (event)) {
+    case GST_EVENT_CUSTOM_DOWNSTREAM:
+    {
+      GstClockTime timestamp, stream_time, running_time;
+      gboolean all_headers;
+      guint count;
+
+      if (gst_video_event_is_force_key_unit (event)) {
+        gst_video_event_parse_downstream_force_key_unit (event,
+            &timestamp, &stream_time, &running_time, &all_headers, &count);
+
+        GST_INFO_OBJECT (h265parse, "received downstream force key unit event, "
+            "seqnum %d running_time %" GST_TIME_FORMAT
+            " all_headers %d count %d", gst_event_get_seqnum (event),
+            GST_TIME_ARGS (running_time), all_headers, count);
+        if (h265parse->force_key_unit_event) {
+          GST_INFO_OBJECT (h265parse, "ignoring force key unit event "
+              "as one is already queued");
+        } else {
+          h265parse->pending_key_unit_ts = running_time;
+          gst_event_replace (&h265parse->force_key_unit_event, event);
+        }
+        gst_event_unref (event);
+        res = TRUE;
+      } else {
+        res = GST_BASE_PARSE_CLASS (parent_class)->sink_event (parse, event);
+        break;
+      }
+      break;
+    }
+    case GST_EVENT_FLUSH_STOP:
+
+      res = GST_BASE_PARSE_CLASS (parent_class)->sink_event (parse, event);
+      break;
+    case GST_EVENT_SEGMENT:
+    {
+      res = GST_BASE_PARSE_CLASS (parent_class)->sink_event (parse, event);
+      break;
+    }
+    default:
+      res = GST_BASE_PARSE_CLASS (parent_class)->sink_event (parse, event);
+      break;
+  }
+  return res;
+}
+
+static gboolean
+gst_h265_parse_src_event (GstBaseParse * parse, GstEvent * event)
+{
+  gboolean res;
+  GstH265Parse *h265parse = GST_H265_PARSE (parse);
+
+  switch (GST_EVENT_TYPE (event)) {
+    case GST_EVENT_CUSTOM_UPSTREAM:
+    {
+      GstClockTime running_time;
+      gboolean all_headers;
+      guint count;
+
+      if (gst_video_event_is_force_key_unit (event)) {
+        gst_video_event_parse_upstream_force_key_unit (event,
+            &running_time, &all_headers, &count);
+
+        GST_INFO_OBJECT (h265parse, "received upstream force-key-unit event, "
+            "seqnum %d running_time %" GST_TIME_FORMAT
+            " all_headers %d count %d", gst_event_get_seqnum (event),
+            GST_TIME_ARGS (running_time), all_headers, count);
+
+        if (all_headers) {
+          h265parse->pending_key_unit_ts = running_time;
+          gst_event_replace (&h265parse->force_key_unit_event, event);
+        }
+      }
+      res = GST_BASE_PARSE_CLASS (parent_class)->src_event (parse, event);
+      break;
+    }
+    default:
+      res = GST_BASE_PARSE_CLASS (parent_class)->src_event (parse, event);
+      break;
+  }
+
+  return res;
+}
+
+static void
+gst_h265_parse_set_property (GObject * object, guint prop_id,
+    const GValue * value, GParamSpec * pspec)
+{
+  GstH265Parse *parse;
+  parse = GST_H265_PARSE (object);
+
+  switch (prop_id) {
+    case PROP_CONFIG_INTERVAL:
+      parse->interval = g_value_get_uint (value);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+static void
+gst_h265_parse_get_property (GObject * object, guint prop_id, GValue * value,
+    GParamSpec * pspec)
+{
+  GstH265Parse *parse;
+  parse = GST_H265_PARSE (object);
+
+  switch (prop_id) {
+    case PROP_CONFIG_INTERVAL:
+      g_value_set_uint (value, parse->interval);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
diff -Nru gstreamer-vaapi-0.5.10/gst/vaapi/gsth265parse.h gstreamer-vaapi-0.6.0/gst/vaapi/gsth265parse.h
--- gstreamer-vaapi-0.5.10/gst/vaapi/gsth265parse.h	1970-01-01 00:00:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst/vaapi/gsth265parse.h	2015-07-15 12:51:54.000000000 +0000
@@ -0,0 +1,105 @@
+/* GStreamer H.265 Parser
+ * Copyright (C) 2013 Intel Corporation
+ *   Contact: Sreerenj Balachandran <sreerenj.balachandran@intel.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef __GST_H265_PARSE_H__
+#define __GST_H265_PARSE_H__
+
+#include <gst/gst.h>
+#include <gst/base/gstbaseparse.h>
+#include <gst/codecparsers/gsth265parser.h>
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_H265_PARSE \
+  (gst_h265_parse_get_type())
+#define GST_H265_PARSE(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_H265_PARSE,GstH265Parse))
+#define GST_H265_PARSE_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_H265_PARSE,GstH265ParseClass))
+#define GST_IS_H265_PARSE(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_H265_PARSE))
+#define GST_IS_H265_PARSE_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_H265_PARSE))
+
+GType gst_h265_parse_get_type (void);
+
+typedef struct _GstH265Parse GstH265Parse;
+typedef struct _GstH265ParseClass GstH265ParseClass;
+
+struct _GstH265Parse
+{
+  GstBaseParse baseparse;
+
+  /* stream */
+  gint width, height;
+  gint fps_num, fps_den;
+  gint upstream_par_n, upstream_par_d;
+  gint parsed_par_n, parsed_par_d;
+  /* current codec_data in output caps, if any */
+  GstBuffer *codec_data;
+  /* input codec_data, if any */
+  GstBuffer *codec_data_in;
+  guint nal_length_size;
+  gboolean packetized;
+  gboolean split_packetized;
+  gboolean transform;
+
+  /* state */
+  GstH265Parser *nalparser;
+  guint align;
+  guint format;
+  gint current_off;
+
+  GstClockTime last_report;
+  gboolean push_codec;
+  gboolean have_vps;
+  gboolean have_sps;
+  gboolean have_pps;
+
+  /* collected SPS and PPS NALUs */
+  GstBuffer *vps_nals[GST_H265_MAX_VPS_COUNT];
+  GstBuffer *sps_nals[GST_H265_MAX_SPS_COUNT];
+  GstBuffer *pps_nals[GST_H265_MAX_PPS_COUNT];
+
+  /* frame parsing */
+  gint idr_pos, sei_pos;
+  gboolean update_caps;
+  GstAdapter *frame_out;
+  gboolean keyframe;
+  gboolean header;
+  /* AU state */
+  gboolean picture_start;
+
+  /* props */
+  guint interval;
+
+  gboolean sent_codec_tag;
+
+  GstClockTime pending_key_unit_ts;
+  GstEvent *force_key_unit_event;
+};
+
+struct _GstH265ParseClass
+{
+  GstBaseParseClass parent_class;
+};
+
+G_END_DECLS
+#endif
diff -Nru gstreamer-vaapi-0.5.10/gst/vaapi/gstvaapi.c gstreamer-vaapi-0.6.0/gst/vaapi/gstvaapi.c
--- gstreamer-vaapi-0.5.10/gst/vaapi/gstvaapi.c	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst/vaapi/gstvaapi.c	2015-07-15 12:47:43.000000000 +0000
@@ -22,63 +22,70 @@
  *  Boston, MA 02110-1301 USA
  */
 
-#include "gst/vaapi/sysdeps.h"
+#include "gstcompat.h"
 #include <gst/gst.h>
-#include "gstvaapidownload.h"
-#include "gstvaapiupload.h"
 #include "gstvaapidecode.h"
 #include "gstvaapipostproc.h"
 #include "gstvaapisink.h"
+#include "gstvaapidecodebin.h"
 
 #if USE_ENCODERS
 #include "gstvaapiencode_h264.h"
 #include "gstvaapiencode_mpeg2.h"
 #endif
 
+#if USE_JPEG_ENCODER
+#include "gstvaapiencode_jpeg.h"
+#endif
+
+#if USE_VP8_ENCODER
+#include "gstvaapiencode_vp8.h"
+#endif
+
+#if USE_H265_ENCODER
+#include "gstvaapiencode_h265.h"
+#endif
+
 #define PLUGIN_NAME     "vaapi"
 #define PLUGIN_DESC     "VA-API based elements"
 #define PLUGIN_LICENSE  "LGPL"
 
 static gboolean
-plugin_init (GstPlugin *plugin)
+plugin_init (GstPlugin * plugin)
 {
-#if !GST_CHECK_VERSION(1,0,0)
-    gst_element_register(plugin, "vaapidownload",
-                         GST_RANK_SECONDARY,
-                         GST_TYPE_VAAPIDOWNLOAD);
-    gst_element_register(plugin, "vaapiupload",
-                         GST_RANK_PRIMARY,
-                         GST_TYPE_VAAPIUPLOAD);
-#endif
-    gst_element_register(plugin, "vaapidecode",
-                         GST_RANK_PRIMARY + 1,
-                         GST_TYPE_VAAPIDECODE);
-    gst_element_register(plugin, "vaapipostproc",
-                         GST_RANK_PRIMARY,
-                         GST_TYPE_VAAPIPOSTPROC);
-    gst_element_register(plugin, "vaapisink",
-                         GST_RANK_PRIMARY,
-                         GST_TYPE_VAAPISINK);
+  gst_element_register (plugin, "vaapidecode",
+      GST_RANK_PRIMARY + 1, GST_TYPE_VAAPIDECODE);
+  gst_element_register (plugin, "vaapipostproc",
+      GST_RANK_PRIMARY, GST_TYPE_VAAPIPOSTPROC);
+  gst_element_register (plugin, "vaapisink",
+      GST_RANK_PRIMARY, GST_TYPE_VAAPISINK);
 #if USE_ENCODERS
-    gst_element_register(plugin, "vaapiencode_h264",
-                         GST_RANK_PRIMARY,
-                         GST_TYPE_VAAPIENCODE_H264);
-    gst_element_register(plugin, "vaapiencode_mpeg2",
-                         GST_RANK_PRIMARY,
-                         GST_TYPE_VAAPIENCODE_MPEG2);
+  gst_element_register (plugin, "vaapiencode_h264",
+      GST_RANK_PRIMARY, GST_TYPE_VAAPIENCODE_H264);
+  gst_element_register (plugin, "vaapiencode_mpeg2",
+      GST_RANK_PRIMARY, GST_TYPE_VAAPIENCODE_MPEG2);
+#endif
+#if USE_JPEG_ENCODER
+  gst_element_register (plugin, "vaapiencode_jpeg",
+      GST_RANK_PRIMARY, GST_TYPE_VAAPIENCODE_JPEG);
+#endif
+#if USE_VP8_ENCODER
+  gst_element_register (plugin, "vaapiencode_vp8",
+      GST_RANK_PRIMARY, GST_TYPE_VAAPIENCODE_VP8);
 #endif
 
-    return TRUE;
-}
+#if USE_H265_ENCODER
+  gst_element_register (plugin, "vaapiencode_h265",
+      GST_RANK_PRIMARY, GST_TYPE_VAAPIENCODE_H265);
+#endif
 
-#if GST_CHECK_VERSION(1,0,0)
-/* XXX: use PLUGIN_NAME when GST_PLUGIN_DEFINE is fixed to use
-   G_STRINGIFY() for name argument, instead of plain #name */
-GST_PLUGIN_DEFINE(GST_VERSION_MAJOR, GST_VERSION_MINOR,
-                  vaapi, PLUGIN_DESC, plugin_init,
-                  PACKAGE_VERSION, PLUGIN_LICENSE, PACKAGE, PACKAGE_BUGREPORT)
-#else
-GST_PLUGIN_DEFINE(GST_VERSION_MAJOR, GST_VERSION_MINOR,
-                  PLUGIN_NAME, PLUGIN_DESC, plugin_init,
-                  PACKAGE_VERSION, PLUGIN_LICENSE, PACKAGE, PACKAGE_BUGREPORT)
+#if GST_CHECK_VERSION(1,4,0)
+  gst_element_register (plugin, "vaapidecodebin",
+      GST_RANK_MARGINAL, GST_TYPE_VAAPI_DECODE_BIN);
 #endif
+  return TRUE;
+}
+
+GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, GST_VERSION_MINOR,
+    vaapi, PLUGIN_DESC, plugin_init,
+    PACKAGE_VERSION, PLUGIN_LICENSE, PACKAGE, PACKAGE_BUGREPORT)
diff -Nru gstreamer-vaapi-0.5.10/gst/vaapi/gstvaapidecodebin.c gstreamer-vaapi-0.6.0/gst/vaapi/gstvaapidecodebin.c
--- gstreamer-vaapi-0.5.10/gst/vaapi/gstvaapidecodebin.c	1970-01-01 00:00:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst/vaapi/gstvaapidecodebin.c	2015-07-15 12:47:43.000000000 +0000
@@ -0,0 +1,413 @@
+/*
+ *  gstvaapidecodebin.c
+ *
+ *  Copyright (C) 2015 Intel Corporation
+ *    Author: Sreerenj Balachandran <sreerenj.balachandran@intel.com>
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public License
+ *  as published by the Free Software Foundation; either version 2.1
+ *  of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free
+ *  Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ *  Boston, MA 02110-1301 USA
+ */
+
+#include "gstcompat.h"
+#include <stdio.h>
+#include <string.h>
+#include <gst/gst.h>
+#include <gst/pbutils/pbutils.h>
+#include "gstvaapipluginutil.h"
+#include "gstvaapidecodebin.h"
+#include "gstvaapivideocontext.h"
+
+#define GST_PLUGIN_NAME "vaapidecodebin"
+#define GST_PLUGIN_DESC "A Bin of VA-API elements: vaapidecode ! queue ! vaapipostproc"
+
+GST_DEBUG_CATEGORY_STATIC (gst_debug_vaapi_decode_bin);
+#define GST_CAT_DEFAULT gst_debug_vaapi_decode_bin
+
+#define DEFAULT_QUEUE_MAX_SIZE_BUFFERS 0
+#define DEFAULT_QUEUE_MAX_SIZE_BYTES   0
+#define DEFAULT_QUEUE_MAX_SIZE_TIME    0
+#define DEFAULT_DEINTERLACE_METHOD     GST_VAAPI_DEINTERLACE_METHOD_BOB
+
+enum
+{
+  PROP_0,
+  PROP_MAX_SIZE_BUFFERS,
+  PROP_MAX_SIZE_BYTES,
+  PROP_MAX_SIZE_TIME,
+  PROP_DEINTERLACE_METHOD,
+  PROP_DISABLE_VPP,
+  PROP_LAST
+};
+
+static GParamSpec *properties[PROP_LAST];
+
+#define GST_VAAPI_DECODE_BIN_SURFACE_CAPS \
+    GST_VIDEO_CAPS_MAKE_WITH_FEATURES(  \
+        GST_CAPS_FEATURE_MEMORY_VAAPI_SURFACE, "{ ENCODED, I420, YV12, NV12 }")
+
+/* Default templates */
+#define GST_CAPS_CODEC(CODEC) CODEC "; "
+/* *INDENT-OFF* */
+static const char gst_vaapi_decode_bin_sink_caps_str[] =
+    GST_CAPS_CODEC("video/mpeg, mpegversion=2, systemstream=(boolean)false")
+    GST_CAPS_CODEC("video/mpeg, mpegversion=4")
+    GST_CAPS_CODEC("video/x-divx")
+    GST_CAPS_CODEC("video/x-xvid")
+    GST_CAPS_CODEC("video/x-h263")
+    GST_CAPS_CODEC("video/x-h264")
+#if USE_HEVC_DECODER
+    GST_CAPS_CODEC("video/x-h265")
+#endif
+    GST_CAPS_CODEC("video/x-wmv")
+#if USE_VP8_DECODER
+    GST_CAPS_CODEC("video/x-vp8")
+#endif
+#if USE_JPEG_DECODER
+    GST_CAPS_CODEC("image/jpeg")
+#endif
+    ;
+/* *INDENT-ON* */
+
+/* *INDENT-OFF* */
+static const char gst_vaapi_decode_bin_src_caps_str[] =
+  GST_VAAPI_DECODE_BIN_SURFACE_CAPS ", "
+  GST_CAPS_INTERLACED_FALSE "; "
+  GST_VIDEO_CAPS_MAKE_WITH_FEATURES (
+      GST_CAPS_FEATURE_META_GST_VIDEO_GL_TEXTURE_UPLOAD_META, "{ RGBA, BGRA }") ", "
+  GST_CAPS_INTERLACED_FALSE "; "
+  GST_VIDEO_CAPS_MAKE (GST_VIDEO_FORMATS_ALL) ", "
+  GST_CAPS_INTERLACED_FALSE;
+/* *INDENT-ON* */
+
+static GstStaticPadTemplate gst_vaapi_decode_bin_sink_factory =
+GST_STATIC_PAD_TEMPLATE ("sink",
+    GST_PAD_SINK,
+    GST_PAD_ALWAYS,
+    GST_STATIC_CAPS (gst_vaapi_decode_bin_sink_caps_str));
+
+static GstStaticPadTemplate gst_vaapi_decode_bin_src_factory =
+GST_STATIC_PAD_TEMPLATE ("src",
+    GST_PAD_SRC,
+    GST_PAD_ALWAYS,
+    GST_STATIC_CAPS (gst_vaapi_decode_bin_src_caps_str));
+
+G_DEFINE_TYPE (GstVaapiDecodeBin, gst_vaapi_decode_bin, GST_TYPE_BIN);
+
+static void
+post_missing_element_message (GstVaapiDecodeBin * vaapidecbin,
+    const gchar * missing_factory)
+{
+  GstMessage *msg;
+
+  GST_ERROR_OBJECT (vaapidecbin, "Failed to create %s element",
+      missing_factory);
+  msg =
+      gst_missing_element_message_new (GST_ELEMENT_CAST (vaapidecbin),
+      missing_factory);
+  gst_element_post_message (GST_ELEMENT_CAST (vaapidecbin), msg);
+}
+
+static gboolean
+activate_vpp (GstVaapiDecodeBin * vaapidecbin)
+{
+  GstElement *src;
+
+  if (vaapidecbin->ghost_pad_src || vaapidecbin->postproc)
+    return TRUE;
+
+  if (!vaapidecbin->has_vpp || vaapidecbin->disable_vpp) {
+    src = vaapidecbin->queue;
+    goto connect_src_ghost_pad;
+  }
+
+  /* create the postproc */
+  vaapidecbin->postproc =
+      gst_element_factory_make ("vaapipostproc", "vaapipostproc");
+  if (!vaapidecbin->postproc)
+    goto error_element_missing;
+
+  g_object_set (G_OBJECT (vaapidecbin->postproc), "deinterlace-method",
+      vaapidecbin->deinterlace_method, NULL);
+
+  gst_bin_add (GST_BIN (vaapidecbin), vaapidecbin->postproc);
+  if (!gst_element_link_pads_full (vaapidecbin->queue, "src",
+          vaapidecbin->postproc, "sink", GST_PAD_LINK_CHECK_NOTHING))
+    goto error_link_pad;
+
+  GST_DEBUG_OBJECT (vaapidecbin, "Enabling VPP");
+  src = vaapidecbin->postproc;
+
+  goto connect_src_ghost_pad;
+
+error_element_missing:
+  {
+    post_missing_element_message (vaapidecbin, "vaapipostproc");
+    return FALSE;
+  }
+error_link_pad:
+  {
+    GST_ERROR_OBJECT (vaapidecbin, "Failed to link the child elements");
+    return FALSE;
+  }
+connect_src_ghost_pad:
+  {
+    GstPad *srcpad, *ghostpad;
+
+    srcpad = gst_element_get_static_pad (src, "src");
+    ghostpad = gst_ghost_pad_new ("src", srcpad);
+    vaapidecbin->ghost_pad_src = ghostpad;
+    gst_object_unref (srcpad);
+    gst_element_add_pad (GST_ELEMENT (vaapidecbin), ghostpad);
+    return TRUE;
+  }
+}
+
+static void
+gst_vaapi_decode_bin_set_property (GObject * object,
+    guint prop_id, const GValue * value, GParamSpec * pspec)
+{
+  GstVaapiDecodeBin *vaapidecbin = GST_VAAPI_DECODE_BIN (object);
+
+  switch (prop_id) {
+    case PROP_MAX_SIZE_BYTES:
+      vaapidecbin->max_size_bytes = g_value_get_uint (value);
+      g_object_set (G_OBJECT (vaapidecbin->queue), "max-size-bytes",
+          vaapidecbin->max_size_bytes, NULL);
+      break;
+    case PROP_MAX_SIZE_BUFFERS:
+      vaapidecbin->max_size_buffers = g_value_get_uint (value);
+      g_object_set (G_OBJECT (vaapidecbin->queue), "max-size-buffers",
+          vaapidecbin->max_size_buffers, NULL);
+      break;
+    case PROP_MAX_SIZE_TIME:
+      vaapidecbin->max_size_time = g_value_get_uint64 (value);
+      g_object_set (G_OBJECT (vaapidecbin->queue), "max-size-time",
+          vaapidecbin->max_size_time, NULL);
+      break;
+    case PROP_DEINTERLACE_METHOD:
+      vaapidecbin->deinterlace_method = g_value_get_enum (value);
+      g_object_set (G_OBJECT (vaapidecbin->postproc), "deinterlace-method",
+          vaapidecbin->deinterlace_method, NULL);
+      break;
+    case PROP_DISABLE_VPP:
+    {
+      gboolean disable_vpp;
+
+      disable_vpp = g_value_get_boolean (value);
+      if (!disable_vpp && !vaapidecbin->has_vpp)
+        GST_WARNING_OBJECT (vaapidecbin,
+            "Cannot enable VPP since the VA driver does not support it");
+      else
+        vaapidecbin->disable_vpp = disable_vpp;
+
+      /* @TODO: Add run-time disabling support */
+      break;
+    }
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+static void
+gst_vaapi_decode_bin_get_property (GObject * object,
+    guint prop_id, GValue * value, GParamSpec * pspec)
+{
+  GstVaapiDecodeBin *vaapidecbin = GST_VAAPI_DECODE_BIN (object);
+
+  switch (prop_id) {
+    case PROP_MAX_SIZE_BYTES:
+      g_value_set_uint (value, vaapidecbin->max_size_bytes);
+      break;
+    case PROP_MAX_SIZE_BUFFERS:
+      g_value_set_uint (value, vaapidecbin->max_size_buffers);
+      break;
+    case PROP_MAX_SIZE_TIME:
+      g_value_set_uint64 (value, vaapidecbin->max_size_time);
+      break;
+    case PROP_DEINTERLACE_METHOD:
+      g_value_set_enum (value, vaapidecbin->deinterlace_method);
+      break;
+    case PROP_DISABLE_VPP:
+      g_value_set_boolean (value, vaapidecbin->disable_vpp);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+static void
+gst_vaapi_decode_bin_handle_message (GstBin * bin, GstMessage * message)
+{
+  GstVaapiDecodeBin *vaapidecbin = GST_VAAPI_DECODE_BIN (bin);
+  GstMessageType type;
+  GstContext *context = NULL;
+  const gchar *context_type;
+  GstVaapiDisplay *display = NULL;
+
+  type = GST_MESSAGE_TYPE (message);
+  if (type != GST_MESSAGE_HAVE_CONTEXT)
+    goto bail;
+  gst_message_parse_have_context (message, &context);
+  if (!context)
+    goto bail;
+  context_type = gst_context_get_context_type (context);
+  if (g_strcmp0 (context_type, GST_VAAPI_DISPLAY_CONTEXT_TYPE_NAME) != 0)
+    goto bail;
+  if (!gst_vaapi_video_context_get_display (context, &display))
+    goto bail;
+
+  vaapidecbin->has_vpp = gst_vaapi_display_has_video_processing (display);
+
+  /* the underlying VA driver implementation doesn't support video
+   * post-processing, hence we have to disable it */
+  if (!vaapidecbin->has_vpp) {
+    GST_WARNING_OBJECT (vaapidecbin, "VA driver doesn't support VPP");
+    if (!vaapidecbin->disable_vpp) {
+      vaapidecbin->disable_vpp = TRUE;
+      g_object_notify_by_pspec (G_OBJECT (vaapidecbin),
+          properties[PROP_DISABLE_VPP]);
+    }
+  }
+
+  activate_vpp (vaapidecbin);
+
+bail:
+  GST_BIN_CLASS (gst_vaapi_decode_bin_parent_class)->handle_message (bin,
+      message);
+}
+
+static void
+gst_vaapi_decode_bin_class_init (GstVaapiDecodeBinClass * klass)
+{
+  GObjectClass *gobject_class;
+  GstElementClass *element_class;
+  GstBinClass *bin_class;
+
+  gobject_class = G_OBJECT_CLASS (klass);
+  element_class = GST_ELEMENT_CLASS (klass);
+  bin_class = GST_BIN_CLASS (klass);
+
+  gobject_class->set_property = gst_vaapi_decode_bin_set_property;
+  gobject_class->get_property = gst_vaapi_decode_bin_get_property;
+
+  bin_class->handle_message =
+      GST_DEBUG_FUNCPTR (gst_vaapi_decode_bin_handle_message);
+
+  gst_element_class_set_static_metadata (element_class,
+      "VA-API Decode Bin",
+      "Codec/Decoder/Video",
+      GST_PLUGIN_DESC,
+      "Sreerenj Balachandran <sreerenj.balachandran@intel.com>");
+
+  properties[PROP_MAX_SIZE_BYTES] = g_param_spec_uint ("max-size-bytes",
+      "Max. size (kB)", "Max. amount of data in the queue (bytes, 0=disable)",
+      0, G_MAXUINT, DEFAULT_QUEUE_MAX_SIZE_BYTES,
+      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+  properties[PROP_MAX_SIZE_BUFFERS] = g_param_spec_uint ("max-size-buffers",
+      "Max. size (buffers)", "Max. number of buffers in the queue (0=disable)",
+      0, G_MAXUINT, DEFAULT_QUEUE_MAX_SIZE_BUFFERS,
+      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+  properties[PROP_MAX_SIZE_TIME] = g_param_spec_uint64 ("max-size-time",
+      "Max. size (ns)", "Max. amount of data in the queue (in ns, 0=disable)",
+      0, G_MAXUINT64, DEFAULT_QUEUE_MAX_SIZE_TIME,
+      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+  properties[PROP_DEINTERLACE_METHOD] = g_param_spec_enum ("deinterlace-method",
+      "Deinterlace method", "Deinterlace method to use",
+      GST_VAAPI_TYPE_DEINTERLACE_METHOD, DEFAULT_DEINTERLACE_METHOD,
+      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+  properties[PROP_DISABLE_VPP] = g_param_spec_boolean ("disable-vpp",
+      "Disable VPP",
+      "Disable Video Post Processing (No support for run time disabling)",
+      FALSE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+
+  g_object_class_install_properties (gobject_class, PROP_LAST, properties);
+
+  gst_element_class_add_pad_template (element_class,
+      gst_static_pad_template_get (&gst_vaapi_decode_bin_sink_factory));
+
+  gst_element_class_add_pad_template (element_class,
+      gst_static_pad_template_get (&gst_vaapi_decode_bin_src_factory));
+
+  GST_DEBUG_CATEGORY_INIT (gst_debug_vaapi_decode_bin,
+      GST_PLUGIN_NAME, 0, GST_PLUGIN_DESC);
+}
+
+static gboolean
+gst_vaapi_decode_bin_configure (GstVaapiDecodeBin * vaapidecbin)
+{
+  gchar *missing_factory = NULL;
+
+  /* create the decoder */
+  vaapidecbin->decoder =
+      gst_element_factory_make ("vaapidecode", "vaapidecode");
+  if (!vaapidecbin->decoder) {
+    missing_factory = "vaapidecode";
+    goto error_element_missing;
+  }
+  /* create the queue */
+  vaapidecbin->queue = gst_element_factory_make ("queue", "queue");
+  if (!vaapidecbin->queue) {
+    missing_factory = "queue";
+    goto error_element_missing;
+  }
+
+  g_object_set (G_OBJECT (vaapidecbin->queue),
+      "max-size-bytes", vaapidecbin->max_size_bytes,
+      "max-size-buffers", vaapidecbin->max_size_buffers,
+      "max-size-time", vaapidecbin->max_size_time, NULL);
+
+  gst_bin_add_many (GST_BIN (vaapidecbin),
+      vaapidecbin->decoder, vaapidecbin->queue, NULL);
+
+  if (!gst_element_link_pads_full (vaapidecbin->decoder, "src",
+          vaapidecbin->queue, "sink", GST_PAD_LINK_CHECK_NOTHING))
+    goto error_link_pad;
+
+  return TRUE;
+
+error_element_missing:
+  {
+    post_missing_element_message (vaapidecbin, missing_factory);
+    return FALSE;
+  }
+error_link_pad:
+  {
+    GST_ERROR_OBJECT (vaapidecbin, "Failed to link the child elements");
+    return FALSE;
+  }
+}
+
+static void
+gst_vaapi_decode_bin_init (GstVaapiDecodeBin * vaapidecbin)
+{
+  GstPad *element_pad, *ghost_pad;
+
+  /* let's assume we have VPP until we prove the opposite */
+  vaapidecbin->has_vpp = TRUE;
+
+  if (!gst_vaapi_decode_bin_configure (vaapidecbin))
+    return;
+
+  /* create ghost pad sink */
+  element_pad =
+      gst_element_get_static_pad (GST_ELEMENT (vaapidecbin->decoder), "sink");
+  ghost_pad =
+      gst_ghost_pad_new_from_template ("sink", element_pad,
+      GST_PAD_PAD_TEMPLATE (element_pad));
+  gst_object_unref (element_pad);
+  gst_element_add_pad (GST_ELEMENT (vaapidecbin), ghost_pad);
+}
diff -Nru gstreamer-vaapi-0.5.10/gst/vaapi/gstvaapidecodebin.h gstreamer-vaapi-0.6.0/gst/vaapi/gstvaapidecodebin.h
--- gstreamer-vaapi-0.5.10/gst/vaapi/gstvaapidecodebin.h	1970-01-01 00:00:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst/vaapi/gstvaapidecodebin.h	2015-07-15 12:47:43.000000000 +0000
@@ -0,0 +1,71 @@
+/*
+ *  gstvaapidecodebin.h
+ *
+ *  Copyright (C) 2015 Intel Corporation
+ *    Author: Sreerenj Balachandran <sreerenj.balachandran@intel.com>
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public License
+ *  as published by the Free Software Foundation; either version 2.1
+ *  of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free
+ *  Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ *  Boston, MA 02110-1301 USA
+ */
+
+#ifndef GST_VAAPI_DECODE_BIN_H
+#define GST_VAAPI_DECODE_BIN_H
+
+#include <gst/vaapi/gstvaapifilter.h>
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_VAAPI_DECODE_BIN (gst_vaapi_decode_bin_get_type ())
+#define GST_VAAPI_DECODE_BIN(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_VAAPI_DECODE_BIN, GstVaapiDecodeBin))
+#define GST_VAAPI_DECODE_BIN_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_VAAPI_DECODE_BIN, GstVaapiDecodeBinClass))
+#define GST_IS_AUTO_DETECT(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_VAAPI_DECODE_BIN))
+#define GST_IS_AUTO_DETECT_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_VAAPI_DECODE_BIN))
+#define GST_VAAPI_DECODE_BIN_GET_CLASS(obj) \
+  (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_VAAPI_DECODE_BIN, GstVaapiDecodeBinClass))
+
+typedef struct _GstVaapiDecodeBin {
+  /* < private > */
+  GstBin parent;
+
+  GstElement *decoder;
+  GstElement *queue;
+  GstElement *postproc;
+
+  GstPad *ghost_pad_src;
+
+  /* properties */
+  guint   max_size_buffers;
+  guint   max_size_bytes;
+  guint64 max_size_time;
+  GstVaapiDeinterlaceMethod deinterlace_method;
+  gboolean disable_vpp;
+  gboolean has_vpp;
+
+} GstVaapiDecodeBin;
+
+typedef struct _GstVaapiDecodeBinClass {
+  GstBinClass parent_class;
+
+} GstVaapiDecodeBinClass;
+
+GType   gst_vaapi_decode_bin_get_type    (void);
+
+G_END_DECLS
+
+#endif /* GST_VAAPI_DECODE_BIN_H */
diff -Nru gstreamer-vaapi-0.5.10/gst/vaapi/gstvaapidecode.c gstreamer-vaapi-0.6.0/gst/vaapi/gstvaapidecode.c
--- gstreamer-vaapi-0.5.10/gst/vaapi/gstvaapidecode.c	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst/vaapi/gstvaapidecode.c	2015-07-15 12:47:43.000000000 +0000
@@ -30,19 +30,17 @@
  * the vaapisink element.
  */
 
-#include "gst/vaapi/sysdeps.h"
+#include "gstcompat.h"
 #include <gst/vaapi/gstvaapidisplay.h>
 
 #include "gstvaapidecode.h"
 #include "gstvaapipluginutil.h"
 #include "gstvaapivideobuffer.h"
-#if GST_CHECK_VERSION(1,1,0) && USE_GLX
+#if (USE_GLX || USE_EGL)
 #include "gstvaapivideometa_texture.h"
 #endif
-#if GST_CHECK_VERSION(1,0,0)
 #include "gstvaapivideobufferpool.h"
 #include "gstvaapivideomemory.h"
-#endif
 
 #include <gst/vaapi/gstvaapidecoder_h264.h>
 #include <gst/vaapi/gstvaapidecoder_jpeg.h>
@@ -50,18 +48,20 @@
 #include <gst/vaapi/gstvaapidecoder_mpeg4.h>
 #include <gst/vaapi/gstvaapidecoder_vc1.h>
 #include <gst/vaapi/gstvaapidecoder_vp8.h>
+#include <gst/vaapi/gstvaapidecoder_h265.h>
 
 #define GST_PLUGIN_NAME "vaapidecode"
 #define GST_PLUGIN_DESC "A VA-API based video decoder"
 
 #define GST_VAAPI_DECODE_FLOW_PARSE_DATA        GST_FLOW_CUSTOM_SUCCESS_2
 
-GST_DEBUG_CATEGORY_STATIC(gst_debug_vaapidecode);
+GST_DEBUG_CATEGORY_STATIC (gst_debug_vaapidecode);
 #define GST_CAT_DEFAULT gst_debug_vaapidecode
 
 /* Default templates */
 #define GST_CAPS_CODEC(CODEC) CODEC "; "
 
+/* *INDENT-OFF* */
 static const char gst_vaapidecode_sink_caps_str[] =
     GST_CAPS_CODEC("video/mpeg, mpegversion=2, systemstream=(boolean)false")
     GST_CAPS_CODEC("video/mpeg, mpegversion=4")
@@ -69,21 +69,24 @@
     GST_CAPS_CODEC("video/x-xvid")
     GST_CAPS_CODEC("video/x-h263")
     GST_CAPS_CODEC("video/x-h264")
+#if USE_HEVC_DECODER
+    GST_CAPS_CODEC("video/x-h265")
+#endif
     GST_CAPS_CODEC("video/x-wmv")
+#if USE_VP8_DECODER
     GST_CAPS_CODEC("video/x-vp8")
+#endif
+#if USE_JPEG_DECODER
     GST_CAPS_CODEC("image/jpeg")
+#endif
     ;
 
 static const char gst_vaapidecode_src_caps_str[] =
-#if GST_CHECK_VERSION(1,1,0)
     GST_VIDEO_CAPS_MAKE_WITH_FEATURES(
         GST_CAPS_FEATURE_MEMORY_VAAPI_SURFACE, "{ ENCODED, I420, YV12, NV12 }") ";"
     GST_VIDEO_CAPS_MAKE_WITH_FEATURES(
-        GST_CAPS_FEATURE_META_GST_VIDEO_GL_TEXTURE_UPLOAD_META, "RGBA") ";"
+        GST_CAPS_FEATURE_META_GST_VIDEO_GL_TEXTURE_UPLOAD_META, "{ RGBA, BGRA }") ";"
     GST_VIDEO_CAPS_MAKE("{ I420, YV12, NV12 }");
-#else
-    GST_VAAPI_SURFACE_CAPS;
-#endif
 
 static GstStaticPadTemplate gst_vaapidecode_sink_factory =
     GST_STATIC_PAD_TEMPLATE(
@@ -104,928 +107,1022 @@
     gst_vaapidecode,
     GST_TYPE_VIDEO_DECODER,
     GST_VAAPI_PLUGIN_BASE_INIT_INTERFACES)
+/* *INDENT-ON* */
+
+static gboolean gst_vaapidecode_update_src_caps (GstVaapiDecode * decode);
 
 static gboolean
-gst_vaapidecode_update_src_caps(GstVaapiDecode *decode,
-    const GstVideoCodecState *ref_state);
+gst_vaapi_decode_input_state_replace (GstVaapiDecode * decode,
+    const GstVideoCodecState * new_state);
+
+static gboolean
+gst_vaapidecode_sink_query (GstVideoDecoder * vdec, GstQuery * query);
+static gboolean
+gst_vaapidecode_src_query (GstVideoDecoder * vdec, GstQuery * query);
 
 static void
-gst_vaapi_decoder_state_changed(GstVaapiDecoder *decoder,
-    const GstVideoCodecState *codec_state, gpointer user_data)
+gst_vaapi_decoder_state_changed (GstVaapiDecoder * decoder,
+    const GstVideoCodecState * codec_state, gpointer user_data)
+{
+  GstVaapiDecode *const decode = GST_VAAPIDECODE (user_data);
+  GstVideoDecoder *const vdec = GST_VIDEO_DECODER (decode);
+  GstVaapiPluginBase *const plugin = GST_VAAPI_PLUGIN_BASE (vdec);
+
+  g_assert (decode->decoder == decoder);
+
+  if (!gst_vaapi_decode_input_state_replace (decode, codec_state))
+    return;
+  if (!gst_vaapidecode_update_src_caps (decode))
+    return;
+  if (!gst_video_decoder_negotiate (vdec))
+    return;
+  if (!gst_vaapi_plugin_base_set_caps (plugin, NULL, decode->srcpad_caps))
+    return;
+}
+
+static gboolean
+gst_vaapi_decode_input_state_replace (GstVaapiDecode * decode,
+    const GstVideoCodecState * new_state)
 {
-    GstVaapiDecode * const decode = GST_VAAPIDECODE(user_data);
-    GstVideoDecoder * const vdec = GST_VIDEO_DECODER(decode);
-    GstVaapiPluginBase * const plugin = GST_VAAPI_PLUGIN_BASE(vdec);
-
-    g_assert(decode->decoder == decoder);
-
-    if (gst_vaapidecode_update_src_caps(decode, codec_state)) {
-        if (!gst_video_decoder_negotiate(vdec))
-            return;
-        if (!gst_vaapi_plugin_base_set_caps(plugin, NULL, decode->srcpad_caps))
-            return;
-   }
+  if (decode->input_state) {
+    if (new_state) {
+      const GstCaps *curcaps = decode->input_state->caps;
+      if (gst_caps_is_always_compatible (curcaps, new_state->caps))
+        return FALSE;
+    }
+    gst_video_codec_state_unref (decode->input_state);
+  }
+
+  if (new_state)
+    decode->input_state = gst_video_codec_state_ref
+        ((GstVideoCodecState *) new_state);
+  else
+    decode->input_state = NULL;
+
+  return TRUE;
 }
 
 static inline gboolean
-gst_vaapidecode_update_sink_caps(GstVaapiDecode *decode, GstCaps *caps)
+gst_vaapidecode_update_sink_caps (GstVaapiDecode * decode, GstCaps * caps)
 {
-    gst_caps_replace(&decode->sinkpad_caps, caps);
-    return TRUE;
+  GST_INFO_OBJECT (decode, "new sink caps = %" GST_PTR_FORMAT, caps);
+  gst_caps_replace (&decode->sinkpad_caps, caps);
+  return TRUE;
 }
 
 static gboolean
-gst_vaapidecode_update_src_caps(GstVaapiDecode *decode,
-    const GstVideoCodecState *ref_state)
+gst_vaapidecode_update_src_caps (GstVaapiDecode * decode)
 {
-    GstVideoDecoder * const vdec = GST_VIDEO_DECODER(decode);
-    GstVideoCodecState *state;
-    GstVideoInfo *vi, vis;
-    GstVideoFormat format, out_format;
-#if GST_CHECK_VERSION(1,1,0)
-    GstCapsFeatures *features = NULL;
-    GstVaapiCapsFeature feature;
-
-    feature = gst_vaapi_find_preferred_caps_feature(
-        GST_VIDEO_DECODER_SRC_PAD(vdec),
-        GST_VIDEO_INFO_FORMAT(&ref_state->info));
-#endif
-
-    format = GST_VIDEO_INFO_FORMAT(&ref_state->info);
-
-    state = gst_video_decoder_set_output_state(vdec, format,
-        ref_state->info.width, ref_state->info.height,
-        (GstVideoCodecState *)ref_state);
-    if (!state || state->info.width == 0 || state->info.height == 0)
-        return FALSE;
+  GstVideoDecoder *const vdec = GST_VIDEO_DECODER (decode);
+  GstVideoCodecState *state, *ref_state;
+  GstVideoInfo *vi;
+  GstVideoFormat format = GST_VIDEO_FORMAT_I420;
+
+  if (!decode->input_state)
+    return FALSE;
+
+  ref_state = decode->input_state;
+
+  GstCapsFeatures *features = NULL;
+  GstVaapiCapsFeature feature;
 
-    vi = &state->info;
-    out_format = format;
-    if (format == GST_VIDEO_FORMAT_ENCODED) {
-        out_format = GST_VIDEO_FORMAT_I420;
-        gst_video_info_init(&vis);
-        gst_video_info_set_format(&vis, out_format,
-            GST_VIDEO_INFO_WIDTH(vi), GST_VIDEO_INFO_HEIGHT(vi));
-        vi->size = vis.size;
-    }
-    gst_video_codec_state_unref(state);
-
-#if GST_CHECK_VERSION(1,1,0)
-    vis = *vi;
-    switch (feature) {
+  feature =
+      gst_vaapi_find_preferred_caps_feature (GST_VIDEO_DECODER_SRC_PAD (vdec),
+      GST_VIDEO_INFO_FORMAT (&ref_state->info), &format);
+
+  if (feature == GST_VAAPI_CAPS_FEATURE_NOT_NEGOTIATED)
+    return FALSE;
+
+  switch (feature) {
+#if (USE_GLX || USE_EGL)
     case GST_VAAPI_CAPS_FEATURE_GL_TEXTURE_UPLOAD_META:
-        gst_video_info_change_format(&vis, GST_VIDEO_FORMAT_RGBA,
-            GST_VIDEO_INFO_WIDTH(vi), GST_VIDEO_INFO_HEIGHT(vi));
-        features = gst_caps_features_new(
-            GST_CAPS_FEATURE_META_GST_VIDEO_GL_TEXTURE_UPLOAD_META, NULL);
-        break;
-    default:
-        if (format == GST_VIDEO_FORMAT_ENCODED) {
-            /* XXX: this is a workaround until auto-plugging is fixed when
-               format=ENCODED + memory:VASurface caps feature are provided.
-               Meanwhile, providing a random format here works but this is
-               a terribly wrong thing per se. */
-            gst_video_info_change_format(&vis, out_format,
-                GST_VIDEO_INFO_WIDTH(vi), GST_VIDEO_INFO_HEIGHT(vi));
+      if (decode->has_texture_upload_meta)
+        features =
+            gst_caps_features_new
+            (GST_CAPS_FEATURE_META_GST_VIDEO_GL_TEXTURE_UPLOAD_META, NULL);
+      else
+        format = GST_VIDEO_FORMAT_I420;
+      break;
+#endif
 #if GST_CHECK_VERSION(1,5,0)
-            if (feature == GST_VAAPI_CAPS_FEATURE_VAAPI_SURFACE)
-                features = gst_caps_features_new(
-                    GST_CAPS_FEATURE_MEMORY_VAAPI_SURFACE, NULL);
+    case GST_VAAPI_CAPS_FEATURE_VAAPI_SURFACE:
+      features =
+          gst_caps_features_new (GST_CAPS_FEATURE_MEMORY_VAAPI_SURFACE, NULL);
+      break;
 #endif
-        }
-        break;
-    }
-    state->caps = gst_video_info_to_caps(&vis);
-    if (features)
-        gst_caps_set_features(state->caps, 0, features);
-#else
-    /* XXX: gst_video_info_to_caps() from GStreamer 0.10 does not
-       reconstruct suitable caps for "encoded" video formats */
-    state->caps = gst_caps_from_string(GST_VAAPI_SURFACE_CAPS_NAME);
-    if (!state->caps)
-        return FALSE;
+    default:
+      break;
+  }
 
-    gst_caps_set_simple(state->caps,
-        "type", G_TYPE_STRING, "vaapi",
-        "opengl", G_TYPE_BOOLEAN, USE_GLX,
-        "width", G_TYPE_INT, vi->width,
-        "height", G_TYPE_INT, vi->height,
-        "framerate", GST_TYPE_FRACTION, vi->fps_n, vi->fps_d,
-        "pixel-aspect-ratio", GST_TYPE_FRACTION, vi->par_n, vi->par_d,
-        NULL);
+  state = gst_video_decoder_set_output_state (vdec, format,
+      ref_state->info.width, ref_state->info.height, ref_state);
+  if (!state || state->info.width == 0 || state->info.height == 0)
+    return FALSE;
+
+  vi = &state->info;
+
+  state->caps = gst_video_info_to_caps (vi);
+  if (features)
+    gst_caps_set_features (state->caps, 0, features);
+  GST_INFO_OBJECT (decode, "new src caps = %" GST_PTR_FORMAT, state->caps);
+  gst_caps_replace (&decode->srcpad_caps, state->caps);
+  gst_video_codec_state_unref (state);
+
+  gint fps_n = GST_VIDEO_INFO_FPS_N (vi);
+  gint fps_d = GST_VIDEO_INFO_FPS_D (vi);
+  if (fps_n <= 0 || fps_d <= 0) {
+    GST_DEBUG_OBJECT (decode, "forcing 25/1 framerate for latency calculation");
+    fps_n = 1;
+    fps_d = 25;
+  }
+
+  /* For parsing/preparation purposes we'd need at least 1 frame
+   * latency in general, with perfectly known unit boundaries (NALU,
+   * AU), and up to 2 frames when we need to wait for the second frame
+   * start to determine the first frame is complete */
+  GstClockTime latency = gst_util_uint64_scale (2 * GST_SECOND, fps_d, fps_n);
+  gst_video_decoder_set_latency (vdec, latency, latency);
 
-    gst_caps_set_interlaced(state->caps, vi);
-#endif
-    gst_caps_replace(&decode->srcpad_caps, state->caps);
-    return TRUE;
+  return TRUE;
 }
 
 static void
-gst_vaapidecode_release(GstVaapiDecode *decode)
-{
-    g_mutex_lock(&decode->decoder_mutex);
-    g_cond_signal(&decode->decoder_ready);
-    g_mutex_unlock(&decode->decoder_mutex);
-}
-
-static GstFlowReturn
-gst_vaapidecode_decode_frame(GstVideoDecoder *vdec, GstVideoCodecFrame *frame)
+gst_vaapidecode_release (GstVaapiDecode * decode)
 {
-    GstVaapiDecode * const decode = GST_VAAPIDECODE(vdec);
-    GstVaapiDecoderStatus status;
-    GstFlowReturn ret;
-
-    /* Decode current frame */
-    for (;;) {
-        status = gst_vaapi_decoder_decode(decode->decoder, frame);
-        if (status == GST_VAAPI_DECODER_STATUS_ERROR_NO_SURFACE) {
-            GST_VIDEO_DECODER_STREAM_UNLOCK(vdec);
-            g_mutex_lock(&decode->decoder_mutex);
-            g_cond_wait(&decode->decoder_ready, &decode->decoder_mutex);
-            g_mutex_unlock(&decode->decoder_mutex);
-            GST_VIDEO_DECODER_STREAM_LOCK(vdec);
-            if (decode->decoder_loop_status < 0)
-                goto error_decode_loop;
-            continue;
-        }
-        if (status != GST_VAAPI_DECODER_STATUS_SUCCESS)
-            goto error_decode;
-        break;
-    }
-
-    /* Try to report back early any error that occured in the decode task */
-    GST_VIDEO_DECODER_STREAM_UNLOCK(vdec);
-    GST_VIDEO_DECODER_STREAM_LOCK(vdec);
-    return decode->decoder_loop_status;
-
-    /* ERRORS */
-error_decode_loop:
-    {
-        if (decode->decoder_loop_status != GST_FLOW_FLUSHING)
-            GST_ERROR("decode loop error %d", decode->decoder_loop_status);
-        gst_video_decoder_drop_frame(vdec, frame);
-        return decode->decoder_loop_status;
-    }
-error_decode:
-    {
-        GST_ERROR("decode error %d", status);
-        switch (status) {
-        case GST_VAAPI_DECODER_STATUS_ERROR_UNSUPPORTED_CODEC:
-        case GST_VAAPI_DECODER_STATUS_ERROR_UNSUPPORTED_PROFILE:
-        case GST_VAAPI_DECODER_STATUS_ERROR_UNSUPPORTED_CHROMA_FORMAT:
-            ret = GST_FLOW_NOT_SUPPORTED;
-            break;
-        default:
-            ret = GST_FLOW_ERROR;
-            break;
-        }
-        gst_video_decoder_drop_frame(vdec, frame);
-        return ret;
-    }
+  g_mutex_lock (&decode->surface_ready_mutex);
+  g_cond_signal (&decode->surface_ready);
+  g_mutex_unlock (&decode->surface_ready_mutex);
+  gst_object_unref (decode);
 }
 
 static GstFlowReturn
-gst_vaapidecode_push_decoded_frame(GstVideoDecoder *vdec,
-    GstVideoCodecFrame *out_frame)
+gst_vaapidecode_push_decoded_frame (GstVideoDecoder * vdec,
+    GstVideoCodecFrame * out_frame)
 {
-    GstVaapiDecode * const decode = GST_VAAPIDECODE(vdec);
-    GstVaapiSurfaceProxy *proxy;
-    GstFlowReturn ret;
-#if GST_CHECK_VERSION(1,0,0)
-    const GstVaapiRectangle *crop_rect;
-    GstVaapiVideoMeta *meta;
-    guint flags;
-#endif
-
-    if (!GST_VIDEO_CODEC_FRAME_IS_DECODE_ONLY(out_frame)) {
-        proxy = gst_video_codec_frame_get_user_data(out_frame);
+  GstVaapiDecode *const decode = GST_VAAPIDECODE (vdec);
+  GstVaapiSurfaceProxy *proxy;
+  GstFlowReturn ret;
+  const GstVaapiRectangle *crop_rect;
+  GstVaapiVideoMeta *meta;
+  guint flags;
 
-        gst_vaapi_surface_proxy_set_destroy_notify(proxy,
-            (GDestroyNotify)gst_vaapidecode_release, decode);
+  if (!GST_VIDEO_CODEC_FRAME_IS_DECODE_ONLY (out_frame)) {
+    proxy = gst_video_codec_frame_get_user_data (out_frame);
 
-#if GST_CHECK_VERSION(1,0,0)
-        ret = gst_video_decoder_allocate_output_frame(vdec, out_frame);
-        if (ret != GST_FLOW_OK)
-            goto error_create_buffer;
-
-        meta = gst_buffer_get_vaapi_video_meta(out_frame->output_buffer);
-        if (!meta)
-            goto error_get_meta;
-        gst_vaapi_video_meta_set_surface_proxy(meta, proxy);
-
-        flags = gst_vaapi_surface_proxy_get_flags(proxy);
-        if (flags & GST_VAAPI_SURFACE_PROXY_FLAG_INTERLACED) {
-            guint out_flags = GST_VIDEO_BUFFER_FLAG_INTERLACED;
-            if (flags & GST_VAAPI_SURFACE_PROXY_FLAG_TFF)
-                out_flags |= GST_VIDEO_BUFFER_FLAG_TFF;
-            if (flags & GST_VAAPI_SURFACE_PROXY_FLAG_RFF)
-                out_flags |= GST_VIDEO_BUFFER_FLAG_RFF;
-            if (flags & GST_VAAPI_SURFACE_PROXY_FLAG_ONEFIELD)
-                out_flags |= GST_VIDEO_BUFFER_FLAG_ONEFIELD;
-            GST_BUFFER_FLAG_SET(out_frame->output_buffer, out_flags);
-        }
+    gst_vaapi_surface_proxy_set_destroy_notify (proxy,
+        (GDestroyNotify) gst_vaapidecode_release, gst_object_ref (decode));
 
-        crop_rect = gst_vaapi_surface_proxy_get_crop_rect(proxy);
-        if (crop_rect) {
-            GstVideoCropMeta * const crop_meta =
-                gst_buffer_add_video_crop_meta(out_frame->output_buffer);
-            if (crop_meta) {
-                crop_meta->x = crop_rect->x;
-                crop_meta->y = crop_rect->y;
-                crop_meta->width = crop_rect->width;
-                crop_meta->height = crop_rect->height;
-            }
-        }
+    ret = gst_video_decoder_allocate_output_frame (vdec, out_frame);
+    if (ret != GST_FLOW_OK)
+      goto error_create_buffer;
 
-#if GST_CHECK_VERSION(1,1,0) && USE_GLX
-        if (decode->has_texture_upload_meta)
-            gst_buffer_ensure_texture_upload_meta(out_frame->output_buffer);
-#endif
-#else
-        out_frame->output_buffer =
-            gst_vaapi_video_buffer_new_with_surface_proxy(proxy);
-        if (!out_frame->output_buffer)
-            goto error_create_buffer;
+    meta = gst_buffer_get_vaapi_video_meta (out_frame->output_buffer);
+    if (!meta)
+      goto error_get_meta;
+    gst_vaapi_video_meta_set_surface_proxy (meta, proxy);
+
+    flags = gst_vaapi_surface_proxy_get_flags (proxy);
+    if (flags & GST_VAAPI_SURFACE_PROXY_FLAG_INTERLACED) {
+      guint out_flags = GST_VIDEO_BUFFER_FLAG_INTERLACED;
+      if (flags & GST_VAAPI_SURFACE_PROXY_FLAG_TFF)
+        out_flags |= GST_VIDEO_BUFFER_FLAG_TFF;
+      if (flags & GST_VAAPI_SURFACE_PROXY_FLAG_RFF)
+        out_flags |= GST_VIDEO_BUFFER_FLAG_RFF;
+      if (flags & GST_VAAPI_SURFACE_PROXY_FLAG_ONEFIELD)
+        out_flags |= GST_VIDEO_BUFFER_FLAG_ONEFIELD;
+      GST_BUFFER_FLAG_SET (out_frame->output_buffer, out_flags);
+    }
+
+    crop_rect = gst_vaapi_surface_proxy_get_crop_rect (proxy);
+    if (crop_rect) {
+      GstVideoCropMeta *const crop_meta =
+          gst_buffer_add_video_crop_meta (out_frame->output_buffer);
+      if (crop_meta) {
+        crop_meta->x = crop_rect->x;
+        crop_meta->y = crop_rect->y;
+        crop_meta->width = crop_rect->width;
+        crop_meta->height = crop_rect->height;
+      }
+    }
+#if (USE_GLX || USE_EGL)
+    if (decode->has_texture_upload_meta)
+      gst_buffer_ensure_texture_upload_meta (out_frame->output_buffer);
 #endif
-    }
+  }
 
-    ret = gst_video_decoder_finish_frame(vdec, out_frame);
-    if (ret != GST_FLOW_OK)
-        goto error_commit_buffer;
+  ret = gst_video_decoder_finish_frame (vdec, out_frame);
+  if (ret != GST_FLOW_OK)
+    goto error_commit_buffer;
 
-    gst_video_codec_frame_unref(out_frame);
-    return GST_FLOW_OK;
+  gst_video_codec_frame_unref (out_frame);
+  return GST_FLOW_OK;
 
-    /* ERRORS */
+  /* ERRORS */
 error_create_buffer:
-    {
-        const GstVaapiID surface_id =
-            gst_vaapi_surface_get_id(GST_VAAPI_SURFACE_PROXY_SURFACE(proxy));
-
-        GST_ERROR("video sink failed to create video buffer for proxy'ed "
-                  "surface %" GST_VAAPI_ID_FORMAT,
-                  GST_VAAPI_ID_ARGS(surface_id));
-        gst_video_decoder_drop_frame(vdec, out_frame);
-        gst_video_codec_frame_unref(out_frame);
-        return GST_FLOW_ERROR;
-    }
-#if GST_CHECK_VERSION(1,0,0)
+  {
+    const GstVaapiID surface_id =
+        gst_vaapi_surface_get_id (GST_VAAPI_SURFACE_PROXY_SURFACE (proxy));
+
+    GST_ELEMENT_ERROR (vdec, STREAM, FAILED,
+        ("Failed to create sink buffer"),
+        ("video sink failed to create video buffer for proxy'ed "
+            "surface %" GST_VAAPI_ID_FORMAT, GST_VAAPI_ID_ARGS (surface_id)));
+    gst_video_decoder_drop_frame (vdec, out_frame);
+    gst_video_codec_frame_unref (out_frame);
+    return GST_FLOW_ERROR;
+  }
 error_get_meta:
-    {
-        GST_ERROR("failed to get vaapi video meta attached to video buffer");
-        gst_video_decoder_drop_frame(vdec, out_frame);
-        gst_video_codec_frame_unref(out_frame);
-        return GST_FLOW_ERROR;
-    }
-#endif
+  {
+    GST_ELEMENT_ERROR (vdec, STREAM, FAILED,
+        ("Failed to get vaapi video meta attached to video buffer"),
+        ("Failed to get vaapi video meta attached to video buffer"));
+    gst_video_decoder_drop_frame (vdec, out_frame);
+    gst_video_codec_frame_unref (out_frame);
+    return GST_FLOW_ERROR;
+  }
 error_commit_buffer:
-    {
-        if (ret != GST_FLOW_FLUSHING)
-            GST_ERROR("video sink rejected the video buffer (error %d)", ret);
-        gst_video_codec_frame_unref(out_frame);
-        return ret;
-    }
+  {
+    GST_INFO_OBJECT (decode, "downstream element rejected the frame (%s [%d])",
+        gst_flow_get_name (ret), ret);
+    gst_video_codec_frame_unref (out_frame);
+    return ret;
+  }
 }
 
 static GstFlowReturn
-gst_vaapidecode_handle_frame(GstVideoDecoder *vdec, GstVideoCodecFrame *frame)
+gst_vaapidecode_push_all_decoded_frames (GstVaapiDecode * decode)
 {
-    GstFlowReturn ret;
+  GstVideoDecoder *const vdec = GST_VIDEO_DECODER (decode);
+  GstVaapiDecoderStatus status;
+  GstVideoCodecFrame *out_frame;
+  GstFlowReturn ret;
 
-    /* Make sure to release the base class stream lock so that decode
-       loop can call gst_video_decoder_finish_frame() without blocking */
-    GST_VIDEO_DECODER_STREAM_UNLOCK(vdec);
-    ret = gst_vaapidecode_decode_frame(vdec, frame);
-    GST_VIDEO_DECODER_STREAM_LOCK(vdec);
-    return ret;
+  for (;;) {
+    status = gst_vaapi_decoder_get_frame (decode->decoder, &out_frame);
+
+    switch (status) {
+      case GST_VAAPI_DECODER_STATUS_SUCCESS:
+        ret = gst_vaapidecode_push_decoded_frame (vdec, out_frame);
+        if (ret != GST_FLOW_OK)
+          return ret;
+        break;
+      case GST_VAAPI_DECODER_STATUS_ERROR_NO_DATA:
+        return GST_FLOW_OK;
+      default:
+        GST_VIDEO_DECODER_ERROR (vdec, 1, STREAM, DECODE, ("Decoding failed"),
+            ("Unknown decoding error"), ret);
+        return ret;
+    }
+  }
+  g_assert_not_reached ();
 }
 
-static void
-gst_vaapidecode_decode_loop(GstVaapiDecode *decode)
+static GstFlowReturn
+gst_vaapidecode_handle_frame (GstVideoDecoder * vdec,
+    GstVideoCodecFrame * frame)
 {
-    GstVideoDecoder * const vdec = GST_VIDEO_DECODER(decode);
-    GstVaapiDecoderStatus status;
-    GstVideoCodecFrame *out_frame;
-    GstFlowReturn ret;
-
-    status = gst_vaapi_decoder_get_frame_with_timeout(decode->decoder,
-        &out_frame, 100000);
-
-    GST_VIDEO_DECODER_STREAM_LOCK(vdec);
+  GstVaapiDecode *const decode = GST_VAAPIDECODE (vdec);
+  GstVaapiDecoderStatus status;
+  GstFlowReturn ret;
+
+  if (!decode->input_state)
+    goto not_negotiated;
+
+  if (G_UNLIKELY (!decode->active) ||
+      gst_pad_needs_reconfigure (GST_VIDEO_DECODER_SRC_PAD (vdec))) {
+    GST_DEBUG_OBJECT (decode, "activating the decoder");
+    if (!gst_vaapidecode_update_src_caps (decode))
+      goto not_negotiated;
+
+    if (!gst_video_decoder_negotiate (vdec))
+      goto not_negotiated;
+
+    GstVaapiPluginBase *const plugin = GST_VAAPI_PLUGIN_BASE (vdec);
+    if (!gst_vaapi_plugin_base_set_caps (plugin, NULL, decode->srcpad_caps))
+      goto not_negotiated;
+
+    decode->active = TRUE;
+  }
+
+  /* Decode current frame */
+  for (;;) {
+    status = gst_vaapi_decoder_decode (decode->decoder, frame);
+    if (status == GST_VAAPI_DECODER_STATUS_ERROR_NO_SURFACE) {
+      /* Make sure that there are no decoded frames waiting in the
+         output queue. */
+      ret = gst_vaapidecode_push_all_decoded_frames (decode);
+      if (ret != GST_FLOW_OK)
+        goto error_push_all_decoded_frames;
+
+      g_mutex_lock (&decode->surface_ready_mutex);
+      if (gst_vaapi_decoder_check_status (decode->decoder) ==
+          GST_VAAPI_DECODER_STATUS_ERROR_NO_SURFACE)
+        g_cond_wait (&decode->surface_ready, &decode->surface_ready_mutex);
+      g_mutex_unlock (&decode->surface_ready_mutex);
+      continue;
+    }
+    if (status != GST_VAAPI_DECODER_STATUS_SUCCESS)
+      goto error_decode;
+    break;
+  }
+
+  /* Note that gst_vaapi_decoder_decode cannot return success without
+     completing the decode and pushing all decoded frames into the output
+     queue */
+  return gst_vaapidecode_push_all_decoded_frames (decode);
+
+  /* ERRORS */
+error_push_all_decoded_frames:
+  {
+    GST_ERROR ("push loop error while decoding %d", ret);
+    gst_video_decoder_drop_frame (vdec, frame);
+    return ret;
+  }
+error_decode:
+  {
+    GST_ERROR ("decode error %d", status);
     switch (status) {
-    case GST_VAAPI_DECODER_STATUS_SUCCESS:
-        ret = gst_vaapidecode_push_decoded_frame(vdec, out_frame);
+      case GST_VAAPI_DECODER_STATUS_ERROR_UNSUPPORTED_CODEC:
+      case GST_VAAPI_DECODER_STATUS_ERROR_UNSUPPORTED_PROFILE:
+      case GST_VAAPI_DECODER_STATUS_ERROR_UNSUPPORTED_CHROMA_FORMAT:
+        ret = GST_FLOW_NOT_SUPPORTED;
         break;
-    case GST_VAAPI_DECODER_STATUS_ERROR_NO_DATA:
-        ret = GST_VIDEO_DECODER_FLOW_NEED_DATA;
-        break;
-    default:
-        ret = GST_FLOW_ERROR;
+      default:
+        GST_VIDEO_DECODER_ERROR (vdec, 1, STREAM, DECODE, ("Decoding error"),
+            ("Decode error %d", status), ret);
         break;
     }
-    decode->decoder_loop_status = ret;
-    GST_VIDEO_DECODER_STREAM_UNLOCK(vdec);
+    gst_video_decoder_drop_frame (vdec, frame);
+    return ret;
+  }
+not_negotiated:
+  {
+    GST_ERROR_OBJECT (decode, "not negotiated");
+    ret = GST_FLOW_NOT_NEGOTIATED;
+    gst_video_decoder_drop_frame (vdec, frame);
+    return ret;
+  }
+}
 
-    /* If invoked from gst_vaapidecode_finish(), then return right
-       away no matter the errors, or the GstVaapiDecoder needs further
-       data to complete decoding (there no more data to feed in) */
-    if (decode->decoder_finish) {
-        g_mutex_lock(&decode->decoder_mutex);
-        g_cond_signal(&decode->decoder_finish_done);
-        g_mutex_unlock(&decode->decoder_mutex);
-        return;
-    }
+#if GST_CHECK_VERSION(1,5,0)
+static GstFlowReturn
+gst_vaapidecode_drain (GstVideoDecoder * vdec)
+{
+  GstVaapiDecode *const decode = GST_VAAPIDECODE (vdec);
 
-    if (ret == GST_FLOW_OK)
-        return;
+  if (!decode->decoder)
+    return GST_FLOW_NOT_NEGOTIATED;
 
-    /* Suspend the task if an error occurred */
-    if (ret != GST_VIDEO_DECODER_FLOW_NEED_DATA)
-        gst_pad_pause_task(GST_VAAPI_PLUGIN_BASE_SRC_PAD(decode));
+  return gst_vaapidecode_push_all_decoded_frames (decode);
 }
+#endif
 
 static gboolean
-gst_vaapidecode_flush(GstVideoDecoder *vdec)
+gst_vaapidecode_internal_flush (GstVideoDecoder * vdec)
 {
-    GstVaapiDecode * const decode = GST_VAAPIDECODE(vdec);
-    GstVaapiDecoderStatus status;
+  GstVaapiDecode *const decode = GST_VAAPIDECODE (vdec);
+  GstVaapiDecoderStatus status;
 
-    if (!decode->decoder)
-      return TRUE;
+  if (!decode->decoder)
+    return TRUE;
 
-    /* If there is something in GstVideoDecoder's output adapter, then
-       submit the frame for decoding */
-    if (decode->current_frame_size) {
-        gst_video_decoder_have_frame(vdec);
-        decode->current_frame_size = 0;
-    }
+  /* If there is something in GstVideoDecoder's output adapter, then
+     submit the frame for decoding */
+  if (decode->current_frame_size) {
+    gst_video_decoder_have_frame (vdec);
+    decode->current_frame_size = 0;
+  }
 
-    status = gst_vaapi_decoder_flush(decode->decoder);
-    if (status != GST_VAAPI_DECODER_STATUS_SUCCESS)
-        goto error_flush;
-    return TRUE;
+  status = gst_vaapi_decoder_flush (decode->decoder);
+  if (status != GST_VAAPI_DECODER_STATUS_SUCCESS) {
+    GST_WARNING_OBJECT (decode, "failed to flush decoder (status %d)", status);
+    return FALSE;
+  }
 
-    /* ERRORS */
-error_flush:
-    {
-        GST_ERROR("failed to flush decoder (status %d)", status);
-        return FALSE;
-    }
+  return TRUE;
 }
 
 static GstFlowReturn
-gst_vaapidecode_finish(GstVideoDecoder *vdec)
+gst_vaapidecode_finish (GstVideoDecoder * vdec)
 {
-    GstVaapiDecode * const decode = GST_VAAPIDECODE(vdec);
-    GstFlowReturn ret = GST_FLOW_OK;
+  GstVaapiDecode *const decode = GST_VAAPIDECODE (vdec);
+  gboolean flushed;
+  GstFlowReturn ret;
 
-    if (!decode->decoder)
-      return GST_FLOW_OK;
+  if (!decode->decoder)
+    return GST_FLOW_OK;
 
-    if (!gst_vaapidecode_flush(vdec))
-        ret = GST_FLOW_OK;
-
-    /* Make sure the decode loop function has a chance to return, thus
-       possibly unlocking gst_video_decoder_finish_frame() */
-    if (decode->decoder_loop_status == GST_FLOW_OK) {
-        decode->decoder_finish = TRUE;
-        GST_VIDEO_DECODER_STREAM_UNLOCK(vdec);
-        g_mutex_lock(&decode->decoder_mutex);
-        while (decode->decoder_loop_status == GST_FLOW_OK)
-            g_cond_wait(&decode->decoder_finish_done, &decode->decoder_mutex);
-        g_mutex_unlock(&decode->decoder_mutex);
-        gst_pad_stop_task(GST_VAAPI_PLUGIN_BASE_SRC_PAD(decode));
-        GST_VIDEO_DECODER_STREAM_LOCK(vdec);
-        decode->decoder_finish = FALSE;
-        gst_pad_start_task(GST_VAAPI_PLUGIN_BASE_SRC_PAD(decode),
-            (GstTaskFunction)gst_vaapidecode_decode_loop, decode, NULL);
-    }
-    return ret;
+  flushed = gst_vaapidecode_internal_flush (vdec);
+  ret = gst_vaapidecode_push_all_decoded_frames (decode);
+  if (!flushed)
+    return GST_FLOW_ERROR;
+  return ret;
 }
 
-#if GST_CHECK_VERSION(1,0,0)
 static gboolean
-gst_vaapidecode_decide_allocation(GstVideoDecoder *vdec, GstQuery *query)
+gst_vaapidecode_decide_allocation (GstVideoDecoder * vdec, GstQuery * query)
 {
-    GstVaapiDecode * const decode = GST_VAAPIDECODE(vdec);
-    GstCaps *caps = NULL;
-    gboolean need_pool;
-    GstVideoCodecState *state;
-    GstVaapiCapsFeature feature;
-
-    gst_query_parse_allocation(query, &caps, &need_pool);
-
-    decode->has_texture_upload_meta = FALSE;
-#if GST_CHECK_VERSION(1,1,0) && USE_GLX
-    decode->has_texture_upload_meta =
-        gst_vaapi_find_preferred_caps_feature(GST_VIDEO_DECODER_SRC_PAD(vdec),
-            GST_VIDEO_FORMAT_ENCODED) ==
-        GST_VAAPI_CAPS_FEATURE_GL_TEXTURE_UPLOAD_META;
-#endif
-
-    feature = decode->has_texture_upload_meta ?
-        GST_VAAPI_CAPS_FEATURE_GL_TEXTURE_UPLOAD_META :
-        GST_VAAPI_CAPS_FEATURE_VAAPI_SURFACE;
-
-    /* Update src caps if feature is not handled downstream */
-    state = gst_video_decoder_get_output_state(vdec);
-    if (!gst_caps_is_always_compatible(caps, state->caps)) {
-        if (decode->has_texture_upload_meta)
-            gst_video_info_change_format(&state->info, GST_VIDEO_FORMAT_RGBA,
-                GST_VIDEO_INFO_WIDTH(&state->info),
-                GST_VIDEO_INFO_HEIGHT(&state->info));
-        gst_vaapidecode_update_src_caps(decode, state);
-    }
-    gst_video_codec_state_unref(state);
+  GstVaapiDecode *const decode = GST_VAAPIDECODE (vdec);
+  GstCaps *caps = NULL;
+  GstVideoCodecState *state;
+  GstVaapiCapsFeature feature;
+  GstVideoFormat out_format;
+
+  gst_query_parse_allocation (query, &caps, NULL);
+
+  feature =
+      gst_vaapi_find_preferred_caps_feature (GST_VIDEO_DECODER_SRC_PAD (vdec),
+      GST_VIDEO_FORMAT_ENCODED, &out_format);
+  decode->has_texture_upload_meta = FALSE;
+#if (USE_GLX || USE_EGL)
+  decode->has_texture_upload_meta =
+      (feature == GST_VAAPI_CAPS_FEATURE_GL_TEXTURE_UPLOAD_META) &&
+      gst_query_find_allocation_meta (query,
+      GST_VIDEO_GL_TEXTURE_UPLOAD_META_API_TYPE, NULL);
+#endif
 
-    return gst_vaapi_plugin_base_decide_allocation(GST_VAAPI_PLUGIN_BASE(vdec),
-        query, feature);
+  /* Update src caps if feature is not handled downstream */
+  state = gst_video_decoder_get_output_state (vdec);
+  if (!gst_caps_is_always_compatible (caps, state->caps))
+    gst_vaapidecode_update_src_caps (decode);
+  gst_video_codec_state_unref (state);
+
+  return gst_vaapi_plugin_base_decide_allocation (GST_VAAPI_PLUGIN_BASE (vdec),
+      query, feature);
 }
-#endif
 
 static inline gboolean
-gst_vaapidecode_ensure_display(GstVaapiDecode *decode)
+gst_vaapidecode_ensure_display (GstVaapiDecode * decode)
 {
-    return gst_vaapi_plugin_base_ensure_display(GST_VAAPI_PLUGIN_BASE(decode));
+  return gst_vaapi_plugin_base_ensure_display (GST_VAAPI_PLUGIN_BASE (decode));
 }
 
 static inline guint
-gst_vaapi_codec_from_caps(GstCaps *caps)
+gst_vaapi_codec_from_caps (GstCaps * caps)
 {
-    return gst_vaapi_profile_get_codec(gst_vaapi_profile_from_caps(caps));
+  return gst_vaapi_profile_get_codec (gst_vaapi_profile_from_caps (caps));
 }
 
 static gboolean
-gst_vaapidecode_create(GstVaapiDecode *decode, GstCaps *caps)
+gst_vaapidecode_create (GstVaapiDecode * decode, GstCaps * caps)
 {
-    GstVaapiDisplay *dpy;
+  GstVaapiDisplay *dpy;
 
-    if (!gst_vaapidecode_ensure_display(decode))
-        return FALSE;
-    dpy = GST_VAAPI_PLUGIN_BASE_DISPLAY(decode);
+  if (!gst_vaapidecode_ensure_display (decode))
+    return FALSE;
+  dpy = GST_VAAPI_PLUGIN_BASE_DISPLAY (decode);
 
-    switch (gst_vaapi_codec_from_caps(caps)) {
+  switch (gst_vaapi_codec_from_caps (caps)) {
     case GST_VAAPI_CODEC_MPEG2:
-        decode->decoder = gst_vaapi_decoder_mpeg2_new(dpy, caps);
-        break;
+      decode->decoder = gst_vaapi_decoder_mpeg2_new (dpy, caps);
+      break;
     case GST_VAAPI_CODEC_MPEG4:
     case GST_VAAPI_CODEC_H263:
-        decode->decoder = gst_vaapi_decoder_mpeg4_new(dpy, caps);
-        break;
+      decode->decoder = gst_vaapi_decoder_mpeg4_new (dpy, caps);
+      break;
     case GST_VAAPI_CODEC_H264:
-        decode->decoder = gst_vaapi_decoder_h264_new(dpy, caps);
+      decode->decoder = gst_vaapi_decoder_h264_new (dpy, caps);
 
-        /* Set the stream buffer alignment for better optimizations */
-        if (decode->decoder && caps) {
-            GstStructure * const structure = gst_caps_get_structure(caps, 0);
-            const gchar *str = NULL;
-
-            if ((str = gst_structure_get_string(structure, "alignment"))) {
-                GstVaapiStreamAlignH264 alignment;
-                if (g_strcmp0(str, "au") == 0)
-                    alignment = GST_VAAPI_STREAM_ALIGN_H264_AU;
-                else if (g_strcmp0(str, "nal") == 0)
-                    alignment = GST_VAAPI_STREAM_ALIGN_H264_NALU;
-                else
-                    alignment = GST_VAAPI_STREAM_ALIGN_H264_NONE;
-                gst_vaapi_decoder_h264_set_alignment(
-                    GST_VAAPI_DECODER_H264(decode->decoder), alignment);
-            }
+      /* Set the stream buffer alignment for better optimizations */
+      if (decode->decoder && caps) {
+        GstStructure *const structure = gst_caps_get_structure (caps, 0);
+        const gchar *str = NULL;
+
+        if ((str = gst_structure_get_string (structure, "alignment"))) {
+          GstVaapiStreamAlignH264 alignment;
+          if (g_strcmp0 (str, "au") == 0)
+            alignment = GST_VAAPI_STREAM_ALIGN_H264_AU;
+          else if (g_strcmp0 (str, "nal") == 0)
+            alignment = GST_VAAPI_STREAM_ALIGN_H264_NALU;
+          else
+            alignment = GST_VAAPI_STREAM_ALIGN_H264_NONE;
+          gst_vaapi_decoder_h264_set_alignment (GST_VAAPI_DECODER_H264
+              (decode->decoder), alignment);
         }
-        break;
+      }
+      break;
+#if USE_HEVC_DECODER
+    case GST_VAAPI_CODEC_H265:
+      decode->decoder = gst_vaapi_decoder_h265_new (dpy, caps);
+
+      /* Set the stream buffer alignment for better optimizations */
+      if (decode->decoder && caps) {
+        GstStructure *const structure = gst_caps_get_structure (caps, 0);
+        const gchar *str = NULL;
+
+        if ((str = gst_structure_get_string (structure, "alignment"))) {
+          GstVaapiStreamAlignH265 alignment;
+          if (g_strcmp0 (str, "au") == 0)
+            alignment = GST_VAAPI_STREAM_ALIGN_H265_AU;
+          else if (g_strcmp0 (str, "nal") == 0)
+            alignment = GST_VAAPI_STREAM_ALIGN_H265_NALU;
+          else
+            alignment = GST_VAAPI_STREAM_ALIGN_H265_NONE;
+          gst_vaapi_decoder_h265_set_alignment (GST_VAAPI_DECODER_H265
+              (decode->decoder), alignment);
+        }
+      }
+      break;
+#endif
     case GST_VAAPI_CODEC_WMV3:
     case GST_VAAPI_CODEC_VC1:
-        decode->decoder = gst_vaapi_decoder_vc1_new(dpy, caps);
-        break;
+      decode->decoder = gst_vaapi_decoder_vc1_new (dpy, caps);
+      break;
 #if USE_JPEG_DECODER
     case GST_VAAPI_CODEC_JPEG:
-        decode->decoder = gst_vaapi_decoder_jpeg_new(dpy, caps);
-        break;
+      decode->decoder = gst_vaapi_decoder_jpeg_new (dpy, caps);
+      break;
 #endif
 #if USE_VP8_DECODER
     case GST_VAAPI_CODEC_VP8:
-        decode->decoder = gst_vaapi_decoder_vp8_new(dpy, caps);
-        break;
+      decode->decoder = gst_vaapi_decoder_vp8_new (dpy, caps);
+      break;
 #endif
     default:
-        decode->decoder = NULL;
-        break;
-    }
-    if (!decode->decoder)
-        return FALSE;
+      decode->decoder = NULL;
+      break;
+  }
+  if (!decode->decoder)
+    return FALSE;
 
-    gst_vaapi_decoder_set_codec_state_changed_func(decode->decoder,
-        gst_vaapi_decoder_state_changed, decode);
+  gst_vaapi_decoder_set_codec_state_changed_func (decode->decoder,
+      gst_vaapi_decoder_state_changed, decode);
 
-    decode->decoder_caps = gst_caps_ref(caps);
-    return gst_pad_start_task(GST_VAAPI_PLUGIN_BASE_SRC_PAD(decode),
-        (GstTaskFunction)gst_vaapidecode_decode_loop, decode, NULL);
+  decode->decoder_caps = gst_caps_ref (caps);
+  return TRUE;
 }
 
 static void
-gst_vaapidecode_destroy(GstVaapiDecode *decode)
+gst_vaapidecode_purge (GstVaapiDecode * decode)
 {
-    gst_pad_stop_task(GST_VAAPI_PLUGIN_BASE_SRC_PAD(decode));
-    gst_vaapi_decoder_replace(&decode->decoder, NULL);
-    gst_caps_replace(&decode->decoder_caps, NULL);
-    gst_vaapidecode_release(decode);
+  GstVaapiDecoderStatus status;
+
+  if (!decode->decoder)
+    return;
+
+  status = gst_vaapi_decoder_flush (decode->decoder);
+  if (status != GST_VAAPI_DECODER_STATUS_SUCCESS)
+    GST_INFO_OBJECT (decode, "failed to flush decoder (status %d)", status);
+
+  /* Purge all decoded frames as we don't need them (e.g. flush and close)
+   * Releasing the frames is important, otherwise the frames are not
+   * freed. */
+  do {
+    GstVideoCodecFrame *frame = NULL;
+
+    status =
+        gst_vaapi_decoder_get_frame_with_timeout (decode->decoder, &frame, 0);
+    if (frame) {
+      gst_video_decoder_release_frame (GST_VIDEO_DECODER (decode), frame);
+      gst_video_codec_frame_unref (frame);
+    }
+  } while (status == GST_VAAPI_DECODER_STATUS_SUCCESS);
 }
 
-static gboolean
-gst_vaapidecode_reset_full(GstVaapiDecode *decode, GstCaps *caps, gboolean hard)
+static void
+gst_vaapidecode_destroy (GstVaapiDecode * decode)
 {
-    GstVaapiCodec codec;
+  gst_vaapidecode_purge (decode);
 
-    decode->has_texture_upload_meta = FALSE;
+  gst_vaapi_decoder_replace (&decode->decoder, NULL);
+  gst_caps_replace (&decode->decoder_caps, NULL);
 
-    /* Reset tracked frame size */
-    decode->current_frame_size = 0;
+  decode->active = FALSE;
 
-    /* Reset timers if hard reset was requested (e.g. seek) */
-    if (hard) {
-        GstVideoDecoder * const vdec = GST_VIDEO_DECODER(decode);
-        GstVideoCodecFrame *out_frame = NULL;
-
-        gst_vaapi_decoder_flush(decode->decoder);
-        GST_VIDEO_DECODER_STREAM_UNLOCK(vdec);
-        gst_pad_stop_task(GST_VAAPI_PLUGIN_BASE_SRC_PAD(decode));
-        GST_VIDEO_DECODER_STREAM_LOCK(vdec);
-        decode->decoder_loop_status = GST_FLOW_OK;
-
-        /* Purge all decoded frames as we don't need them (e.g. seek) */
-        while (gst_vaapi_decoder_get_frame_with_timeout(decode->decoder,
-                   &out_frame, 0) == GST_VAAPI_DECODER_STATUS_SUCCESS) {
-            gst_video_codec_frame_unref(out_frame);
-            out_frame = NULL;
-        }
-    }
+  gst_vaapidecode_release (gst_object_ref (decode));
+}
 
-    /* Only reset decoder if codec type changed */
-    else if (decode->decoder && decode->decoder_caps) {
-        if (gst_caps_is_always_compatible(caps, decode->decoder_caps))
-            return TRUE;
-        codec = gst_vaapi_codec_from_caps(caps);
-        if (codec == gst_vaapi_decoder_get_codec(decode->decoder))
-            return TRUE;
-    }
+static gboolean
+gst_vaapidecode_reset_full (GstVaapiDecode * decode, GstCaps * caps,
+    gboolean hard)
+{
+  GstVaapiCodec codec;
+
+  decode->has_texture_upload_meta = FALSE;
+
+  /* Reset tracked frame size */
+  decode->current_frame_size = 0;
 
-    gst_vaapidecode_destroy(decode);
-    return gst_vaapidecode_create(decode, caps);
+  if (!hard && decode->decoder && decode->decoder_caps) {
+    if (gst_caps_is_always_compatible (caps, decode->decoder_caps))
+      return TRUE;
+    codec = gst_vaapi_codec_from_caps (caps);
+    if (codec == gst_vaapi_decoder_get_codec (decode->decoder))
+      return TRUE;
+  }
+
+  gst_vaapidecode_destroy (decode);
+  return gst_vaapidecode_create (decode, caps);
 }
 
 static void
-gst_vaapidecode_finalize(GObject *object)
+gst_vaapidecode_finalize (GObject * object)
 {
-    GstVaapiDecode * const decode = GST_VAAPIDECODE(object);
+  GstVaapiDecode *const decode = GST_VAAPIDECODE (object);
 
-    gst_caps_replace(&decode->sinkpad_caps, NULL);
-    gst_caps_replace(&decode->srcpad_caps,  NULL);
-    gst_caps_replace(&decode->allowed_caps, NULL);
+  gst_caps_replace (&decode->sinkpad_caps, NULL);
+  gst_caps_replace (&decode->srcpad_caps, NULL);
+  gst_caps_replace (&decode->allowed_caps, NULL);
 
-    g_cond_clear(&decode->decoder_finish_done);
-    g_cond_clear(&decode->decoder_ready);
-    g_mutex_clear(&decode->decoder_mutex);
+  g_cond_clear (&decode->surface_ready);
+  g_mutex_clear (&decode->surface_ready_mutex);
 
-    gst_vaapi_plugin_base_finalize(GST_VAAPI_PLUGIN_BASE(object));
-    G_OBJECT_CLASS(gst_vaapidecode_parent_class)->finalize(object);
+  gst_vaapi_plugin_base_finalize (GST_VAAPI_PLUGIN_BASE (object));
+  G_OBJECT_CLASS (gst_vaapidecode_parent_class)->finalize (object);
 }
 
 static gboolean
-gst_vaapidecode_open(GstVideoDecoder *vdec)
+gst_vaapidecode_open (GstVideoDecoder * vdec)
 {
-    GstVaapiDecode * const decode = GST_VAAPIDECODE(vdec);
-    GstVaapiDisplay * const old_display = GST_VAAPI_PLUGIN_BASE_DISPLAY(decode);
-    gboolean success;
-
-    if (!gst_vaapi_plugin_base_open(GST_VAAPI_PLUGIN_BASE(decode)))
-        return FALSE;
-
-    /* Let GstVideoContext ask for a proper display to its neighbours */
-    /* Note: steal old display that may be allocated from get_caps()
-       so that to retain a reference to it, thus avoiding extra
-       initialization steps if we turn out to simply re-use the
-       existing (cached) VA display */
-    GST_VAAPI_PLUGIN_BASE_DISPLAY(decode) = NULL;
-    success = gst_vaapidecode_ensure_display(decode);
-    if (old_display)
-        gst_vaapi_display_unref(old_display);
-    return success;
+  GstVaapiDecode *const decode = GST_VAAPIDECODE (vdec);
+  GstVaapiDisplay *const old_display = GST_VAAPI_PLUGIN_BASE_DISPLAY (decode);
+  gboolean success;
+
+  if (!gst_vaapi_plugin_base_open (GST_VAAPI_PLUGIN_BASE (decode)))
+    return FALSE;
+
+  /* Let GstVideoContext ask for a proper display to its neighbours */
+  /* Note: steal old display that may be allocated from get_caps()
+     so that to retain a reference to it, thus avoiding extra
+     initialization steps if we turn out to simply re-use the
+     existing (cached) VA display */
+  GST_VAAPI_PLUGIN_BASE_DISPLAY (decode) = NULL;
+  success = gst_vaapidecode_ensure_display (decode);
+  if (old_display)
+    gst_vaapi_display_unref (old_display);
+  return success;
 }
 
 static gboolean
-gst_vaapidecode_close(GstVideoDecoder *vdec)
+gst_vaapidecode_close (GstVideoDecoder * vdec)
 {
-    GstVaapiDecode * const decode = GST_VAAPIDECODE(vdec);
+  GstVaapiDecode *const decode = GST_VAAPIDECODE (vdec);
 
-    gst_vaapidecode_destroy(decode);
-    gst_vaapi_plugin_base_close(GST_VAAPI_PLUGIN_BASE(decode));
-    return TRUE;
+  gst_vaapi_decode_input_state_replace (decode, NULL);
+  gst_vaapidecode_destroy (decode);
+  gst_vaapi_plugin_base_close (GST_VAAPI_PLUGIN_BASE (decode));
+  return TRUE;
 }
 
 static gboolean
-gst_vaapidecode_reset(GstVideoDecoder *vdec, gboolean hard)
+gst_vaapidecode_flush (GstVideoDecoder * vdec)
 {
-    GstVaapiDecode * const decode = GST_VAAPIDECODE(vdec);
+  GstVaapiDecode *const decode = GST_VAAPIDECODE (vdec);
 
-    /* In GStreamer 1.0 context, this means a flush */
-    if (decode->decoder && !hard && !gst_vaapidecode_flush(vdec))
-        return FALSE;
-    return gst_vaapidecode_reset_full(decode, decode->sinkpad_caps, hard);
+  if (decode->decoder && !gst_vaapidecode_internal_flush (vdec))
+    return FALSE;
+
+  /* There could be issues if we avoid the reset_full() while doing
+   * seeking: we have to reset the internal state */
+  return gst_vaapidecode_reset_full (decode, decode->sinkpad_caps, TRUE);
 }
 
 static gboolean
-gst_vaapidecode_set_format(GstVideoDecoder *vdec, GstVideoCodecState *state)
+gst_vaapidecode_set_format (GstVideoDecoder * vdec, GstVideoCodecState * state)
 {
-    GstVaapiPluginBase * const plugin = GST_VAAPI_PLUGIN_BASE(vdec);
-    GstVaapiDecode * const decode = GST_VAAPIDECODE(vdec);
+  GstVaapiPluginBase *const plugin = GST_VAAPI_PLUGIN_BASE (vdec);
+  GstVaapiDecode *const decode = GST_VAAPIDECODE (vdec);
 
-    if (!gst_vaapidecode_update_sink_caps(decode, state->caps))
-        return FALSE;
-    if (!gst_vaapi_plugin_base_set_caps(plugin, decode->sinkpad_caps, NULL))
-        return FALSE;
-    if (!gst_vaapidecode_reset_full(decode, decode->sinkpad_caps, FALSE))
-        return FALSE;
-
-    if (gst_vaapidecode_update_src_caps(decode, state)) {
-        if (!gst_video_decoder_negotiate(vdec))
-            return FALSE;
-        if (!gst_vaapi_plugin_base_set_caps(plugin, NULL, decode->srcpad_caps))
-            return FALSE;
-    }
+  if (!gst_vaapi_decode_input_state_replace (decode, state))
     return TRUE;
+  if (!gst_vaapidecode_update_sink_caps (decode, state->caps))
+    return FALSE;
+  if (!gst_vaapi_plugin_base_set_caps (plugin, decode->sinkpad_caps, NULL))
+    return FALSE;
+  if (!gst_vaapidecode_reset_full (decode, decode->sinkpad_caps, FALSE))
+    return FALSE;
+
+  return TRUE;
 }
 
 static GstFlowReturn
-gst_vaapidecode_parse_frame(GstVideoDecoder *vdec,
-    GstVideoCodecFrame *frame, GstAdapter *adapter, gboolean at_eos)
+gst_vaapidecode_parse_frame (GstVideoDecoder * vdec,
+    GstVideoCodecFrame * frame, GstAdapter * adapter, gboolean at_eos)
 {
-    GstVaapiDecode * const decode = GST_VAAPIDECODE(vdec);
-    GstVaapiDecoderStatus status;
-    GstFlowReturn ret;
-    guint got_unit_size;
-    gboolean got_frame;
+  GstVaapiDecode *const decode = GST_VAAPIDECODE (vdec);
+  GstVaapiDecoderStatus status;
+  GstFlowReturn ret;
+  guint got_unit_size;
+  gboolean got_frame;
 
-    status = gst_vaapi_decoder_parse(decode->decoder, frame,
-        adapter, at_eos, &got_unit_size, &got_frame);
+  status = gst_vaapi_decoder_parse (decode->decoder, frame,
+      adapter, at_eos, &got_unit_size, &got_frame);
 
-    switch (status) {
+  switch (status) {
     case GST_VAAPI_DECODER_STATUS_SUCCESS:
-        if (got_unit_size > 0) {
-            gst_video_decoder_add_to_frame(vdec, got_unit_size);
-            decode->current_frame_size += got_unit_size;
-        }
-        if (got_frame) {
-            ret = gst_video_decoder_have_frame(vdec);
-            decode->current_frame_size = 0;
-        }
-        else
-            ret = GST_VAAPI_DECODE_FLOW_PARSE_DATA;
-        break;
+      if (got_unit_size > 0) {
+        gst_video_decoder_add_to_frame (vdec, got_unit_size);
+        decode->current_frame_size += got_unit_size;
+      }
+      if (got_frame) {
+        ret = gst_video_decoder_have_frame (vdec);
+        decode->current_frame_size = 0;
+      } else
+        ret = GST_VAAPI_DECODE_FLOW_PARSE_DATA;
+      break;
     case GST_VAAPI_DECODER_STATUS_ERROR_NO_DATA:
-        ret = GST_VIDEO_DECODER_FLOW_NEED_DATA;
-        break;
+      ret = GST_VIDEO_DECODER_FLOW_NEED_DATA;
+      break;
     case GST_VAAPI_DECODER_STATUS_ERROR_UNSUPPORTED_CODEC:
     case GST_VAAPI_DECODER_STATUS_ERROR_UNSUPPORTED_PROFILE:
     case GST_VAAPI_DECODER_STATUS_ERROR_UNSUPPORTED_CHROMA_FORMAT:
-        GST_WARNING("parse error %d", status);
-        ret = GST_FLOW_NOT_SUPPORTED;
-        decode->current_frame_size = 0;
-        break;
+      GST_WARNING ("parse error %d", status);
+      ret = GST_FLOW_NOT_SUPPORTED;
+      decode->current_frame_size = 0;
+      break;
     default:
-        GST_ERROR("parse error %d", status);
-        ret = GST_FLOW_EOS;
-        decode->current_frame_size = 0;
-        break;
-    }
-    return ret;
+      GST_ERROR ("parse error %d", status);
+      ret = GST_FLOW_EOS;
+      decode->current_frame_size = 0;
+      break;
+  }
+  return ret;
 }
 
 static GstFlowReturn
-gst_vaapidecode_parse(GstVideoDecoder *vdec,
-    GstVideoCodecFrame *frame, GstAdapter *adapter, gboolean at_eos)
+gst_vaapidecode_parse (GstVideoDecoder * vdec,
+    GstVideoCodecFrame * frame, GstAdapter * adapter, gboolean at_eos)
 {
-    GstFlowReturn ret;
+  GstFlowReturn ret;
 
-    do {
-        ret = gst_vaapidecode_parse_frame(vdec, frame, adapter, at_eos);
-    } while (ret == GST_VAAPI_DECODE_FLOW_PARSE_DATA);
-    return ret;
+  do {
+    ret = gst_vaapidecode_parse_frame (vdec, frame, adapter, at_eos);
+  } while (ret == GST_VAAPI_DECODE_FLOW_PARSE_DATA);
+  return ret;
 }
 
-static GstStateChangeReturn
-gst_vaapidecode_change_state (GstElement * element, GstStateChange transition)
+static void
+gst_vaapidecode_class_init (GstVaapiDecodeClass * klass)
 {
-    GstVaapiDecode * const decode = GST_VAAPIDECODE(element);
+  GObjectClass *const object_class = G_OBJECT_CLASS (klass);
+  GstElementClass *const element_class = GST_ELEMENT_CLASS (klass);
+  GstVideoDecoderClass *const vdec_class = GST_VIDEO_DECODER_CLASS (klass);
+  GstPadTemplate *pad_template;
+
+  GST_DEBUG_CATEGORY_INIT (gst_debug_vaapidecode,
+      GST_PLUGIN_NAME, 0, GST_PLUGIN_DESC);
+
+  gst_vaapi_plugin_base_class_init (GST_VAAPI_PLUGIN_BASE_CLASS (klass));
+
+  object_class->finalize = gst_vaapidecode_finalize;
+
+  vdec_class->open = GST_DEBUG_FUNCPTR (gst_vaapidecode_open);
+  vdec_class->close = GST_DEBUG_FUNCPTR (gst_vaapidecode_close);
+  vdec_class->set_format = GST_DEBUG_FUNCPTR (gst_vaapidecode_set_format);
+  vdec_class->flush = GST_DEBUG_FUNCPTR (gst_vaapidecode_flush);
+  vdec_class->parse = GST_DEBUG_FUNCPTR (gst_vaapidecode_parse);
+  vdec_class->handle_frame = GST_DEBUG_FUNCPTR (gst_vaapidecode_handle_frame);
+  vdec_class->finish = GST_DEBUG_FUNCPTR (gst_vaapidecode_finish);
+#if GST_CHECK_VERSION(1,5,0)
+  vdec_class->drain = GST_DEBUG_FUNCPTR (gst_vaapidecode_drain);
+#endif
+  vdec_class->decide_allocation =
+      GST_DEBUG_FUNCPTR (gst_vaapidecode_decide_allocation);
+#if GST_CHECK_VERSION(1,4,0)
+  vdec_class->src_query = GST_DEBUG_FUNCPTR (gst_vaapidecode_src_query);
+  vdec_class->sink_query = GST_DEBUG_FUNCPTR (gst_vaapidecode_sink_query);
+#endif
 
-    switch (transition) {
-    case GST_STATE_CHANGE_PAUSED_TO_READY:
-        g_mutex_lock(&decode->decoder_mutex);
-        decode->decoder_finish = TRUE;
-        g_cond_signal(&decode->decoder_finish_done);
-        g_cond_signal(&decode->decoder_ready);
-        g_mutex_unlock(&decode->decoder_mutex);
-        gst_pad_stop_task(GST_VAAPI_PLUGIN_BASE_SRC_PAD(decode));
-        decode->decoder_finish = FALSE;
-        break;
-    default:
-        break;
-    }
-    return GST_ELEMENT_CLASS(gst_vaapidecode_parent_class)->change_state(
-        element, transition);
+  gst_element_class_set_static_metadata (element_class,
+      "VA-API decoder",
+      "Codec/Decoder/Video",
+      GST_PLUGIN_DESC,
+      "Gwenole Beauchesne <gwenole.beauchesne@intel.com>, "
+      "Halley Zhao <halley.zhao@intel.com>, "
+      "Sreerenj Balachandran <sreerenj.balachandran@intel.com>, "
+      "Wind Yuan <feng.yuan@intel.com>");
+
+  /* sink pad */
+  pad_template = gst_static_pad_template_get (&gst_vaapidecode_sink_factory);
+  gst_element_class_add_pad_template (element_class, pad_template);
+
+  /* src pad */
+  pad_template = gst_static_pad_template_get (&gst_vaapidecode_src_factory);
+  gst_element_class_add_pad_template (element_class, pad_template);
 }
 
-static void
-gst_vaapidecode_class_init(GstVaapiDecodeClass *klass)
+static gboolean
+gst_vaapidecode_ensure_allowed_caps (GstVaapiDecode * decode)
 {
-    GObjectClass * const object_class = G_OBJECT_CLASS(klass);
-    GstElementClass * const element_class = GST_ELEMENT_CLASS(klass);
-    GstVideoDecoderClass * const vdec_class = GST_VIDEO_DECODER_CLASS(klass);
-    GstPadTemplate *pad_template;
-
-    GST_DEBUG_CATEGORY_INIT(gst_debug_vaapidecode,
-                            GST_PLUGIN_NAME, 0, GST_PLUGIN_DESC);
+  GstCaps *caps, *allowed_caps;
+  GArray *profiles;
+  guint i;
 
-    gst_vaapi_plugin_base_class_init(GST_VAAPI_PLUGIN_BASE_CLASS(klass));
+  if (decode->allowed_caps)
+    return TRUE;
 
-    object_class->finalize   = gst_vaapidecode_finalize;
+  if (!gst_vaapidecode_ensure_display (decode))
+    goto error_no_display;
 
-    element_class->change_state =
-        GST_DEBUG_FUNCPTR(gst_vaapidecode_change_state);
+  profiles =
+      gst_vaapi_display_get_decode_profiles (GST_VAAPI_PLUGIN_BASE_DISPLAY
+      (decode));
+  if (!profiles)
+    goto error_no_profiles;
+
+  allowed_caps = gst_caps_new_empty ();
+  if (!allowed_caps)
+    goto error_no_memory;
+
+  for (i = 0; i < profiles->len; i++) {
+    const GstVaapiProfile profile =
+        g_array_index (profiles, GstVaapiProfile, i);
+    const gchar *media_type_name;
+    const gchar *profile_name;
+    GstStructure *structure;
+
+    media_type_name = gst_vaapi_profile_get_media_type_name (profile);
+    if (!media_type_name)
+      continue;
+
+    caps = gst_caps_from_string (media_type_name);
+    if (!caps)
+      continue;
+    structure = gst_caps_get_structure (caps, 0);
+
+    profile_name = gst_vaapi_profile_get_name (profile);
+    if (profile_name)
+      gst_structure_set (structure, "profile", G_TYPE_STRING,
+          profile_name, NULL);
+
+    allowed_caps = gst_caps_merge (allowed_caps, caps);
+  }
+  decode->allowed_caps = gst_caps_simplify (allowed_caps);
 
-    vdec_class->open         = GST_DEBUG_FUNCPTR(gst_vaapidecode_open);
-    vdec_class->close        = GST_DEBUG_FUNCPTR(gst_vaapidecode_close);
-    vdec_class->set_format   = GST_DEBUG_FUNCPTR(gst_vaapidecode_set_format);
-    vdec_class->reset        = GST_DEBUG_FUNCPTR(gst_vaapidecode_reset);
-    vdec_class->parse        = GST_DEBUG_FUNCPTR(gst_vaapidecode_parse);
-    vdec_class->handle_frame = GST_DEBUG_FUNCPTR(gst_vaapidecode_handle_frame);
-    vdec_class->finish       = GST_DEBUG_FUNCPTR(gst_vaapidecode_finish);
+  g_array_unref (profiles);
+  return TRUE;
 
-#if GST_CHECK_VERSION(1,0,0)
-    vdec_class->decide_allocation =
-        GST_DEBUG_FUNCPTR(gst_vaapidecode_decide_allocation);
-#endif
+  /* ERRORS */
+error_no_display:
+  {
+    GST_ERROR ("failed to retrieve VA display");
+    return FALSE;
+  }
+error_no_profiles:
+  {
+    GST_ERROR ("failed to retrieve VA decode profiles");
+    return FALSE;
+  }
+error_no_memory:
+  {
+    GST_ERROR ("failed to allocate allowed-caps set");
+    g_array_unref (profiles);
+    return FALSE;
+  }
+}
 
-    gst_element_class_set_static_metadata(element_class,
-        "VA-API decoder",
-        "Codec/Decoder/Video",
-        GST_PLUGIN_DESC,
-        "Gwenole Beauchesne <gwenole.beauchesne@intel.com>");
+static GstCaps *
+gst_vaapidecode_get_caps (GstPad * pad)
+{
+  GstVaapiDecode *const decode = GST_VAAPIDECODE (GST_OBJECT_PARENT (pad));
 
-    /* sink pad */
-    pad_template = gst_static_pad_template_get(&gst_vaapidecode_sink_factory);
-    gst_element_class_add_pad_template(element_class, pad_template);
+  if (!gst_vaapidecode_ensure_allowed_caps (decode))
+    return gst_caps_new_empty ();
 
-    /* src pad */
-    pad_template = gst_static_pad_template_get(&gst_vaapidecode_src_factory);
-    gst_element_class_add_pad_template(element_class, pad_template);
+  return gst_caps_ref (decode->allowed_caps);
 }
 
+#if !GST_CHECK_VERSION(1,4,0)
 static gboolean
-gst_vaapidecode_ensure_allowed_caps(GstVaapiDecode *decode)
+gst_vaapidecode_query (GstPad * pad, GstObject * parent, GstQuery * query)
 {
-    GstCaps *caps, *allowed_caps;
-    GArray *profiles;
-    guint i;
-
-    if (decode->allowed_caps)
-        return TRUE;
-
-    if (!gst_vaapidecode_ensure_display(decode))
-        goto error_no_display;
-
-    profiles = gst_vaapi_display_get_decode_profiles(
-        GST_VAAPI_PLUGIN_BASE_DISPLAY(decode));
-    if (!profiles)
-        goto error_no_profiles;
-
-    allowed_caps = gst_caps_new_empty();
-    if (!allowed_caps)
-        goto error_no_memory;
-
-    for (i = 0; i < profiles->len; i++) {
-        const GstVaapiProfile profile =
-            g_array_index(profiles, GstVaapiProfile, i);
-        const gchar *media_type_name;
-        const gchar *profile_name;
-        GstStructure *structure;
-
-        media_type_name = gst_vaapi_profile_get_media_type_name(profile);
-        if (!media_type_name)
-            continue;
-
-        caps = gst_caps_from_string(media_type_name);
-        if (!caps)
-            continue;
-        structure = gst_caps_get_structure (caps, 0);
+  GstVaapiDecode *const decode =
+      GST_VAAPIDECODE (gst_pad_get_parent_element (pad));
+  GstVideoDecoder *const vdec = GST_VIDEO_DECODER (decode);
+  gboolean res;
+
+  GST_INFO_OBJECT (decode, "query type %s on %s pad",
+      GST_QUERY_TYPE_NAME (query), GST_PAD_IS_SINK (pad) ? "sink" : "src");
+
+  if (GST_PAD_IS_SINK (pad))
+    res = gst_vaapidecode_sink_query (vdec, query);
+  else
+    res = gst_vaapidecode_src_query (vdec, query);
 
-        profile_name = gst_vaapi_profile_get_name(profile);
-        if (profile_name)
-            gst_structure_set(structure, "profile", G_TYPE_STRING,
-                profile_name, NULL);
+  gst_object_unref (vdec);
+  return res;
+}
+#endif
 
-        allowed_caps = gst_caps_merge(allowed_caps, caps);
-    }
-    decode->allowed_caps = gst_caps_simplify (allowed_caps);
+static gboolean
+gst_vaapidecode_sink_query (GstVideoDecoder * vdec, GstQuery * query)
+{
+  gboolean ret = TRUE;
+  GstVaapiDecode *const decode = GST_VAAPIDECODE (vdec);
+  GstVaapiPluginBase *const plugin = GST_VAAPI_PLUGIN_BASE (decode);
 
-    g_array_unref(profiles);
+  if (gst_vaapi_reply_to_query (query, plugin->display)) {
+    GST_DEBUG_OBJECT (decode, "sharing display %p", plugin->display);
     return TRUE;
+  }
 
-    /* ERRORS */
-error_no_display:
-    {
-        GST_ERROR("failed to retrieve VA display");
-        return FALSE;
-    }
-error_no_profiles:
-    {
-        GST_ERROR("failed to retrieve VA decode profiles");
-        return FALSE;
-    }
-error_no_memory:
-    {
-        GST_ERROR("failed to allocate allowed-caps set");
-        g_array_unref(profiles);
-        return FALSE;
+  switch (GST_QUERY_TYPE (query)) {
+    case GST_QUERY_CAPS:{
+      GstCaps *caps, *filter = NULL;
+      GstPad *pad = GST_VIDEO_DECODER_SINK_PAD (vdec);
+
+      gst_query_parse_caps (query, &filter);
+      caps = gst_vaapidecode_get_caps (pad);
+
+      if (filter) {
+        GstCaps *tmp = caps;
+        caps = gst_caps_intersect_full (filter, tmp, GST_CAPS_INTERSECT_FIRST);
+        gst_caps_unref (tmp);
+      }
+
+      gst_query_set_caps_result (query, caps);
+      gst_caps_unref (caps);
+      break;
+    }
+    default:{
+#if GST_CHECK_VERSION(1,4,0)
+      ret = GST_VIDEO_DECODER_CLASS (gst_vaapidecode_parent_class)->sink_query
+          (vdec, query);
+#else
+      GstPad *pad = GST_VIDEO_DECODER_SINK_PAD (vdec);
+      GstObject *parent = gst_pad_get_parent (pad);
+      ret = plugin->sinkpad_query (pad, parent, query);
+      if (parent)
+        gst_object_unref (parent);
+#endif
+      break;
     }
-}
+  }
 
-static GstCaps *
-gst_vaapidecode_get_caps(GstPad *pad)
-{
-    GstVaapiDecode * const decode = GST_VAAPIDECODE(GST_OBJECT_PARENT(pad));
-
-    if (!gst_vaapidecode_ensure_allowed_caps(decode))
-        return gst_caps_new_empty();
-
-    return gst_caps_ref(decode->allowed_caps);
+  return ret;
 }
 
 static gboolean
-gst_vaapidecode_query(GST_PAD_QUERY_FUNCTION_ARGS)
+gst_vaapidecode_src_query (GstVideoDecoder * vdec, GstQuery * query)
 {
-    GstVaapiDecode * const decode =
-        GST_VAAPIDECODE(gst_pad_get_parent_element(pad));
-    GstVaapiPluginBase * const plugin = GST_VAAPI_PLUGIN_BASE(decode);
-    gboolean res;
+  gboolean ret = TRUE;
+  GstVaapiDecode *const decode = GST_VAAPIDECODE (vdec);
+  GstVaapiPluginBase *const plugin = GST_VAAPI_PLUGIN_BASE (decode);
 
-    GST_INFO_OBJECT(decode, "query type %s", GST_QUERY_TYPE_NAME(query));
+  if (gst_vaapi_reply_to_query (query, plugin->display)) {
+    GST_DEBUG_OBJECT (decode, "sharing display %p", plugin->display);
+    return TRUE;
+  }
 
-    if (gst_vaapi_reply_to_query(query, plugin->display)) {
-        GST_DEBUG("sharing display %p", plugin->display);
-        res = TRUE;
-    }
-    else if (GST_PAD_IS_SINK(pad)) {
-        switch (GST_QUERY_TYPE(query)) {
-#if GST_CHECK_VERSION(1,0,0)
-        case GST_QUERY_CAPS: {
-            GstCaps * const caps = gst_vaapidecode_get_caps(pad);
-            gst_query_set_caps_result(query, caps);
-            gst_caps_unref(caps);
-            res = TRUE;
-            break;
-        }
+  switch (GST_QUERY_TYPE (query)) {
+    case GST_QUERY_CAPS:{
+      GstCaps *caps, *filter = NULL;
+      GstPad *pad = GST_VIDEO_DECODER_SRC_PAD (vdec);
+
+      gst_query_parse_caps (query, &filter);
+      caps = gst_pad_get_pad_template_caps (pad);
+
+      if (filter) {
+        GstCaps *tmp = caps;
+        caps = gst_caps_intersect_full (filter, tmp, GST_CAPS_INTERSECT_FIRST);
+        gst_caps_unref (tmp);
+      }
+
+      gst_query_set_caps_result (query, caps);
+      gst_caps_unref (caps);
+      break;
+    }
+    default:{
+#if GST_CHECK_VERSION(1,4,0)
+      ret = GST_VIDEO_DECODER_CLASS (gst_vaapidecode_parent_class)->src_query
+          (vdec, query);
+#else
+      GstPad *pad = GST_VIDEO_DECODER_SRC_PAD (vdec);
+      GstObject *parent = gst_pad_get_parent (pad);
+      ret = plugin->srcpad_query (pad, parent, query);
+      if (parent)
+        gst_object_unref (parent);
 #endif
-        default:
-            res = GST_PAD_QUERY_FUNCTION_CALL(plugin->sinkpad_query, pad,
-                parent, query);
-            break;
-        }
+      break;
     }
-    else
-        res = GST_PAD_QUERY_FUNCTION_CALL(plugin->srcpad_query, pad,
-            parent, query);
+  }
 
-    gst_object_unref(decode);
-    return res;
+  return ret;
 }
 
 static void
-gst_vaapidecode_init(GstVaapiDecode *decode)
+gst_vaapidecode_init (GstVaapiDecode * decode)
 {
-    GstVideoDecoder * const vdec = GST_VIDEO_DECODER(decode);
-    GstPad *pad;
+  GstVideoDecoder *const vdec = GST_VIDEO_DECODER (decode);
 
-    gst_vaapi_plugin_base_init(GST_VAAPI_PLUGIN_BASE(decode), GST_CAT_DEFAULT);
+  gst_vaapi_plugin_base_init (GST_VAAPI_PLUGIN_BASE (decode), GST_CAT_DEFAULT);
 
-    decode->decoder             = NULL;
-    decode->decoder_caps        = NULL;
-    decode->allowed_caps        = NULL;
-    decode->decoder_loop_status = GST_FLOW_OK;
+  decode->decoder = NULL;
+  decode->decoder_caps = NULL;
+  decode->allowed_caps = NULL;
 
-    g_mutex_init(&decode->decoder_mutex);
-    g_cond_init(&decode->decoder_ready);
-    g_cond_init(&decode->decoder_finish_done);
+  g_mutex_init (&decode->surface_ready_mutex);
+  g_cond_init (&decode->surface_ready);
 
-    gst_video_decoder_set_packetized(vdec, FALSE);
+  gst_video_decoder_set_packetized (vdec, FALSE);
 
-    /* Pad through which data comes in to the element */
-    pad = GST_VAAPI_PLUGIN_BASE_SINK_PAD(decode);
-    gst_pad_set_query_function(pad, gst_vaapidecode_query);
-#if !GST_CHECK_VERSION(1,0,0)
-    gst_pad_set_getcaps_function(pad, gst_vaapidecode_get_caps);
-#endif
+#if !GST_CHECK_VERSION(1,4,0)
+  /* Pad through which data comes in to the element */
+  GstPad *pad = GST_VAAPI_PLUGIN_BASE_SINK_PAD (decode);
+  gst_pad_set_query_function (pad, GST_DEBUG_FUNCPTR (gst_vaapidecode_query));
 
-    /* Pad through which data goes out of the element */
-    pad = GST_VAAPI_PLUGIN_BASE_SRC_PAD(decode);
-    gst_pad_set_query_function(pad, gst_vaapidecode_query);
+  /* Pad through which data goes out of the element */
+  pad = GST_VAAPI_PLUGIN_BASE_SRC_PAD (decode);
+  gst_pad_set_query_function (pad, GST_DEBUG_FUNCPTR (gst_vaapidecode_query));
+#endif
 }
diff -Nru gstreamer-vaapi-0.5.10/gst/vaapi/gstvaapidecode.h gstreamer-vaapi-0.6.0/gst/vaapi/gstvaapidecode.h
--- gstreamer-vaapi-0.5.10/gst/vaapi/gstvaapidecode.h	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst/vaapi/gstvaapidecode.h	2015-07-15 12:47:43.000000000 +0000
@@ -64,15 +64,15 @@
     GstCaps            *sinkpad_caps;
     GstCaps            *srcpad_caps;
     GstVaapiDecoder    *decoder;
-    GMutex              decoder_mutex;
-    GCond               decoder_ready;
-    GstFlowReturn       decoder_loop_status;
-    volatile gboolean   decoder_finish;
-    GCond               decoder_finish_done;
+    GMutex              surface_ready_mutex;
+    GCond               surface_ready;
     GstCaps            *decoder_caps;
     GstCaps            *allowed_caps;
     guint               current_frame_size;
     guint               has_texture_upload_meta : 1;
+
+    GstVideoCodecState *input_state;
+    volatile gboolean   active;
 };
 
 struct _GstVaapiDecodeClass {
diff -Nru gstreamer-vaapi-0.5.10/gst/vaapi/gstvaapidownload.c gstreamer-vaapi-0.6.0/gst/vaapi/gstvaapidownload.c
--- gstreamer-vaapi-0.5.10/gst/vaapi/gstvaapidownload.c	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst/vaapi/gstvaapidownload.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,585 +0,0 @@
-/*
- *  gstvaapidownload.c - VA-API video downloader
- *
- *  Copyright (C) 2010-2011 Splitted-Desktop Systems
- *    Author: Gwenole Beauchesne <gwenole.beauchesne@splitted-desktop.com>
- *  Copyright (C) 2011-2013 Intel Corporation
- *    Author: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public License
- *  as published by the Free Software Foundation; either version 2.1
- *  of the License, or (at your option) any later version.
- *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free
- *  Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- *  Boston, MA 02110-1301 USA
- */
-
-/**
- * SECTION:gstvaapidownload
- * @short_description: A VA to video flow filter
- *
- * vaapidownload converts from VA surfaces to raw YUV pixels.
- */
-
-#include "gst/vaapi/sysdeps.h"
-#include <gst/gst.h>
-#include <gst/video/video.h>
-
-#include "gstvaapidownload.h"
-#include "gstvaapipluginutil.h"
-#include "gstvaapivideobuffer.h"
-
-#define GST_PLUGIN_NAME "vaapidownload"
-#define GST_PLUGIN_DESC "A VA to video flow filter"
-
-GST_DEBUG_CATEGORY_STATIC(gst_debug_vaapidownload);
-#define GST_CAT_DEFAULT gst_debug_vaapidownload
-
-/* Default templates */
-static const char gst_vaapidownload_yuv_caps_str[] =
-    "video/x-raw-yuv, "
-    "width  = (int) [ 1, MAX ], "
-    "height = (int) [ 1, MAX ]; ";
-
-static const char gst_vaapidownload_vaapi_caps_str[] =
-    GST_VAAPI_SURFACE_CAPS;
-
-static GstStaticPadTemplate gst_vaapidownload_sink_factory =
-    GST_STATIC_PAD_TEMPLATE(
-        "sink",
-        GST_PAD_SINK,
-        GST_PAD_ALWAYS,
-        GST_STATIC_CAPS(gst_vaapidownload_vaapi_caps_str));
-
-static GstStaticPadTemplate gst_vaapidownload_src_factory =
-    GST_STATIC_PAD_TEMPLATE(
-        "src",
-        GST_PAD_SRC,
-        GST_PAD_ALWAYS,
-        GST_STATIC_CAPS(gst_vaapidownload_yuv_caps_str));
-
-typedef struct _TransformSizeCache TransformSizeCache;
-struct _TransformSizeCache {
-    GstCaps            *caps;
-    guint               size;
-};
-
-struct _GstVaapiDownload {
-    /*< private >*/
-    GstVaapiPluginBase  parent_instance;
-
-    GstCaps            *allowed_caps;
-    TransformSizeCache  transform_size_cache[2];
-    GstVaapiVideoPool  *images;
-    GstVideoFormat      image_format;
-    guint               image_width;
-    guint               image_height;
-    unsigned int        images_reset    : 1;
-};
-
-struct _GstVaapiDownloadClass {
-    /*< private >*/
-    GstVaapiPluginBaseClass parent_class;
-};
-
-G_DEFINE_TYPE_WITH_CODE(
-    GstVaapiDownload,
-    gst_vaapidownload,
-    GST_TYPE_BASE_TRANSFORM,
-    GST_VAAPI_PLUGIN_BASE_INIT_INTERFACES)
-
-static gboolean
-gst_vaapidownload_start(GstBaseTransform *trans);
-
-static gboolean
-gst_vaapidownload_stop(GstBaseTransform *trans);
-
-static void
-gst_vaapidownload_before_transform(GstBaseTransform *trans, GstBuffer *buffer);
-
-static GstFlowReturn
-gst_vaapidownload_transform(
-    GstBaseTransform *trans,
-    GstBuffer        *inbuf,
-    GstBuffer        *outbuf
-);
-
-static GstCaps *
-gst_vaapidownload_transform_caps(
-    GstBaseTransform *trans,
-    GstPadDirection   direction,
-    GstCaps          *caps
-);
-
-static gboolean
-gst_vaapidownload_transform_size(
-    GstBaseTransform *trans,
-    GstPadDirection   direction,
-    GstCaps          *caps,
-    guint             size,
-    GstCaps          *othercaps,
-    guint            *othersize
-);
-
-static gboolean
-gst_vaapidownload_set_caps(
-    GstBaseTransform *trans,
-    GstCaps          *incaps,
-    GstCaps          *outcaps
-);
-
-static gboolean
-gst_vaapidownload_query(
-    GstPad   *pad,
-    GstQuery *query
-);
-
-static void
-gst_vaapidownload_destroy(GstVaapiDownload *download)
-{
-    guint i;
-
-    for (i = 0; i < G_N_ELEMENTS(download->transform_size_cache); i++) {
-        TransformSizeCache * const tsc = &download->transform_size_cache[i];
-        if (tsc->caps) {
-            gst_caps_unref(tsc->caps);
-            tsc->caps = NULL;
-            tsc->size = 0;
-        }
-    }
-
-    if (download->allowed_caps) {
-        gst_caps_unref(download->allowed_caps);
-        download->allowed_caps = NULL;
-    }
-
-    gst_vaapi_video_pool_replace(&download->images, NULL);
-    GST_VAAPI_PLUGIN_BASE_DISPLAY_REPLACE(download, NULL);
-}
-
-static void
-gst_vaapidownload_finalize(GObject *object)
-{
-    gst_vaapidownload_destroy(GST_VAAPIDOWNLOAD(object));
-
-    gst_vaapi_plugin_base_finalize(GST_VAAPI_PLUGIN_BASE(object));
-    G_OBJECT_CLASS(gst_vaapidownload_parent_class)->finalize(object);
-}
-
-static void
-gst_vaapidownload_class_init(GstVaapiDownloadClass *klass)
-{
-    GObjectClass * const object_class = G_OBJECT_CLASS(klass);
-    GstBaseTransformClass * const trans_class = GST_BASE_TRANSFORM_CLASS(klass);
-    GstElementClass * const element_class = GST_ELEMENT_CLASS(klass);
-    GstPadTemplate *pad_template;
-
-    GST_DEBUG_CATEGORY_INIT(gst_debug_vaapidownload,
-                            GST_PLUGIN_NAME, 0, GST_PLUGIN_DESC);
-
-    gst_vaapi_plugin_base_class_init(GST_VAAPI_PLUGIN_BASE_CLASS(klass));
-
-    object_class->finalize        = gst_vaapidownload_finalize;
-    trans_class->start            = gst_vaapidownload_start;
-    trans_class->stop             = gst_vaapidownload_stop;
-    trans_class->before_transform = gst_vaapidownload_before_transform;
-    trans_class->transform        = gst_vaapidownload_transform;
-    trans_class->transform_caps   = gst_vaapidownload_transform_caps;
-    trans_class->transform_size   = gst_vaapidownload_transform_size;
-    trans_class->set_caps         = gst_vaapidownload_set_caps;
-
-    gst_element_class_set_static_metadata(element_class,
-        "VA-API colorspace converter",
-        "Filter/Converter/Video",
-        GST_PLUGIN_DESC,
-        "Gwenole Beauchesne <gwenole.beauchesne@intel.com>");
-
-    /* sink pad */
-    pad_template = gst_static_pad_template_get(&gst_vaapidownload_sink_factory);
-    gst_element_class_add_pad_template(element_class, pad_template);
-
-    /* src pad */
-    pad_template = gst_static_pad_template_get(&gst_vaapidownload_src_factory);
-    gst_element_class_add_pad_template(element_class, pad_template);
-}
-
-static void
-gst_vaapidownload_init(GstVaapiDownload *download)
-{
-    GstPad *sinkpad, *srcpad;
-
-    gst_vaapi_plugin_base_init(GST_VAAPI_PLUGIN_BASE(download), GST_CAT_DEFAULT);
-
-    download->allowed_caps      = NULL;
-    download->images            = NULL;
-    download->images_reset      = FALSE;
-    download->image_format      = GST_VIDEO_FORMAT_UNKNOWN;
-    download->image_width       = 0;
-    download->image_height      = 0;
-
-    /* Override buffer allocator on sink pad */
-    sinkpad = gst_element_get_static_pad(GST_ELEMENT(download), "sink");
-    gst_pad_set_query_function(sinkpad, gst_vaapidownload_query);
-    gst_object_unref(sinkpad);
-
-    /* Override query on src pad */
-    srcpad = gst_element_get_static_pad(GST_ELEMENT(download), "src");
-    gst_pad_set_query_function(srcpad, gst_vaapidownload_query);
-    gst_object_unref(srcpad);
-}
-
-static inline gboolean
-gst_vaapidownload_ensure_display(GstVaapiDownload *download)
-{
-    return gst_vaapi_plugin_base_ensure_display(GST_VAAPI_PLUGIN_BASE(download));
-}
-
-static gboolean
-gst_vaapidownload_start(GstBaseTransform *trans)
-{
-    GstVaapiDownload * const download = GST_VAAPIDOWNLOAD(trans);
-
-    if (!gst_vaapi_plugin_base_open(GST_VAAPI_PLUGIN_BASE(trans)))
-        return FALSE;
-    if (!gst_vaapidownload_ensure_display(download))
-        return FALSE;
-    return TRUE;
-}
-
-static gboolean
-gst_vaapidownload_stop(GstBaseTransform *trans)
-{
-    gst_vaapi_plugin_base_close(GST_VAAPI_PLUGIN_BASE(trans));
-    return TRUE;
-}
-
-static GstVideoFormat
-get_surface_format(GstVaapiSurface *surface)
-{
-    GstVaapiImage *image;
-    GstVideoFormat format = GST_VIDEO_FORMAT_NV12;
-
-    /* XXX: NV12 is assumed by default */
-    image = gst_vaapi_surface_derive_image(surface);
-    if (image) {
-        format = gst_vaapi_image_get_format(image);
-        gst_vaapi_object_unref(image);
-    }
-    return format;
-}
-
-static gboolean
-gst_vaapidownload_update_src_caps(GstVaapiDownload *download, GstBuffer *buffer)
-{
-    GstVaapiVideoMeta *meta;
-    GstVaapiSurface *surface;
-    GstVideoFormat format;
-    GstVideoInfo vi;
-    GstPad *srcpad;
-    GstCaps *in_caps, *out_caps;
-
-    meta = gst_buffer_get_vaapi_video_meta(buffer);
-    surface = gst_vaapi_video_meta_get_surface(meta);
-    if (!surface) {
-        GST_WARNING("failed to retrieve VA surface from buffer");
-        return FALSE;
-    }
-
-    format = get_surface_format(surface);
-    if (format == download->image_format)
-        return TRUE;
-
-    in_caps = GST_BUFFER_CAPS(buffer);
-    if (!in_caps || !gst_caps_is_fixed(in_caps)) {
-        GST_WARNING("failed to retrieve caps from buffer");
-        return FALSE;
-    }
-
-    if (!gst_video_info_from_caps(&vi, in_caps)) {
-        GST_WARNING("failed to parse caps %" GST_PTR_FORMAT, in_caps);
-        return FALSE;
-    }
-
-    gst_video_info_set_format(&vi, download->image_format,
-        GST_VIDEO_INFO_WIDTH(&vi), GST_VIDEO_INFO_HEIGHT(&vi));
-    out_caps = gst_video_info_to_caps(&vi);
-    if (!out_caps) {
-        GST_WARNING("failed to create caps from format %s",
-                    gst_video_format_to_string(download->image_format));
-        return FALSE;
-    }
-
-    /* Try to renegotiate downstream caps */
-    srcpad = gst_element_get_static_pad(GST_ELEMENT(download), "src");
-    gst_pad_set_caps(srcpad, out_caps);
-    gst_object_unref(srcpad);
-
-    gst_vaapidownload_set_caps(GST_BASE_TRANSFORM(download), in_caps, out_caps);
-    gst_caps_replace(&download->allowed_caps, out_caps);
-    gst_caps_unref(out_caps);
-    return TRUE;
-}
-
-static void
-gst_vaapidownload_before_transform(GstBaseTransform *trans, GstBuffer *buffer)
-{
-    GstVaapiDownload * const download = GST_VAAPIDOWNLOAD(trans);
-
-    gst_vaapidownload_update_src_caps(download, buffer);
-}
-
-static GstFlowReturn
-gst_vaapidownload_transform(
-    GstBaseTransform *trans,
-    GstBuffer        *inbuf,
-    GstBuffer        *outbuf
-)
-{
-    GstVaapiDownload * const download = GST_VAAPIDOWNLOAD(trans);
-    GstVaapiVideoMeta *meta;
-    GstVaapiSurface *surface;
-    GstVaapiImage *image = NULL;
-    gboolean success;
-
-    meta = gst_buffer_get_vaapi_video_meta(inbuf);
-    surface = gst_vaapi_video_meta_get_surface(meta);
-    if (!surface)
-        return GST_FLOW_UNEXPECTED;
-
-    image = gst_vaapi_video_pool_get_object(download->images);
-    if (!image)
-        return GST_FLOW_UNEXPECTED;
-    if (!gst_vaapi_surface_get_image(surface, image))
-        goto error_get_image;
-
-    success = gst_vaapi_image_get_buffer(image, outbuf, NULL);
-    gst_vaapi_video_pool_put_object(download->images, image);
-    if (!success)
-        goto error_get_buffer;
-    return GST_FLOW_OK;
-
-error_get_image:
-    {
-        const GstVideoFormat format = gst_vaapi_image_get_format(image);
-        GST_WARNING("failed to download %s image from surface 0x%08x",
-                    gst_video_format_to_string(format),
-                    gst_vaapi_surface_get_id(surface));
-        gst_vaapi_video_pool_put_object(download->images, image);
-        return GST_FLOW_UNEXPECTED;
-    }
-
-error_get_buffer:
-    {
-        GST_WARNING("failed to transfer image to output video buffer");
-        return GST_FLOW_UNEXPECTED;
-    }
-}
-
-static GstCaps *
-gst_vaapidownload_transform_caps(
-    GstBaseTransform *trans,
-    GstPadDirection   direction,
-    GstCaps          *caps
-)
-{
-    GstVaapiDownload * const download = GST_VAAPIDOWNLOAD(trans);
-    GstPad *srcpad;
-    GstCaps *allowed_caps, *tmp_caps, *out_caps = NULL;
-    GstStructure *structure;
-    GArray *formats;
-
-    g_return_val_if_fail(GST_IS_CAPS(caps), NULL);
-
-    structure = gst_caps_get_structure(caps, 0);
-
-    if (direction == GST_PAD_SINK) {
-        if (!gst_structure_has_name(structure, GST_VAAPI_SURFACE_CAPS_NAME))
-            return NULL;
-        if (!gst_vaapidownload_ensure_display(download))
-            return NULL;
-        out_caps = gst_caps_from_string(gst_vaapidownload_yuv_caps_str);
-
-        /* Build up allowed caps */
-        /* XXX: we don't know the decoded surface format yet so we
-           expose whatever VA images we support */
-        if (download->allowed_caps)
-            allowed_caps = gst_caps_ref(download->allowed_caps);
-        else {
-            formats = gst_vaapi_display_get_image_formats(
-                GST_VAAPI_PLUGIN_BASE_DISPLAY(download));
-            if (G_UNLIKELY(!formats))
-                allowed_caps = gst_caps_new_empty();
-            else {
-                allowed_caps =
-                    gst_vaapi_video_format_new_template_caps_from_list(formats);
-                g_array_unref(formats);
-            }
-            if (!allowed_caps)
-                return NULL;
-        }
-        tmp_caps = gst_caps_intersect(out_caps, allowed_caps);
-        gst_caps_unref(allowed_caps);
-        gst_caps_unref(out_caps);
-        out_caps = tmp_caps;
-
-        /* Intersect with allowed caps from the peer, if any */
-        srcpad = gst_element_get_static_pad(GST_ELEMENT(download), "src");
-        allowed_caps = gst_pad_peer_get_caps(srcpad);
-        if (allowed_caps) {
-            tmp_caps = gst_caps_intersect(out_caps, allowed_caps);
-            gst_caps_unref(allowed_caps);
-            gst_caps_unref(out_caps);
-            out_caps = tmp_caps;
-        }
-    }
-    else {
-        if (!gst_structure_has_name(structure, "video/x-raw-yuv"))
-            return NULL;
-        out_caps = gst_caps_from_string(gst_vaapidownload_vaapi_caps_str);
-
-        structure = gst_caps_get_structure(out_caps, 0);
-        gst_structure_set(
-            structure,
-            "type", G_TYPE_STRING, "vaapi",
-            "opengl", G_TYPE_BOOLEAN, USE_GLX,
-            NULL
-        );
-    }
-
-    if (!gst_vaapi_append_surface_caps(out_caps, caps)) {
-        gst_caps_unref(out_caps);
-        return NULL;
-    }
-    return out_caps;
-}
-
-static gboolean
-gst_vaapidownload_ensure_image_pool(GstVaapiDownload *download, GstCaps *caps)
-{
-    GstVideoInfo vi;
-    GstVideoFormat format;
-    guint width, height;
-
-    if (!gst_video_info_from_caps(&vi, caps))
-        return FALSE;
-
-    format = GST_VIDEO_INFO_FORMAT(&vi);
-    width  = GST_VIDEO_INFO_WIDTH(&vi);
-    height = GST_VIDEO_INFO_HEIGHT(&vi);
-
-    if (format != download->image_format ||
-        width  != download->image_width  ||
-        height != download->image_height) {
-        download->image_format = format;
-        download->image_width  = width;
-        download->image_height = height;
-        gst_vaapi_video_pool_replace(&download->images, NULL);
-        download->images = gst_vaapi_image_pool_new(
-            GST_VAAPI_PLUGIN_BASE_DISPLAY(download), &vi);
-        if (!download->images)
-            return FALSE;
-        download->images_reset = TRUE;
-    }
-    return TRUE;
-}
-
-static inline gboolean
-gst_vaapidownload_negotiate_buffers(
-    GstVaapiDownload  *download,
-    GstCaps          *incaps,
-    GstCaps          *outcaps
-)
-{
-    if (!gst_vaapidownload_ensure_image_pool(download, outcaps))
-        return FALSE;
-    return TRUE;
-}
-
-static gboolean
-gst_vaapidownload_set_caps(
-    GstBaseTransform *trans,
-    GstCaps          *incaps,
-    GstCaps          *outcaps
-)
-{
-    GstVaapiPluginBase * const plugin = GST_VAAPI_PLUGIN_BASE(trans);
-    GstVaapiDownload * const download = GST_VAAPIDOWNLOAD(trans);
-
-    if (!gst_vaapi_plugin_base_set_caps(plugin, incaps, outcaps))
-        return FALSE;
-    if (!gst_vaapidownload_negotiate_buffers(download, incaps, outcaps))
-        return FALSE;
-    return TRUE;
-}
-
-static gboolean
-gst_vaapidownload_transform_size(
-    GstBaseTransform *trans,
-    GstPadDirection   direction,
-    GstCaps          *caps,
-    guint             size,
-    GstCaps          *othercaps,
-    guint            *othersize
-)
-{
-    GstVaapiDownload * const download = GST_VAAPIDOWNLOAD(trans);
-    GstStructure * const structure = gst_caps_get_structure(othercaps, 0);
-    GstVideoFormat format;
-    gint width, height;
-    guint i;
-
-    /* Lookup in cache */
-    for (i = 0; i < G_N_ELEMENTS(download->transform_size_cache); i++) {
-        TransformSizeCache * const tsc = &download->transform_size_cache[i];
-        if (tsc->caps && tsc->caps == othercaps) {
-            *othersize = tsc->size;
-            return TRUE;
-        }
-    }
-
-    /* Compute requested buffer size */
-    if (gst_structure_has_name(structure, GST_VAAPI_SURFACE_CAPS_NAME))
-        *othersize = 0;
-    else {
-        if (!gst_video_format_parse_caps(othercaps, &format, &width, &height))
-            return FALSE;
-        *othersize = gst_video_format_get_size(format, width, height);
-    }
-
-    /* Update cache */
-    for (i = 0; i < G_N_ELEMENTS(download->transform_size_cache); i++) {
-        TransformSizeCache * const tsc = &download->transform_size_cache[i];
-        if (!tsc->caps) {
-            gst_caps_replace(&tsc->caps, othercaps);
-            tsc->size = *othersize;
-        }
-    }
-    return TRUE;
-}
-
-static gboolean
-gst_vaapidownload_query(GstPad *pad, GstQuery *query)
-{
-    GstVaapiDownload * const download = GST_VAAPIDOWNLOAD(gst_pad_get_parent_element(pad));
-    GstVaapiDisplay * const display = GST_VAAPI_PLUGIN_BASE_DISPLAY(download);
-    gboolean res;
-
-    GST_DEBUG("sharing display %p", display);
-
-    if (gst_vaapi_reply_to_query(query, display))
-        res = TRUE;
-    else
-        res = gst_pad_query_default(pad, query);
-
-    gst_object_unref(download);
-    return res;
-
-}
diff -Nru gstreamer-vaapi-0.5.10/gst/vaapi/gstvaapidownload.h gstreamer-vaapi-0.6.0/gst/vaapi/gstvaapidownload.h
--- gstreamer-vaapi-0.5.10/gst/vaapi/gstvaapidownload.h	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst/vaapi/gstvaapidownload.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,67 +0,0 @@
-/*
- *  gstvaapidownload.h - VA-API video downloader
- *
- *  Copyright (C) 2010-2011 Splitted-Desktop Systems
- *    Author: Gwenole Beauchesne <gwenole.beauchesne@splitted-desktop.com>
- *  Copyright (C) 2011-2013 Intel Corporation
- *    Author: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public License
- *  as published by the Free Software Foundation; either version 2.1
- *  of the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this program; if not, write to the Free
- *  Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- *  Boston, MA 02110-1301 USA
-*/
-
-#ifndef GST_VAAPIDOWNLOAD_H
-#define GST_VAAPIDOWNLOAD_H
-
-#include "gstvaapipluginbase.h"
-#include <gst/vaapi/gstvaapisurface.h>
-#include <gst/vaapi/gstvaapiimagepool.h>
-#include <gst/vaapi/gstvaapisurfacepool.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_VAAPIDOWNLOAD \
-    (gst_vaapidownload_get_type())
-
-#define GST_VAAPIDOWNLOAD(obj)                          \
-    (G_TYPE_CHECK_INSTANCE_CAST((obj),                  \
-                                GST_TYPE_VAAPIDOWNLOAD, \
-                                GstVaapiDownload))
-
-#define GST_VAAPIDOWNLOAD_CLASS(klass)                  \
-    (G_TYPE_CHECK_CLASS_CAST((klass),                   \
-                             GST_TYPE_VAAPIDOWNLOAD,    \
-                             GstVaapiDownloadClass))
-
-#define GST_IS_VAAPIDOWNLOAD(obj) \
-    (G_TYPE_CHECK_INSTANCE_TYPE((obj), GST_TYPE_VAAPIDOWNLOAD))
-
-#define GST_IS_VAAPIDOWNLOAD_CLASS(klass) \
-    (G_TYPE_CHECK_CLASS_TYPE((klass), GST_TYPE_VAAPIDOWNLOAD))
-
-#define GST_VAAPIDOWNLOAD_GET_CLASS(obj)                \
-    (G_TYPE_INSTANCE_GET_CLASS((obj),                   \
-                               GST_TYPE_VAAPIDOWNLOAD,  \
-                               GstVaapiDownloadClass))
-
-typedef struct _GstVaapiDownload                GstVaapiDownload;
-typedef struct _GstVaapiDownloadClass           GstVaapiDownloadClass;
-
-GType
-gst_vaapidownload_get_type(void) G_GNUC_CONST;
-
-G_END_DECLS
-
-#endif /* GST_VAAPIDOWNLOAD_H */
diff -Nru gstreamer-vaapi-0.5.10/gst/vaapi/gstvaapiencode.c gstreamer-vaapi-0.6.0/gst/vaapi/gstvaapiencode.c
--- gstreamer-vaapi-0.5.10/gst/vaapi/gstvaapiencode.c	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst/vaapi/gstvaapiencode.c	2015-07-15 12:47:43.000000000 +0000
@@ -21,16 +21,14 @@
  *  Boston, MA 02110-1301 USA
  */
 
-#include "gst/vaapi/sysdeps.h"
+#include "gstcompat.h"
 #include <gst/vaapi/gstvaapivalue.h>
 #include <gst/vaapi/gstvaapidisplay.h>
 #include "gstvaapiencode.h"
 #include "gstvaapipluginutil.h"
 #include "gstvaapivideometa.h"
-#if GST_CHECK_VERSION(1,0,0)
 #include "gstvaapivideomemory.h"
 #include "gstvaapivideobufferpool.h"
-#endif
 
 #define GST_PLUGIN_NAME "vaapiencode"
 #define GST_PLUGIN_DESC "A VA-API based video encoder"
@@ -70,7 +68,7 @@
 }
 
 static gboolean
-gst_vaapiencode_query (GST_PAD_QUERY_FUNCTION_ARGS)
+gst_vaapiencode_query (GstPad * pad, GstObject * parent, GstQuery * query)
 {
   GstVaapiPluginBase *const plugin =
       GST_VAAPI_PLUGIN_BASE (gst_pad_get_parent_element (pad));
@@ -81,11 +79,9 @@
   if (gst_vaapi_reply_to_query (query, plugin->display))
     success = TRUE;
   else if (GST_PAD_IS_SINK (pad))
-    success = GST_PAD_QUERY_FUNCTION_CALL (plugin->sinkpad_query,
-        plugin->sinkpad, parent, query);
+    success = plugin->sinkpad_query (plugin->sinkpad, parent, query);
   else
-    success = GST_PAD_QUERY_FUNCTION_CALL (plugin->srcpad_query,
-        plugin->srcpad, parent, query);
+    success = plugin->srcpad_query (plugin->srcpad, parent, query);
 
   gst_object_unref (plugin);
   return success;
@@ -187,13 +183,9 @@
   if (buf_size <= 0)
     goto error_invalid_buffer;
 
-#if GST_CHECK_VERSION(1,0,0)
   buf =
       gst_video_encoder_allocate_output_buffer (GST_VIDEO_ENCODER_CAST (encode),
       buf_size);
-#else
-  buf = gst_buffer_new_and_alloc (buf_size);
-#endif
   if (!buf)
     goto error_create_buffer;
   if (!gst_vaapi_coded_buffer_copy_into (buf, coded_buf))
@@ -248,10 +240,8 @@
       return FALSE;
   }
 
-#if GST_CHECK_VERSION(1,0,0)
   if (!gst_video_encoder_negotiate (venc))
     return FALSE;
-#endif
 
   encode->input_state_changed = FALSE;
   return TRUE;
@@ -350,24 +340,11 @@
   if (plugin->sinkpad_caps)
     caps = gst_caps_ref (plugin->sinkpad_caps);
   else {
-#if GST_CHECK_VERSION(1,0,0)
     caps = gst_pad_get_pad_template_caps (plugin->sinkpad);
-#else
-    caps = gst_caps_from_string (GST_VAAPI_SURFACE_CAPS);
-
-    if (caps && ensure_uploader (GST_VAAPIENCODE_CAST (plugin))) {
-      GstCaps *const yuv_caps = GST_VAAPI_PLUGIN_BASE_UPLOADER_CAPS (plugin);
-      if (yuv_caps) {
-        caps = gst_caps_make_writable (caps);
-        gst_caps_append (caps, gst_caps_copy (yuv_caps));
-      }
-    }
-#endif
   }
   return caps;
 }
 
-#if GST_CHECK_VERSION(1,0,0)
 static GstCaps *
 gst_vaapiencode_get_caps (GstVideoEncoder * venc, GstCaps * filter)
 {
@@ -381,9 +358,6 @@
   }
   return out_caps;
 }
-#else
-#define gst_vaapiencode_get_caps gst_vaapiencode_get_caps_impl
-#endif
 
 static gboolean
 gst_vaapiencode_destroy (GstVaapiEncode * encode)
@@ -611,11 +585,11 @@
     default:
       break;
   }
-  return GST_ELEMENT_CLASS (gst_vaapiencode_parent_class)->
-      change_state (element, transition);
+  return
+      GST_ELEMENT_CLASS (gst_vaapiencode_parent_class)->change_state (element,
+      transition);
 }
 
-#if GST_CHECK_VERSION(1,0,0)
 static gboolean
 gst_vaapiencode_propose_allocation (GstVideoEncoder * venc, GstQuery * query)
 {
@@ -625,7 +599,6 @@
     return FALSE;
   return TRUE;
 }
-#endif
 
 static void
 gst_vaapiencode_finalize (GObject * object)
@@ -678,11 +651,8 @@
   venc_class->handle_frame = GST_DEBUG_FUNCPTR (gst_vaapiencode_handle_frame);
   venc_class->finish = GST_DEBUG_FUNCPTR (gst_vaapiencode_finish);
   venc_class->getcaps = GST_DEBUG_FUNCPTR (gst_vaapiencode_get_caps);
-
-#if GST_CHECK_VERSION(1,0,0)
   venc_class->propose_allocation =
       GST_DEBUG_FUNCPTR (gst_vaapiencode_propose_allocation);
-#endif
 
   klass->get_property = gst_vaapiencode_default_get_property;
   klass->set_property = gst_vaapiencode_default_set_property;
diff -Nru gstreamer-vaapi-0.5.10/gst/vaapi/gstvaapiencode_h264.c gstreamer-vaapi-0.6.0/gst/vaapi/gstvaapiencode_h264.c
--- gstreamer-vaapi-0.5.10/gst/vaapi/gstvaapiencode_h264.c	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst/vaapi/gstvaapiencode_h264.c	2015-07-15 12:47:43.000000000 +0000
@@ -21,15 +21,13 @@
  *  Boston, MA 02110-1301 USA
  */
 
-#include "gst/vaapi/sysdeps.h"
+#include "gstcompat.h"
 #include <gst/vaapi/gstvaapidisplay.h>
 #include <gst/vaapi/gstvaapiencoder_h264.h>
 #include <gst/vaapi/gstvaapiutils_h264.h>
 #include "gstvaapiencode_h264.h"
 #include "gstvaapipluginutil.h"
-#if GST_CHECK_VERSION(1,0,0)
 #include "gstvaapivideomemory.h"
-#endif
 
 #define GST_PLUGIN_NAME "vaapiencode_h264"
 #define GST_PLUGIN_DESC "A VA-API based H.264 video encoder"
@@ -44,20 +42,10 @@
 
 /* *INDENT-OFF* */
 static const char gst_vaapiencode_h264_sink_caps_str[] =
-#if GST_CHECK_VERSION(1,1,0)
   GST_VIDEO_CAPS_MAKE_WITH_FEATURES (GST_CAPS_FEATURE_MEMORY_VAAPI_SURFACE,
       "{ ENCODED, NV12, I420, YV12 }") ", "
-#else
-  GST_VAAPI_SURFACE_CAPS ", "
-#endif
   GST_CAPS_INTERLACED_FALSE "; "
-#if GST_CHECK_VERSION(1,0,0)
   GST_VIDEO_CAPS_MAKE (GST_VIDEO_FORMATS_ALL) ", "
-#else
-  "video/x-raw-yuv, "
-  "width  = (int) [ 1, MAX ], "
-  "height = (int) [ 1, MAX ], "
-#endif
   GST_CAPS_INTERLACED_FALSE;
 /* *INDENT-ON* */
 
diff -Nru gstreamer-vaapi-0.5.10/gst/vaapi/gstvaapiencode_h265.c gstreamer-vaapi-0.6.0/gst/vaapi/gstvaapiencode_h265.c
--- gstreamer-vaapi-0.5.10/gst/vaapi/gstvaapiencode_h265.c	1970-01-01 00:00:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst/vaapi/gstvaapiencode_h265.c	2015-07-15 12:47:43.000000000 +0000
@@ -0,0 +1,403 @@
+/*
+ *  gstvaapiencode_h265.c - VA-API H.265 encoder
+ *
+ *  Copyright (C) 2015 Intel Corporation
+ *    Author: Sreerenj Balachandran <sreerenj.balachandran@intel.com>
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public License
+ *  as published by the Free Software Foundation; either version 2.1
+ *  of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free
+ *  Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ *  Boston, MA 02110-1301 USA
+ */
+
+#include "gstcompat.h"
+#include <gst/vaapi/gstvaapidisplay.h>
+#include <gst/vaapi/gstvaapiencoder_h265.h>
+#include <gst/vaapi/gstvaapiutils_h265.h>
+#include "gstvaapiencode_h265.h"
+#include "gstvaapipluginutil.h"
+#include "gstvaapivideomemory.h"
+
+#define GST_PLUGIN_NAME "vaapiencode_h265"
+#define GST_PLUGIN_DESC "A VA-API based H.265 video encoder"
+
+GST_DEBUG_CATEGORY_STATIC (gst_vaapi_h265_encode_debug);
+#define GST_CAT_DEFAULT gst_vaapi_h265_encode_debug
+
+#define GST_CODEC_CAPS                              \
+  "video/x-h265, "                                  \
+  "stream-format = (string) { hvc1, byte-stream }, " \
+  "alignment = (string) au"
+
+/* *INDENT-OFF* */
+static const char gst_vaapiencode_h265_sink_caps_str[] =
+  GST_VIDEO_CAPS_MAKE_WITH_FEATURES (GST_CAPS_FEATURE_MEMORY_VAAPI_SURFACE,
+      "{ ENCODED, NV12, I420, YV12 }") ", "
+  GST_CAPS_INTERLACED_FALSE "; "
+  GST_VIDEO_CAPS_MAKE (GST_VIDEO_FORMATS_ALL) ", "
+  GST_CAPS_INTERLACED_FALSE;
+/* *INDENT-ON* */
+
+/* *INDENT-OFF* */
+static const char gst_vaapiencode_h265_src_caps_str[] =
+  GST_CODEC_CAPS ", "
+  "profile = (string) { main }";
+/* *INDENT-ON* */
+
+/* *INDENT-OFF* */
+static GstStaticPadTemplate gst_vaapiencode_h265_sink_factory =
+  GST_STATIC_PAD_TEMPLATE ("sink",
+      GST_PAD_SINK,
+      GST_PAD_ALWAYS,
+      GST_STATIC_CAPS (gst_vaapiencode_h265_sink_caps_str));
+/* *INDENT-ON* */
+
+/* *INDENT-OFF* */
+static GstStaticPadTemplate gst_vaapiencode_h265_src_factory =
+  GST_STATIC_PAD_TEMPLATE ("src",
+      GST_PAD_SRC,
+      GST_PAD_ALWAYS,
+      GST_STATIC_CAPS (gst_vaapiencode_h265_src_caps_str));
+/* *INDENT-ON* */
+
+/* h265 encode */
+G_DEFINE_TYPE (GstVaapiEncodeH265, gst_vaapiencode_h265, GST_TYPE_VAAPIENCODE);
+
+static void
+gst_vaapiencode_h265_init (GstVaapiEncodeH265 * encode)
+{
+  gst_vaapiencode_init_properties (GST_VAAPIENCODE_CAST (encode));
+}
+
+static void
+gst_vaapiencode_h265_finalize (GObject * object)
+{
+  G_OBJECT_CLASS (gst_vaapiencode_h265_parent_class)->finalize (object);
+}
+
+static void
+gst_vaapiencode_h265_set_property (GObject * object,
+    guint prop_id, const GValue * value, GParamSpec * pspec)
+{
+  GstVaapiEncodeClass *const encode_class = GST_VAAPIENCODE_GET_CLASS (object);
+  GstVaapiEncode *const base_encode = GST_VAAPIENCODE_CAST (object);
+
+  switch (prop_id) {
+    default:
+      if (!encode_class->set_property (base_encode, prop_id, value))
+        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+static void
+gst_vaapiencode_h265_get_property (GObject * object,
+    guint prop_id, GValue * value, GParamSpec * pspec)
+{
+  GstVaapiEncodeClass *const encode_class = GST_VAAPIENCODE_GET_CLASS (object);
+  GstVaapiEncode *const base_encode = GST_VAAPIENCODE_CAST (object);
+
+  switch (prop_id) {
+    default:
+      if (!encode_class->get_property (base_encode, prop_id, value))
+        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+typedef struct
+{
+  GstVaapiProfile best_profile;
+  guint best_score;
+} FindBestProfileData;
+
+static void
+find_best_profile_value (FindBestProfileData * data, const GValue * value)
+{
+  const gchar *str;
+  GstVaapiProfile profile;
+  guint score;
+
+  if (!value || !G_VALUE_HOLDS_STRING (value))
+    return;
+
+  str = g_value_get_string (value);
+  if (!str)
+    return;
+  profile = gst_vaapi_utils_h265_get_profile_from_string (str);
+  if (!profile)
+    return;
+  score = gst_vaapi_utils_h265_get_profile_score (profile);
+  if (score < data->best_score)
+    return;
+  data->best_profile = profile;
+  data->best_score = score;
+}
+
+static GstVaapiProfile
+find_best_profile (GstCaps * caps)
+{
+  FindBestProfileData data;
+  guint i, j, num_structures, num_values;
+
+  data.best_profile = GST_VAAPI_PROFILE_UNKNOWN;
+  data.best_score = 0;
+
+  num_structures = gst_caps_get_size (caps);
+  for (i = 0; i < num_structures; i++) {
+    GstStructure *const structure = gst_caps_get_structure (caps, i);
+    const GValue *const value = gst_structure_get_value (structure, "profile");
+
+    if (!value)
+      continue;
+    if (G_VALUE_HOLDS_STRING (value))
+      find_best_profile_value (&data, value);
+    else if (GST_VALUE_HOLDS_LIST (value)) {
+      num_values = gst_value_list_get_size (value);
+      for (j = 0; j < num_values; j++)
+        find_best_profile_value (&data, gst_value_list_get_value (value, j));
+    }
+  }
+  return data.best_profile;
+}
+
+static gboolean
+gst_vaapiencode_h265_set_config (GstVaapiEncode * base_encode)
+{
+  GstVaapiEncoderH265 *const encoder =
+      GST_VAAPI_ENCODER_H265 (base_encode->encoder);
+  GstCaps *allowed_caps;
+  GstVaapiProfile profile;
+
+  /* Check for the largest profile that is supported */
+  allowed_caps =
+      gst_pad_get_allowed_caps (GST_VAAPI_PLUGIN_BASE_SRC_PAD (base_encode));
+  if (!allowed_caps)
+    return TRUE;
+
+  profile = find_best_profile (allowed_caps);
+  gst_caps_unref (allowed_caps);
+  if (profile) {
+    GST_INFO ("using %s profile as target decoder constraints",
+        gst_vaapi_utils_h265_get_profile_string (profile));
+    if (!gst_vaapi_encoder_h265_set_max_profile (encoder, profile))
+      return FALSE;
+  }
+  return TRUE;
+}
+
+static GstCaps *
+gst_vaapiencode_h265_get_caps (GstVaapiEncode * base_encode)
+{
+  GstVaapiEncodeH265 *const encode = GST_VAAPIENCODE_H265_CAST (base_encode);
+  GstCaps *caps, *allowed_caps;
+
+  caps = gst_caps_from_string (GST_CODEC_CAPS);
+
+  /* Check whether "stream-format" is hvcC mode */
+  allowed_caps =
+      gst_pad_get_allowed_caps (GST_VAAPI_PLUGIN_BASE_SRC_PAD (encode));
+  if (allowed_caps) {
+    const char *stream_format = NULL;
+    GstStructure *structure;
+    guint i, num_structures;
+
+    num_structures = gst_caps_get_size (allowed_caps);
+    for (i = 0; !stream_format && i < num_structures; i++) {
+      structure = gst_caps_get_structure (allowed_caps, i);
+      if (!gst_structure_has_field_typed (structure, "stream-format",
+              G_TYPE_STRING))
+        continue;
+      stream_format = gst_structure_get_string (structure, "stream-format");
+    }
+    encode->is_hvc = stream_format && strcmp (stream_format, "hvc1") == 0;
+    gst_caps_unref (allowed_caps);
+  }
+  gst_caps_set_simple (caps, "stream-format", G_TYPE_STRING,
+      encode->is_hvc ? "hvc1" : "byte-stream", NULL);
+
+  base_encode->need_codec_data = encode->is_hvc;
+
+  /* XXX: update profile and level information */
+  return caps;
+}
+
+static GstVaapiEncoder *
+gst_vaapiencode_h265_alloc_encoder (GstVaapiEncode * base,
+    GstVaapiDisplay * display)
+{
+  return gst_vaapi_encoder_h265_new (display);
+}
+
+/* h265 NAL byte stream operations */
+static guint8 *
+_h265_byte_stream_next_nal (guint8 * buffer, guint32 len, guint32 * nal_size)
+{
+  const guint8 *cur = buffer;
+  const guint8 *const end = buffer + len;
+  guint8 *nal_start = NULL;
+  guint32 flag = 0xFFFFFFFF;
+  guint32 nal_start_len = 0;
+
+  g_assert (len >= 0 && buffer && nal_size);
+  if (len < 3) {
+    *nal_size = len;
+    nal_start = (len ? buffer : NULL);
+    return nal_start;
+  }
+
+  /*locate head postion */
+  if (!buffer[0] && !buffer[1]) {
+    if (buffer[2] == 1) {       /* 0x000001 */
+      nal_start_len = 3;
+    } else if (!buffer[2] && len >= 4 && buffer[3] == 1) {      /* 0x00000001 */
+      nal_start_len = 4;
+    }
+  }
+  nal_start = buffer + nal_start_len;
+  cur = nal_start;
+
+  /*find next nal start position */
+  while (cur < end) {
+    flag = ((flag << 8) | ((*cur++) & 0xFF));
+    if ((flag & 0x00FFFFFF) == 0x00000001) {
+      if (flag == 0x00000001)
+        *nal_size = cur - 4 - nal_start;
+      else
+        *nal_size = cur - 3 - nal_start;
+      break;
+    }
+  }
+  if (cur >= end) {
+    *nal_size = end - nal_start;
+    if (nal_start >= end) {
+      nal_start = NULL;
+    }
+  }
+  return nal_start;
+}
+
+static inline void
+_start_code_to_size (guint8 nal_start_code[4], guint32 nal_size)
+{
+  nal_start_code[0] = ((nal_size >> 24) & 0xFF);
+  nal_start_code[1] = ((nal_size >> 16) & 0xFF);
+  nal_start_code[2] = ((nal_size >> 8) & 0xFF);
+  nal_start_code[3] = (nal_size & 0xFF);
+}
+
+static gboolean
+_h265_convert_byte_stream_to_hvc (GstBuffer * buf)
+{
+  GstMapInfo info;
+  guint32 nal_size;
+  guint8 *nal_start_code, *nal_body;
+  guint8 *frame_end;
+
+  g_assert (buf);
+
+  if (!gst_buffer_map (buf, &info, GST_MAP_READ | GST_MAP_WRITE))
+    return FALSE;
+
+  nal_start_code = info.data;
+  frame_end = info.data + info.size;
+  nal_size = 0;
+
+  while ((frame_end > nal_start_code) &&
+      (nal_body = _h265_byte_stream_next_nal (nal_start_code,
+              frame_end - nal_start_code, &nal_size)) != NULL) {
+    if (!nal_size)
+      goto error;
+
+    g_assert (nal_body - nal_start_code == 4);
+    _start_code_to_size (nal_start_code, nal_size);
+    nal_start_code = nal_body + nal_size;
+  }
+  gst_buffer_unmap (buf, &info);
+  return TRUE;
+
+error:
+  gst_buffer_unmap (buf, &info);
+  return FALSE;
+}
+
+static GstFlowReturn
+gst_vaapiencode_h265_alloc_buffer (GstVaapiEncode * base_encode,
+    GstVaapiCodedBuffer * coded_buf, GstBuffer ** out_buffer_ptr)
+{
+  GstVaapiEncodeH265 *const encode = GST_VAAPIENCODE_H265_CAST (base_encode);
+  GstVaapiEncoderH265 *const encoder =
+      GST_VAAPI_ENCODER_H265 (base_encode->encoder);
+  GstFlowReturn ret;
+
+  g_return_val_if_fail (encoder != NULL, GST_FLOW_ERROR);
+
+  ret =
+      GST_VAAPIENCODE_CLASS (gst_vaapiencode_h265_parent_class)->alloc_buffer
+      (base_encode, coded_buf, out_buffer_ptr);
+  if (ret != GST_FLOW_OK)
+    return ret;
+
+  if (!encode->is_hvc)
+    return GST_FLOW_OK;
+
+  /* Convert to hvcC format */
+  if (!_h265_convert_byte_stream_to_hvc (*out_buffer_ptr))
+    goto error_convert_buffer;
+  return GST_FLOW_OK;
+
+  /* ERRORS */
+error_convert_buffer:
+  {
+    GST_ERROR ("failed to convert from bytestream format to hvcC format");
+    gst_buffer_replace (out_buffer_ptr, NULL);
+    return GST_FLOW_ERROR;
+  }
+}
+
+static void
+gst_vaapiencode_h265_class_init (GstVaapiEncodeH265Class * klass)
+{
+  GObjectClass *const object_class = G_OBJECT_CLASS (klass);
+  GstElementClass *const element_class = GST_ELEMENT_CLASS (klass);
+  GstVaapiEncodeClass *const encode_class = GST_VAAPIENCODE_CLASS (klass);
+
+  GST_DEBUG_CATEGORY_INIT (gst_vaapi_h265_encode_debug,
+      GST_PLUGIN_NAME, 0, GST_PLUGIN_DESC);
+
+  object_class->finalize = gst_vaapiencode_h265_finalize;
+  object_class->set_property = gst_vaapiencode_h265_set_property;
+  object_class->get_property = gst_vaapiencode_h265_get_property;
+
+  encode_class->get_properties = gst_vaapi_encoder_h265_get_default_properties;
+  encode_class->set_config = gst_vaapiencode_h265_set_config;
+  encode_class->get_caps = gst_vaapiencode_h265_get_caps;
+  encode_class->alloc_encoder = gst_vaapiencode_h265_alloc_encoder;
+  encode_class->alloc_buffer = gst_vaapiencode_h265_alloc_buffer;
+
+  gst_element_class_set_static_metadata (element_class,
+      "VA-API H.265 encoder",
+      "Codec/Encoder/Video",
+      GST_PLUGIN_DESC,
+      "Sreerenj Balachandran <sreerenj.balachandran@intel.com>");
+
+  /* sink pad */
+  gst_element_class_add_pad_template (element_class,
+      gst_static_pad_template_get (&gst_vaapiencode_h265_sink_factory));
+
+  /* src pad */
+  gst_element_class_add_pad_template (element_class,
+      gst_static_pad_template_get (&gst_vaapiencode_h265_src_factory));
+
+  gst_vaapiencode_class_init_properties (encode_class);
+}
diff -Nru gstreamer-vaapi-0.5.10/gst/vaapi/gstvaapiencode_h265.h gstreamer-vaapi-0.6.0/gst/vaapi/gstvaapiencode_h265.h
--- gstreamer-vaapi-0.5.10/gst/vaapi/gstvaapiencode_h265.h	1970-01-01 00:00:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst/vaapi/gstvaapiencode_h265.h	2015-07-15 12:47:43.000000000 +0000
@@ -0,0 +1,71 @@
+/*
+ *  gstvaapiencode_h265.h - VA-API H.265 encoder
+ *
+ *  Copyright (C) 2015 Intel Corporation
+ *    Author: Sreerenj Balachandran <sreerenj.balachandran@intel.com>
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public License
+ *  as published by the Free Software Foundation; either version 2.1
+ *  of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free
+ *  Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ *  Boston, MA 02110-1301 USA
+ */
+
+#ifndef GST_VAAPIENCODE_H265_H
+#define GST_VAAPIENCODE_H265_H
+
+#include <gst/gst.h>
+#include "gstvaapiencode.h"
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_VAAPIENCODE_H265 \
+    (gst_vaapiencode_h265_get_type ())
+#define GST_VAAPIENCODE_H265_CAST(obj) \
+  ((GstVaapiEncodeH265 *)(obj))
+#define GST_VAAPIENCODE_H265(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_VAAPIENCODE_H265, \
+      GstVaapiEncodeH265))
+#define GST_VAAPIENCODE_H265_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_VAAPIENCODE_H265, \
+      GstVaapiEncodeH265Class))
+#define GST_VAAPIENCODE_H265_GET_CLASS(obj) \
+  (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_VAAPIENCODE_H265, \
+      GstVaapiEncodeH265Class))
+#define GST_IS_VAAPIENCODE_H265(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_VAAPIENCODE_H265))
+#define GST_IS_VAAPIENCODE_H265_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_VAAPIENCODE_H265))
+
+typedef struct _GstVaapiEncodeH265 GstVaapiEncodeH265;
+typedef struct _GstVaapiEncodeH265Class GstVaapiEncodeH265Class;
+
+struct _GstVaapiEncodeH265
+{
+  /*< private >*/
+  GstVaapiEncode parent_instance;
+
+  guint is_hvc:1; /* [FALSE]=byte-stream (default); [TRUE]=hvcC */
+};
+
+struct _GstVaapiEncodeH265Class
+{
+  /*< private >*/
+  GstVaapiEncodeClass parent_class;
+};
+
+GType
+gst_vaapiencode_h265_get_type (void) G_GNUC_CONST;
+
+G_END_DECLS
+
+#endif /* GST_VAAPIENCODE_H265_H */
diff -Nru gstreamer-vaapi-0.5.10/gst/vaapi/gstvaapiencode_jpeg.c gstreamer-vaapi-0.6.0/gst/vaapi/gstvaapiencode_jpeg.c
--- gstreamer-vaapi-0.5.10/gst/vaapi/gstvaapiencode_jpeg.c	1970-01-01 00:00:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst/vaapi/gstvaapiencode_jpeg.c	2015-07-15 12:47:43.000000000 +0000
@@ -0,0 +1,164 @@
+/*
+ *  gstvaapiencode_jpeg.c - VA-API JPEG encoder
+ *
+ *  Copyright (C) 2015 Intel Corporation
+ *    Author: Sreerenj Balachandran <sreerenj.balachandran@intel.com>
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public License
+ *  as published by the Free Software Foundation; either version 2.1
+ *  of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free
+ *  Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ *  Boston, MA 02110-1301 USA
+ */
+
+#include "gstcompat.h"
+#include <gst/vaapi/gstvaapidisplay.h>
+#include <gst/vaapi/gstvaapiencoder_jpeg.h>
+#include "gstvaapiencode_jpeg.h"
+#include "gstvaapipluginutil.h"
+#include "gstvaapivideomemory.h"
+
+#define GST_PLUGIN_NAME "vaapiencode_jpeg"
+#define GST_PLUGIN_DESC "A VA-API based JPEG video encoder"
+
+GST_DEBUG_CATEGORY_STATIC (gst_vaapi_jpeg_encode_debug);
+#define GST_CAT_DEFAULT gst_vaapi_jpeg_encode_debug
+
+#define GST_CODEC_CAPS                          \
+  "image/jpeg"
+
+/* *INDENT-OFF* */
+static const char gst_vaapiencode_jpeg_sink_caps_str[] =
+  GST_VIDEO_CAPS_MAKE_WITH_FEATURES (GST_CAPS_FEATURE_MEMORY_VAAPI_SURFACE,
+      "{ ENCODED, NV12, I420, YV12 }") ", "
+  GST_CAPS_INTERLACED_FALSE "; "
+  GST_VIDEO_CAPS_MAKE (GST_VIDEO_FORMATS_ALL) ", "
+  GST_CAPS_INTERLACED_FALSE;
+/* *INDENT-ON* */
+
+/* *INDENT-OFF* */
+static const char gst_vaapiencode_jpeg_src_caps_str[] =
+  GST_CODEC_CAPS;
+/* *INDENT-ON* */
+
+/* *INDENT-OFF* */
+static GstStaticPadTemplate gst_vaapiencode_jpeg_sink_factory =
+  GST_STATIC_PAD_TEMPLATE ("sink",
+      GST_PAD_SINK,
+      GST_PAD_ALWAYS,
+      GST_STATIC_CAPS (gst_vaapiencode_jpeg_sink_caps_str));
+/* *INDENT-ON* */
+
+/* *INDENT-OFF* */
+static GstStaticPadTemplate gst_vaapiencode_jpeg_src_factory =
+  GST_STATIC_PAD_TEMPLATE ("src",
+      GST_PAD_SRC,
+      GST_PAD_ALWAYS,
+      GST_STATIC_CAPS (gst_vaapiencode_jpeg_src_caps_str));
+/* *INDENT-ON* */
+
+/* jpeg encode */
+G_DEFINE_TYPE (GstVaapiEncodeJpeg, gst_vaapiencode_jpeg, GST_TYPE_VAAPIENCODE);
+
+static void
+gst_vaapiencode_jpeg_init (GstVaapiEncodeJpeg * encode)
+{
+  gst_vaapiencode_init_properties (GST_VAAPIENCODE_CAST (encode));
+}
+
+static void
+gst_vaapiencode_jpeg_finalize (GObject * object)
+{
+  G_OBJECT_CLASS (gst_vaapiencode_jpeg_parent_class)->finalize (object);
+}
+
+static void
+gst_vaapiencode_jpeg_set_property (GObject * object,
+    guint prop_id, const GValue * value, GParamSpec * pspec)
+{
+  GstVaapiEncodeClass *const encode_class = GST_VAAPIENCODE_GET_CLASS (object);
+  GstVaapiEncode *const base_encode = GST_VAAPIENCODE_CAST (object);
+
+  switch (prop_id) {
+    default:
+      if (!encode_class->set_property (base_encode, prop_id, value))
+        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+static void
+gst_vaapiencode_jpeg_get_property (GObject * object,
+    guint prop_id, GValue * value, GParamSpec * pspec)
+{
+  GstVaapiEncodeClass *const encode_class = GST_VAAPIENCODE_GET_CLASS (object);
+  GstVaapiEncode *const base_encode = GST_VAAPIENCODE_CAST (object);
+
+  switch (prop_id) {
+    default:
+      if (!encode_class->get_property (base_encode, prop_id, value))
+        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+static GstCaps *
+gst_vaapiencode_jpeg_get_caps (GstVaapiEncode * base_encode)
+{
+  GstCaps *caps;
+
+  caps = gst_caps_from_string (GST_CODEC_CAPS);
+
+  return caps;
+}
+
+static GstVaapiEncoder *
+gst_vaapiencode_jpeg_alloc_encoder (GstVaapiEncode * base,
+    GstVaapiDisplay * display)
+{
+  return gst_vaapi_encoder_jpeg_new (display);
+}
+
+static void
+gst_vaapiencode_jpeg_class_init (GstVaapiEncodeJpegClass * klass)
+{
+  GObjectClass *const object_class = G_OBJECT_CLASS (klass);
+  GstElementClass *const element_class = GST_ELEMENT_CLASS (klass);
+  GstVaapiEncodeClass *const encode_class = GST_VAAPIENCODE_CLASS (klass);
+
+  GST_DEBUG_CATEGORY_INIT (gst_vaapi_jpeg_encode_debug,
+      GST_PLUGIN_NAME, 0, GST_PLUGIN_DESC);
+
+  object_class->finalize = gst_vaapiencode_jpeg_finalize;
+  object_class->set_property = gst_vaapiencode_jpeg_set_property;
+  object_class->get_property = gst_vaapiencode_jpeg_get_property;
+
+  encode_class->get_properties = gst_vaapi_encoder_jpeg_get_default_properties;
+  encode_class->get_caps = gst_vaapiencode_jpeg_get_caps;
+  encode_class->alloc_encoder = gst_vaapiencode_jpeg_alloc_encoder;
+
+  gst_element_class_set_static_metadata (element_class,
+      "VA-API JPEG encoder",
+      "Codec/Encoder/Image",
+      GST_PLUGIN_DESC,
+      "Sreerenj Balachandran <sreerenj.balachandran@intel.com>");
+
+  /* sink pad */
+  gst_element_class_add_pad_template (element_class,
+      gst_static_pad_template_get (&gst_vaapiencode_jpeg_sink_factory));
+
+  /* src pad */
+  gst_element_class_add_pad_template (element_class,
+      gst_static_pad_template_get (&gst_vaapiencode_jpeg_src_factory));
+
+  gst_vaapiencode_class_init_properties (encode_class);
+}
diff -Nru gstreamer-vaapi-0.5.10/gst/vaapi/gstvaapiencode_jpeg.h gstreamer-vaapi-0.6.0/gst/vaapi/gstvaapiencode_jpeg.h
--- gstreamer-vaapi-0.5.10/gst/vaapi/gstvaapiencode_jpeg.h	1970-01-01 00:00:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst/vaapi/gstvaapiencode_jpeg.h	2015-07-15 12:47:43.000000000 +0000
@@ -0,0 +1,69 @@
+/*
+ *  gstvaapiencode_jpeg.h - VA-API JPEG encoder
+ *
+ *  Copyright (C) 2015 Intel Corporation
+ *    Author: Sreerenj Balachandran <sreerenj.balachandran@intel.com>
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public License
+ *  as published by the Free Software Foundation; either version 2.1
+ *  of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free
+ *  Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ *  Boston, MA 02110-1301 USA
+ */
+
+#ifndef GST_VAAPIENCODE_JPEG_H
+#define GST_VAAPIENCODE_JPEG_H
+
+#include <gst/gst.h>
+#include "gstvaapiencode.h"
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_VAAPIENCODE_JPEG \
+    (gst_vaapiencode_jpeg_get_type ())
+#define GST_VAAPIENCODE_JPEG_CAST(obj) \
+  ((GstVaapiEncodeJpeg *)(obj))
+#define GST_VAAPIENCODE_JPEG(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_VAAPIENCODE_JPEG, \
+      GstVaapiEncodeJpeg))
+#define GST_VAAPIENCODE_JPEG_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_VAAPIENCODE_JPEG, \
+      GstVaapiEncodeJpegClass))
+#define GST_VAAPIENCODE_JPEG_GET_CLASS(obj) \
+  (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_VAAPIENCODE_JPEG, \
+      GstVaapiEncodeJpegClass))
+#define GST_IS_VAAPIENCODE_JPEG(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_VAAPIENCODE_JPEG))
+#define GST_IS_VAAPIENCODE_JPEG_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_VAAPIENCODE_JPEG))
+
+typedef struct _GstVaapiEncodeJpeg GstVaapiEncodeJpeg;
+typedef struct _GstVaapiEncodeJpegClass GstVaapiEncodeJpegClass;
+
+struct _GstVaapiEncodeJpeg
+{
+  /*< private >*/
+  GstVaapiEncode parent_instance;
+};
+
+struct _GstVaapiEncodeJpegClass
+{
+  /*< private >*/
+  GstVaapiEncodeClass parent_class;
+};
+
+GType
+gst_vaapiencode_jpeg_get_type (void) G_GNUC_CONST;
+
+G_END_DECLS
+
+#endif /* GST_VAAPIENCODE_JPEG_H */
diff -Nru gstreamer-vaapi-0.5.10/gst/vaapi/gstvaapiencode_mpeg2.c gstreamer-vaapi-0.6.0/gst/vaapi/gstvaapiencode_mpeg2.c
--- gstreamer-vaapi-0.5.10/gst/vaapi/gstvaapiencode_mpeg2.c	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst/vaapi/gstvaapiencode_mpeg2.c	2015-07-15 12:47:43.000000000 +0000
@@ -21,14 +21,12 @@
  *  Boston, MA 02110-1301 USA
  */
 
-#include "gst/vaapi/sysdeps.h"
+#include "gstcompat.h"
 #include <gst/vaapi/gstvaapidisplay.h>
 #include <gst/vaapi/gstvaapiencoder_mpeg2.h>
 #include "gstvaapiencode_mpeg2.h"
 #include "gstvaapipluginutil.h"
-#if GST_CHECK_VERSION(1,0,0)
 #include "gstvaapivideomemory.h"
-#endif
 
 #define GST_PLUGIN_NAME "vaapiencode_mpeg2"
 #define GST_PLUGIN_DESC "A VA-API based MPEG-2 video encoder"
@@ -42,20 +40,10 @@
 
 /* *INDENT-OFF* */
 static const char gst_vaapiencode_mpeg2_sink_caps_str[] =
-#if GST_CHECK_VERSION(1,1,0)
   GST_VIDEO_CAPS_MAKE_WITH_FEATURES (GST_CAPS_FEATURE_MEMORY_VAAPI_SURFACE,
       "{ ENCODED, NV12, I420, YV12 }") ", "
-#else
-  GST_VAAPI_SURFACE_CAPS ", "
-#endif
   GST_CAPS_INTERLACED_FALSE "; "
-#if GST_CHECK_VERSION(1,0,0)
   GST_VIDEO_CAPS_MAKE (GST_VIDEO_FORMATS_ALL) ", "
-#else
-  "video/x-raw-yuv, "
-  "width  = (int) [ 1, MAX ], "
-  "height = (int) [ 1, MAX ], "
-#endif
   GST_CAPS_INTERLACED_FALSE;
 /* *INDENT-ON* */
 
diff -Nru gstreamer-vaapi-0.5.10/gst/vaapi/gstvaapiencode_vp8.c gstreamer-vaapi-0.6.0/gst/vaapi/gstvaapiencode_vp8.c
--- gstreamer-vaapi-0.5.10/gst/vaapi/gstvaapiencode_vp8.c	1970-01-01 00:00:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst/vaapi/gstvaapiencode_vp8.c	2015-07-15 12:47:43.000000000 +0000
@@ -0,0 +1,164 @@
+/*
+ *  gstvaapiencode_vp8.c - VA-API VP8 encoder
+ *
+ *  Copyright (C) 2015 Intel Corporation
+ *    Author: Sreerenj Balachandran <sreerenj.balachandran@intel.com>
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public License
+ *  as published by the Free Software Foundation; either version 2.1
+ *  of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free
+ *  Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ *  Boston, MA 02110-1301 USA
+ */
+
+#include "gstcompat.h"
+#include <gst/vaapi/gstvaapidisplay.h>
+#include <gst/vaapi/gstvaapiencoder_vp8.h>
+#include "gstvaapiencode_vp8.h"
+#include "gstvaapipluginutil.h"
+#include "gstvaapivideomemory.h"
+
+#define GST_PLUGIN_NAME "vaapiencode_vp8"
+#define GST_PLUGIN_DESC "A VA-API based VP8 video encoder"
+
+GST_DEBUG_CATEGORY_STATIC (gst_vaapi_vp8_encode_debug);
+#define GST_CAT_DEFAULT gst_vaapi_vp8_encode_debug
+
+#define GST_CODEC_CAPS                          \
+  "video/x-vp8"
+
+/* *INDENT-OFF* */
+static const char gst_vaapiencode_vp8_sink_caps_str[] =
+  GST_VIDEO_CAPS_MAKE_WITH_FEATURES (GST_CAPS_FEATURE_MEMORY_VAAPI_SURFACE,
+      "{ ENCODED, NV12, I420, YV12 }") ", "
+  GST_CAPS_INTERLACED_FALSE "; "
+  GST_VIDEO_CAPS_MAKE (GST_VIDEO_FORMATS_ALL) ", "
+  GST_CAPS_INTERLACED_FALSE;
+/* *INDENT-ON* */
+
+/* *INDENT-OFF* */
+static const char gst_vaapiencode_vp8_src_caps_str[] =
+  GST_CODEC_CAPS;
+/* *INDENT-ON* */
+
+/* *INDENT-OFF* */
+static GstStaticPadTemplate gst_vaapiencode_vp8_sink_factory =
+  GST_STATIC_PAD_TEMPLATE ("sink",
+      GST_PAD_SINK,
+      GST_PAD_ALWAYS,
+      GST_STATIC_CAPS (gst_vaapiencode_vp8_sink_caps_str));
+/* *INDENT-ON* */
+
+/* *INDENT-OFF* */
+static GstStaticPadTemplate gst_vaapiencode_vp8_src_factory =
+  GST_STATIC_PAD_TEMPLATE ("src",
+      GST_PAD_SRC,
+      GST_PAD_ALWAYS,
+      GST_STATIC_CAPS (gst_vaapiencode_vp8_src_caps_str));
+/* *INDENT-ON* */
+
+/* vp8 encode */
+G_DEFINE_TYPE (GstVaapiEncodeVP8, gst_vaapiencode_vp8, GST_TYPE_VAAPIENCODE);
+
+static void
+gst_vaapiencode_vp8_init (GstVaapiEncodeVP8 * encode)
+{
+  gst_vaapiencode_init_properties (GST_VAAPIENCODE_CAST (encode));
+}
+
+static void
+gst_vaapiencode_vp8_finalize (GObject * object)
+{
+  G_OBJECT_CLASS (gst_vaapiencode_vp8_parent_class)->finalize (object);
+}
+
+static void
+gst_vaapiencode_vp8_set_property (GObject * object,
+    guint prop_id, const GValue * value, GParamSpec * pspec)
+{
+  GstVaapiEncodeClass *const encode_class = GST_VAAPIENCODE_GET_CLASS (object);
+  GstVaapiEncode *const base_encode = GST_VAAPIENCODE_CAST (object);
+
+  switch (prop_id) {
+    default:
+      if (!encode_class->set_property (base_encode, prop_id, value))
+        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+static void
+gst_vaapiencode_vp8_get_property (GObject * object,
+    guint prop_id, GValue * value, GParamSpec * pspec)
+{
+  GstVaapiEncodeClass *const encode_class = GST_VAAPIENCODE_GET_CLASS (object);
+  GstVaapiEncode *const base_encode = GST_VAAPIENCODE_CAST (object);
+
+  switch (prop_id) {
+    default:
+      if (!encode_class->get_property (base_encode, prop_id, value))
+        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+static GstCaps *
+gst_vaapiencode_vp8_get_caps (GstVaapiEncode * base_encode)
+{
+  GstCaps *caps;
+
+  caps = gst_caps_from_string (GST_CODEC_CAPS);
+
+  return caps;
+}
+
+static GstVaapiEncoder *
+gst_vaapiencode_vp8_alloc_encoder (GstVaapiEncode * base,
+    GstVaapiDisplay * display)
+{
+  return gst_vaapi_encoder_vp8_new (display);
+}
+
+static void
+gst_vaapiencode_vp8_class_init (GstVaapiEncodeVP8Class * klass)
+{
+  GObjectClass *const object_class = G_OBJECT_CLASS (klass);
+  GstElementClass *const element_class = GST_ELEMENT_CLASS (klass);
+  GstVaapiEncodeClass *const encode_class = GST_VAAPIENCODE_CLASS (klass);
+
+  GST_DEBUG_CATEGORY_INIT (gst_vaapi_vp8_encode_debug,
+      GST_PLUGIN_NAME, 0, GST_PLUGIN_DESC);
+
+  object_class->finalize = gst_vaapiencode_vp8_finalize;
+  object_class->set_property = gst_vaapiencode_vp8_set_property;
+  object_class->get_property = gst_vaapiencode_vp8_get_property;
+
+  encode_class->get_properties = gst_vaapi_encoder_vp8_get_default_properties;
+  encode_class->get_caps = gst_vaapiencode_vp8_get_caps;
+  encode_class->alloc_encoder = gst_vaapiencode_vp8_alloc_encoder;
+
+  gst_element_class_set_static_metadata (element_class,
+      "VA-API VP8 encoder",
+      "Codec/Encoder/Video",
+      GST_PLUGIN_DESC,
+      "Sreerenj Balachandran <sreerenj.balachandran@intel.com>");
+
+  /* sink pad */
+  gst_element_class_add_pad_template (element_class,
+      gst_static_pad_template_get (&gst_vaapiencode_vp8_sink_factory));
+
+  /* src pad */
+  gst_element_class_add_pad_template (element_class,
+      gst_static_pad_template_get (&gst_vaapiencode_vp8_src_factory));
+
+  gst_vaapiencode_class_init_properties (encode_class);
+}
diff -Nru gstreamer-vaapi-0.5.10/gst/vaapi/gstvaapiencode_vp8.h gstreamer-vaapi-0.6.0/gst/vaapi/gstvaapiencode_vp8.h
--- gstreamer-vaapi-0.5.10/gst/vaapi/gstvaapiencode_vp8.h	1970-01-01 00:00:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst/vaapi/gstvaapiencode_vp8.h	2015-07-15 12:47:43.000000000 +0000
@@ -0,0 +1,69 @@
+/*
+ *  gstvaapiencode_vp8.h - VA-API VP8 encoder
+ *
+ *  Copyright (C) 2015 Intel Corporation
+ *    Author: Sreerenj Balachandran <sreerenj.balachandran@intel.com>
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public License
+ *  as published by the Free Software Foundation; either version 2.1
+ *  of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free
+ *  Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ *  Boston, MA 02110-1301 USA
+ */
+
+#ifndef GST_VAAPIENCODE_VP8_H
+#define GST_VAAPIENCODE_VP8_H
+
+#include <gst/gst.h>
+#include "gstvaapiencode.h"
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_VAAPIENCODE_VP8 \
+    (gst_vaapiencode_vp8_get_type ())
+#define GST_VAAPIENCODE_VP8_CAST(obj) \
+  ((GstVaapiEncodeVP8 *)(obj))
+#define GST_VAAPIENCODE_VP8(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_VAAPIENCODE_VP8, \
+      GstVaapiEncodeVP8))
+#define GST_VAAPIENCODE_VP8_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_VAAPIENCODE_VP8, \
+      GstVaapiEncodeVP8Class))
+#define GST_VAAPIENCODE_VP8_GET_CLASS(obj) \
+  (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_VAAPIENCODE_VP8, \
+      GstVaapiEncodeVP8Class))
+#define GST_IS_VAAPIENCODE_VP8(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_VAAPIENCODE_VP8))
+#define GST_IS_VAAPIENCODE_VP8_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_VAAPIENCODE_VP8))
+
+typedef struct _GstVaapiEncodeVP8 GstVaapiEncodeVP8;
+typedef struct _GstVaapiEncodeVP8Class GstVaapiEncodeVP8Class;
+
+struct _GstVaapiEncodeVP8
+{
+  /*< private >*/
+  GstVaapiEncode parent_instance;
+};
+
+struct _GstVaapiEncodeVP8Class
+{
+  /*< private >*/
+  GstVaapiEncodeClass parent_class;
+};
+
+GType
+gst_vaapiencode_vp8_get_type (void) G_GNUC_CONST;
+
+G_END_DECLS
+
+#endif /* GST_VAAPIENCODE_VP8_H */
diff -Nru gstreamer-vaapi-0.5.10/gst/vaapi/gstvaapiparse.c gstreamer-vaapi-0.6.0/gst/vaapi/gstvaapiparse.c
--- gstreamer-vaapi-0.5.10/gst/vaapi/gstvaapiparse.c	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst/vaapi/gstvaapiparse.c	2015-07-15 12:47:43.000000000 +0000
@@ -20,11 +20,15 @@
  *  Boston, MA 02110-1301 USA
  */
 
-#include "gst/vaapi/sysdeps.h"
+#include "gstcompat.h"
 #include <gst/gst.h>
 #include "gstvaapiparse.h"
 #include "gsth264parse.h"
 
+#if GST_CHECK_VERSION(1,4,0)
+#include "gsth265parse.h"
+#endif
+
 #define PLUGIN_NAME     "vaapiparse"
 #define PLUGIN_DESC     "VA-API based elements"
 #define PLUGIN_LICENSE  "LGPL"
@@ -37,17 +41,14 @@
   failure |= !gst_element_register (plugin, "vaapiparse_h264",
       GST_RANK_PRIMARY + 2, GST_TYPE_H264_PARSE);
 
+#if GST_CHECK_VERSION(1,4,0)
+  failure |= !gst_element_register (plugin, "vaapiparse_h265",
+      GST_RANK_PRIMARY + 2, GST_TYPE_H265_PARSE);
+#endif
+
   return !failure;
 }
 
-#if GST_CHECK_VERSION(1,0,0)
-/* XXX: use PLUGIN_NAME when GST_PLUGIN_DEFINE is fixed to use
-   G_STRINGIFY() for name argument, instead of plain #name */
 GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, GST_VERSION_MINOR,
     vaapiparse, PLUGIN_DESC, plugin_init,
     PACKAGE_VERSION, PLUGIN_LICENSE, PACKAGE, PACKAGE_BUGREPORT)
-#else
-GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, GST_VERSION_MINOR,
-    PLUGIN_NAME, PLUGIN_DESC, plugin_init,
-    PACKAGE_VERSION, PLUGIN_LICENSE, PACKAGE, PACKAGE_BUGREPORT)
-#endif
diff -Nru gstreamer-vaapi-0.5.10/gst/vaapi/gstvaapiparse.h gstreamer-vaapi-0.6.0/gst/vaapi/gstvaapiparse.h
--- gstreamer-vaapi-0.5.10/gst/vaapi/gstvaapiparse.h	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst/vaapi/gstvaapiparse.h	2015-07-15 12:47:43.000000000 +0000
@@ -33,4 +33,15 @@
 #define gst_h264_parse_parent_class     gst_vaapi_h264_parse_parent_class
 #define gst_h264_parse_get_type         gst_vaapi_h264_parse_get_type
 
+/* vaapiparse_h265 */
+#define _GstH265Parse                   _GstVaapiH265Parse
+#define GstH265Parse                    GstVaapiH265Parse
+#define _GstH265ParseClass              _GstVaapiH265ParseClass
+#define GstH265ParseClass               GstVaapiH265ParseClass
+#define gst_h265_parse                  gst_vaapi_h265_parse
+#define gst_h265_parse_init             gst_vaapi_h265_parse_init
+#define gst_h265_parse_class_init       gst_vaapi_h265_parse_class_init
+#define gst_h265_parse_parent_class     gst_vaapi_h265_parse_parent_class
+#define gst_h265_parse_get_type         gst_vaapi_h265_parse_get_type
+
 #endif /* GST_VAAPI_PARSE_H */
diff -Nru gstreamer-vaapi-0.5.10/gst/vaapi/gstvaapipluginbase.c gstreamer-vaapi-0.6.0/gst/vaapi/gstvaapipluginbase.c
--- gstreamer-vaapi-0.5.10/gst/vaapi/gstvaapipluginbase.c	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst/vaapi/gstvaapipluginbase.c	2015-07-15 12:47:43.000000000 +0000
@@ -22,42 +22,19 @@
  *  Boston, MA 02110-1301 USA
  */
 
-#include "gst/vaapi/sysdeps.h"
+#include "gstcompat.h"
 #include <gst/vaapi/gstvaapisurface_drm.h>
 #include <gst/base/gstpushsrc.h>
 #include "gstvaapipluginbase.h"
 #include "gstvaapipluginutil.h"
 #include "gstvaapivideocontext.h"
 #include "gstvaapivideometa.h"
-#if GST_CHECK_VERSION(1,0,0)
 #include "gstvaapivideobufferpool.h"
-#endif
-#if GST_CHECK_VERSION(1,1,0)
 #include <gst/allocators/allocators.h>
-#endif
 
 /* Default debug category is from the subclass */
 #define GST_CAT_DEFAULT (plugin->debug_category)
 
-/* GstImplementsInterface interface */
-#if !GST_CHECK_VERSION(1,0,0)
-static gboolean
-implements_interface_supported (GstImplementsInterface * iface, GType type)
-{
-  GstVaapiPluginBase *const plugin = GST_VAAPI_PLUGIN_BASE (iface);
-
-  if (type == GST_TYPE_VIDEO_CONTEXT)
-    return TRUE;
-  return GST_VAAPI_PLUGIN_BASE_GET_CLASS (plugin)->has_interface (plugin, type);
-}
-
-static void
-implements_interface_init (GstImplementsInterfaceClass * iface)
-{
-  iface->supported = implements_interface_supported;
-}
-#endif
-
 /* GstVideoContext interface */
 static void
 plugin_set_display (GstVaapiPluginBase * plugin, GstVaapiDisplay * display)
@@ -78,7 +55,6 @@
   gst_vaapi_display_unref (display);
 }
 
-#if GST_CHECK_VERSION(1,1,0)
 static void
 plugin_set_context (GstElement * element, GstContext * context)
 {
@@ -88,37 +64,10 @@
   if (gst_vaapi_video_context_get_display (context, &display))
     plugin_set_display (plugin, display);
 }
-#else
-static void
-plugin_set_context (GstVideoContext * context, const gchar * type,
-    const GValue * value)
-{
-  GstVaapiPluginBase *const plugin = GST_VAAPI_PLUGIN_BASE (context);
-  GstVaapiDisplay *display = NULL;
-
-  gst_vaapi_set_display (type, value, &display);
-  plugin_set_display (plugin, display);
-}
-
-static void
-video_context_interface_init (GstVideoContextInterface * iface)
-{
-  iface->set_context = plugin_set_context;
-}
-
-#define GstVideoContextClass GstVideoContextInterface
-#endif
 
 void
 gst_vaapi_plugin_base_init_interfaces (GType g_define_type_id)
 {
-#if !GST_CHECK_VERSION(1,0,0)
-  G_IMPLEMENT_INTERFACE (GST_TYPE_IMPLEMENTS_INTERFACE,
-      implements_interface_init);
-#endif
-#if !GST_CHECK_VERSION(1,1,0)
-  G_IMPLEMENT_INTERFACE (GST_TYPE_VIDEO_CONTEXT, video_context_interface_init);
-#endif
 }
 
 static gboolean
@@ -158,7 +107,6 @@
   return TRUE;
 }
 
-#if GST_CHECK_VERSION(1,1,0)
 static gboolean
 is_dma_buffer (GstBuffer * buf)
 {
@@ -222,7 +170,6 @@
   GST_ERROR ("failed to create VA surface proxy from wrapped VA surface");
   return FALSE;
 }
-#endif
 
 void
 gst_vaapi_plugin_base_class_init (GstVaapiPluginBaseClass * klass)
@@ -230,10 +177,8 @@
   klass->has_interface = default_has_interface;
   klass->display_changed = default_display_changed;
 
-#if GST_CHECK_VERSION(1,1,0)
   GstElementClass *const element_class = GST_ELEMENT_CLASS (klass);
   element_class->set_context = GST_DEBUG_FUNCPTR (plugin_set_context);
-#endif
 }
 
 void
@@ -295,17 +240,16 @@
 {
   g_clear_object (&plugin->uploader);
   gst_vaapi_display_replace (&plugin->display, NULL);
+  gst_object_replace (&plugin->gl_context, NULL);
 
   gst_caps_replace (&plugin->sinkpad_caps, NULL);
   plugin->sinkpad_caps_changed = FALSE;
   gst_video_info_init (&plugin->sinkpad_info);
-#if GST_CHECK_VERSION(1,0,0)
   if (plugin->sinkpad_buffer_pool) {
     gst_object_unref (plugin->sinkpad_buffer_pool);
     plugin->sinkpad_buffer_pool = NULL;
   }
   g_clear_object (&plugin->srcpad_buffer_pool);
-#endif
 
   gst_caps_replace (&plugin->srcpad_caps, NULL);
   plugin->srcpad_caps_changed = FALSE;
@@ -313,6 +257,35 @@
 }
 
 /**
+ * gst_vaapi_plugin_base_has_display_type:
+ * @plugin: a #GstVaapiPluginBase
+ * @display_type_req: the desired #GstVaapiDisplayType
+ *
+ * Checks whether the @plugin elements already has a #GstVaapiDisplay
+ * instance compatible with type @display_type_req.
+ *
+ * Return value: %TRUE if @plugin has a compatible display, %FALSE otherwise
+ */
+gboolean
+gst_vaapi_plugin_base_has_display_type (GstVaapiPluginBase * plugin,
+    GstVaapiDisplayType display_type_req)
+{
+  GstVaapiDisplayType display_type;
+
+  if (!plugin->display)
+    return FALSE;
+
+  display_type = plugin->display_type;
+  if (gst_vaapi_display_type_is_compatible (display_type, display_type_req))
+    return TRUE;
+
+  display_type = gst_vaapi_display_get_class_type (plugin->display);
+  if (gst_vaapi_display_type_is_compatible (display_type, display_type_req))
+    return TRUE;
+  return FALSE;
+}
+
+/**
  * gst_vaapi_plugin_base_set_display_type:
  * @plugin: a #GstVaapiPluginBase
  * @display_type: the new request #GstVaapiDisplayType
@@ -356,13 +329,12 @@
 gboolean
 gst_vaapi_plugin_base_ensure_display (GstVaapiPluginBase * plugin)
 {
-  if (plugin->display
-      && gst_vaapi_display_type_is_compatible (plugin->display_type,
-          plugin->display_type_req))
+  if (gst_vaapi_plugin_base_has_display_type (plugin, plugin->display_type_req))
     return TRUE;
   gst_vaapi_display_replace (&plugin->display, NULL);
 
-  if (!gst_vaapi_ensure_display (plugin, plugin->display_type_req))
+  if (!gst_vaapi_ensure_display (GST_ELEMENT (plugin),
+          plugin->display_type_req))
     return FALSE;
   plugin->display_type = gst_vaapi_display_get_display_type (plugin->display);
 
@@ -405,27 +377,46 @@
   gboolean is_dmabuf_capable = FALSE;
   gint v;
 
-  do {
+  gst_object_ref (pad);
+
+  for (;;) {
     other_pad = gst_pad_get_peer (pad);
+    gst_object_unref (pad);
     if (!other_pad)
       break;
 
     element = gst_pad_get_parent_element (other_pad);
-    if (!element || !GST_IS_PUSH_SRC (element))
+    gst_object_unref (other_pad);
+    if (!element)
       break;
 
-    element_name = gst_element_get_name (element);
-    if (!element_name || sscanf (element_name, "v4l2src%d", &v) != 1)
+    if (GST_IS_PUSH_SRC (element)) {
+      element_name = gst_element_get_name (element);
+      if (!element_name || sscanf (element_name, "v4l2src%d", &v) != 1)
+        break;
+
+      v = 0;
+      g_object_get (element, "io-mode", &v, NULL);
+      is_dmabuf_capable = v == 5;       /* "dmabuf-import" enum value */
+      break;
+    } else if (GST_IS_BASE_TRANSFORM (element)) {
+      element_name = gst_element_get_name (element);
+      if (!element_name || sscanf (element_name, "capsfilter%d", &v) != 1)
+        break;
+
+      pad = gst_element_get_static_pad (element, "sink");
+      if (!pad)
+        break;
+    } else
       break;
 
-    v = 0;
-    g_object_get (element, "io-mode", &v, NULL);
-    is_dmabuf_capable = v == 5; /* "dmabuf-import" enum value */
-  } while (0);
+    g_free (element_name);
+    element_name = NULL;
+    g_clear_object (&element);
+  }
 
   g_free (element_name);
   g_clear_object (&element);
-  g_clear_object (&other_pad);
   return is_dmabuf_capable;
 }
 
@@ -442,7 +433,6 @@
 static gboolean
 ensure_sinkpad_buffer_pool (GstVaapiPluginBase * plugin, GstCaps * caps)
 {
-#if GST_CHECK_VERSION(1,0,0)
   GstBufferPool *pool;
   GstCaps *pool_caps;
   GstStructure *config;
@@ -499,9 +489,6 @@
     gst_object_unref (pool);
     return FALSE;
   }
-#else
-  return TRUE;
-#endif
 }
 
 /**
@@ -556,7 +543,6 @@
  *
  * Returns: %TRUE if successful, %FALSE otherwise.
  */
-#if GST_CHECK_VERSION(1,0,0)
 gboolean
 gst_vaapi_plugin_base_propose_allocation (GstVaapiPluginBase * plugin,
     GstQuery * query)
@@ -601,7 +587,22 @@
     return FALSE;
   }
 }
-#endif
+
+/* XXXX: GStreamer 1.2 doesn't check, in gst_buffer_pool_set_config()
+   if the config option is already set */
+static inline gboolean
+gst_vaapi_plugin_base_set_pool_config (GstBufferPool * pool,
+    const gchar * option)
+{
+  GstStructure *config;
+
+  config = gst_buffer_pool_get_config (pool);
+  if (!gst_buffer_pool_config_has_option (config, option)) {
+    gst_buffer_pool_config_add_option (config, option);
+    return gst_buffer_pool_set_config (pool, config);
+  }
+  return TRUE;
+}
 
 /**
  * gst_vaapi_plugin_base_decide_allocation:
@@ -614,7 +615,6 @@
  *
  * Returns: %TRUE if successful, %FALSE otherwise.
  */
-#if GST_CHECK_VERSION(1,0,0)
 gboolean
 gst_vaapi_plugin_base_decide_allocation (GstVaapiPluginBase * plugin,
     GstQuery * query, guint feature)
@@ -624,16 +624,21 @@
   GstStructure *config;
   GstVideoInfo vi;
   guint size, min, max;
-  gboolean need_pool, update_pool;
+  gboolean update_pool = FALSE;
   gboolean has_video_meta = FALSE;
   gboolean has_video_alignment = FALSE;
-#if GST_CHECK_VERSION(1,1,0) && USE_GLX
+#if (USE_GLX || USE_EGL)
   gboolean has_texture_upload_meta = FALSE;
+  guint idx;
 #endif
 
   g_return_val_if_fail (plugin->display != NULL, FALSE);
 
-  gst_query_parse_allocation (query, &caps, &need_pool);
+  gst_query_parse_allocation (query, &caps, NULL);
+
+  /* We don't need any GL context beyond this point if not requested
+     so explicitly through GstVideoGLTextureUploadMeta */
+  gst_object_replace (&plugin->gl_context, NULL);
 
   if (!caps)
     goto error_no_caps;
@@ -641,16 +646,39 @@
   if (!feature)
     feature =
         gst_vaapi_find_preferred_caps_feature (plugin->srcpad,
-        GST_VIDEO_FORMAT_ENCODED);
+        GST_VIDEO_FORMAT_ENCODED, NULL);
 
   has_video_meta = gst_query_find_allocation_meta (query,
       GST_VIDEO_META_API_TYPE, NULL);
 
-#if GST_CHECK_VERSION(1,1,0) && USE_GLX
+#if (USE_GLX || USE_EGL)
   has_texture_upload_meta = gst_query_find_allocation_meta (query,
-      GST_VIDEO_GL_TEXTURE_UPLOAD_META_API_TYPE, NULL);
+      GST_VIDEO_GL_TEXTURE_UPLOAD_META_API_TYPE, &idx) &&
+      (feature == GST_VAAPI_CAPS_FEATURE_GL_TEXTURE_UPLOAD_META);
+
+#if USE_GST_GL_HELPERS
+  if (has_texture_upload_meta) {
+    const GstStructure *params;
+    GstObject *gl_context;
+
+    gst_query_parse_nth_allocation_meta (query, idx, &params);
+    if (params) {
+      if (gst_structure_get (params, "gst.gl.GstGLContext", GST_GL_TYPE_CONTEXT,
+              &gl_context, NULL) && gl_context) {
+        gst_vaapi_plugin_base_set_gl_context (plugin, gl_context);
+        gst_object_unref (gl_context);
+      }
+    }
+  }
+#endif
 #endif
 
+  /* Make sure the display we pass down to the buffer pool is actually
+     the expected one, especially when the downstream element requires
+     a GLX or EGL display */
+  if (!gst_vaapi_plugin_base_ensure_display (plugin))
+    goto error_ensure_display;
+
   gst_video_info_init (&vi);
   gst_video_info_from_caps (&vi, caps);
   if (GST_VIDEO_INFO_FORMAT (&vi) == GST_VIDEO_FORMAT_ENCODED)
@@ -659,25 +687,25 @@
 
   if (gst_query_get_n_allocation_pools (query) > 0) {
     gst_query_parse_nth_allocation_pool (query, 0, &pool, &size, &min, &max);
-    size = MAX (size, vi.size);
     update_pool = TRUE;
-
-    /* Check whether downstream element proposed a bufferpool but did
-       not provide a correct propose_allocation() implementation */
-    has_video_alignment = gst_buffer_pool_has_option (pool,
-        GST_BUFFER_POOL_OPTION_VIDEO_ALIGNMENT);
+    size = MAX (size, vi.size);
+    if (pool) {
+      /* Check whether downstream element proposed a bufferpool but did
+         not provide a correct propose_allocation() implementation */
+      has_video_alignment = gst_buffer_pool_has_option (pool,
+          GST_BUFFER_POOL_OPTION_VIDEO_ALIGNMENT);
+    }
   } else {
     pool = NULL;
     size = vi.size;
     min = max = 0;
-    update_pool = FALSE;
   }
 
   /* GstVaapiVideoMeta is mandatory, and this implies VA surface memory */
   if (!pool || !gst_buffer_pool_has_option (pool,
           GST_BUFFER_POOL_OPTION_VAAPI_VIDEO_META)) {
-    GST_INFO_OBJECT (plugin, "no pool or doesn't support GstVaapiVideoMeta, "
-        "making new pool");
+    GST_INFO_OBJECT (plugin, "%s. Making a new pool", pool == NULL ? "No pool" :
+        "Pool hasn't GstVaapiVideoMeta");
     if (pool)
       gst_object_unref (pool);
     pool = gst_vaapi_video_buffer_pool_new (plugin->display);
@@ -688,35 +716,27 @@
     gst_buffer_pool_config_set_params (config, caps, size, min, max);
     gst_buffer_pool_config_add_option (config,
         GST_BUFFER_POOL_OPTION_VAAPI_VIDEO_META);
-    gst_buffer_pool_set_config (pool, config);
+    if (!gst_buffer_pool_set_config (pool, config))
+      goto config_failed;
   }
 
   /* Check whether GstVideoMeta, or GstVideoAlignment, is needed (raw video) */
   if (has_video_meta) {
-    config = gst_buffer_pool_get_config (pool);
-    gst_buffer_pool_config_add_option (config,
-        GST_BUFFER_POOL_OPTION_VIDEO_META);
-#if GST_CHECK_VERSION(1,1,0) && USE_GLX
-    if (has_texture_upload_meta)
-      gst_buffer_pool_config_add_option (config,
-          GST_BUFFER_POOL_OPTION_VIDEO_GL_TEXTURE_UPLOAD_META);
-#endif
-    gst_buffer_pool_set_config (pool, config);
+    if (!gst_vaapi_plugin_base_set_pool_config (pool,
+            GST_BUFFER_POOL_OPTION_VIDEO_META))
+      goto config_failed;
   } else if (has_video_alignment) {
-    config = gst_buffer_pool_get_config (pool);
-    gst_buffer_pool_config_add_option (config,
-        GST_BUFFER_POOL_OPTION_VIDEO_ALIGNMENT);
-    gst_buffer_pool_set_config (pool, config);
+    if (!gst_vaapi_plugin_base_set_pool_config (pool,
+            GST_BUFFER_POOL_OPTION_VIDEO_ALIGNMENT))
+      goto config_failed;
   }
 
   /* GstVideoGLTextureUploadMeta (OpenGL) */
-#if GST_CHECK_VERSION(1,1,0) && USE_GLX
-  if (feature == GST_VAAPI_CAPS_FEATURE_GL_TEXTURE_UPLOAD_META
-      && !has_texture_upload_meta) {
-    config = gst_buffer_pool_get_config (pool);
-    gst_buffer_pool_config_add_option (config,
-        GST_BUFFER_POOL_OPTION_VIDEO_GL_TEXTURE_UPLOAD_META);
-    gst_buffer_pool_set_config (pool, config);
+#if (USE_GLX || USE_EGL)
+  if (has_texture_upload_meta) {
+    if (!gst_vaapi_plugin_base_set_pool_config (pool,
+            GST_BUFFER_POOL_OPTION_VIDEO_GL_TEXTURE_UPLOAD_META))
+      goto config_failed;
   }
 #endif
 
@@ -735,13 +755,27 @@
     GST_ERROR_OBJECT (plugin, "no caps specified");
     return FALSE;
   }
+error_ensure_display:
+  {
+    GST_ERROR_OBJECT (plugin, "failed to ensure display of type %d",
+        plugin->display_type_req);
+    return FALSE;
+  }
 error_create_pool:
   {
     GST_ERROR_OBJECT (plugin, "failed to create buffer pool");
     return FALSE;
   }
+config_failed:
+  {
+    if (pool)
+      gst_object_unref (pool);
+    GST_ELEMENT_ERROR (plugin, RESOURCE, SETTINGS,
+        ("Failed to configure the buffer pool"),
+        ("Configuration is most likely invalid, please report this issue."));
+    return FALSE;
+  }
 }
-#endif
 
 /**
  * gst_vaapi_plugin_base_allocate_input_buffer:
@@ -805,16 +839,13 @@
 {
   GstVaapiVideoMeta *meta;
   GstBuffer *outbuf;
-#if GST_CHECK_VERSION(1,0,0)
   GstVideoFrame src_frame, out_frame;
   gboolean success;
-#endif
 
   g_return_val_if_fail (inbuf != NULL, GST_FLOW_ERROR);
   g_return_val_if_fail (outbuf_ptr != NULL, GST_FLOW_ERROR);
 
   meta = gst_buffer_get_vaapi_video_meta (inbuf);
-#if GST_CHECK_VERSION(1,0,0)
   if (meta) {
     *outbuf_ptr = gst_buffer_ref (inbuf);
     return GST_FLOW_OK;
@@ -834,13 +865,11 @@
           &outbuf, NULL) != GST_FLOW_OK)
     goto error_create_buffer;
 
-#if GST_CHECK_VERSION(1,1,0)
   if (is_dma_buffer (inbuf)) {
     if (!plugin_bind_dma_to_vaapi_buffer (plugin, inbuf, outbuf))
       goto error_bind_dma_buffer;
     goto done;
   }
-#endif
 
   if (!gst_video_frame_map (&src_frame, &plugin->sinkpad_info, inbuf,
           GST_MAP_READ))
@@ -865,12 +894,14 @@
   /* ERRORS */
 error_no_pool:
   {
-    GST_ERROR ("no buffer pool was negotiated");
+    GST_ELEMENT_ERROR (plugin, STREAM, FAILED,
+        ("no buffer pool was negotiated"), ("no buffer pool was negotiated"));
     return GST_FLOW_ERROR;
   }
 error_active_pool:
   {
-    GST_ERROR ("failed to activate buffer pool");
+    GST_ELEMENT_ERROR (plugin, STREAM, FAILED,
+        ("failed to activate buffer pool"), ("failed to activate buffer pool"));
     return GST_FLOW_ERROR;
   }
 error_map_dst_buffer:
@@ -884,40 +915,25 @@
     gst_buffer_unref (outbuf);
     return GST_FLOW_NOT_SUPPORTED;
   }
-#else
-  if (meta)
-    outbuf = gst_buffer_ref (inbuf);
-  else if (plugin->sinkpad_caps_is_raw) {
-    outbuf = gst_vaapi_uploader_get_buffer (plugin->uploader);
-    if (!outbuf)
-      goto error_create_buffer;
-    gst_buffer_copy_metadata (outbuf, inbuf,
-        GST_BUFFER_COPY_FLAGS | GST_BUFFER_COPY_TIMESTAMPS);
-  } else
-    goto error_invalid_buffer;
-
-  if (plugin->sinkpad_caps_is_raw &&
-      !gst_vaapi_uploader_process (plugin->uploader, inbuf, outbuf))
-    goto error_copy_buffer;
-
-  *outbuf_ptr = outbuf;
-  return GST_FLOW_OK;
-#endif
 
   /* ERRORS */
 error_invalid_buffer:
   {
-    GST_ERROR ("failed to validate source buffer");
+    GST_ELEMENT_ERROR (plugin, STREAM, FAILED,
+        ("failed to validate source buffer"),
+        ("failed to validate source buffer"));
     return GST_FLOW_ERROR;
   }
 error_create_buffer:
   {
-    GST_ERROR ("failed to create buffer");
+    GST_ELEMENT_ERROR (plugin, STREAM, FAILED, ("Allocation failed"),
+        ("failed to create buffer"));
     return GST_FLOW_ERROR;
   }
 error_bind_dma_buffer:
   {
-    GST_ERROR ("failed to bind dma_buf to VA surface buffer");
+    GST_ELEMENT_ERROR (plugin, STREAM, FAILED, ("Allocation failed"),
+        ("failed to bind dma_buf to VA surface buffer"));
     gst_buffer_unref (outbuf);
     return GST_FLOW_ERROR;
   }
@@ -928,3 +944,42 @@
     return GST_FLOW_NOT_SUPPORTED;
   }
 }
+
+/**
+ * gst_vaapi_plugin_base_set_gl_context:
+ * @plugin: a #GstVaapiPluginBase
+ * @object: the new GL context from downstream
+ *
+ * Registers the new GL context. The change is effective at the next
+ * call to gst_vaapi_plugin_base_ensure_display(), where the
+ * underlying display object could be re-allocated to fit the GL
+ * context needs
+ */
+void
+gst_vaapi_plugin_base_set_gl_context (GstVaapiPluginBase * plugin,
+    GstObject * object)
+{
+#if USE_GST_GL_HELPERS
+  GstGLContext *const gl_context = GST_GL_CONTEXT (object);
+  GstVaapiDisplayType display_type;
+
+  gst_object_replace (&plugin->gl_context, object);
+
+  switch (gst_gl_context_get_gl_platform (gl_context)) {
+#if USE_GLX
+    case GST_GL_PLATFORM_GLX:
+      display_type = GST_VAAPI_DISPLAY_TYPE_GLX;
+      break;
+#endif
+#if USE_EGL
+    case GST_GL_PLATFORM_EGL:
+      display_type = GST_VAAPI_DISPLAY_TYPE_EGL;
+      break;
+#endif
+    default:
+      display_type = plugin->display_type;
+      break;
+  }
+  gst_vaapi_plugin_base_set_display_type (plugin, display_type);
+#endif
+}
diff -Nru gstreamer-vaapi-0.5.10/gst/vaapi/gstvaapipluginbase.h gstreamer-vaapi-0.6.0/gst/vaapi/gstvaapipluginbase.h
--- gstreamer-vaapi-0.5.10/gst/vaapi/gstvaapipluginbase.h	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst/vaapi/gstvaapipluginbase.h	2015-07-15 12:47:43.000000000 +0000
@@ -32,6 +32,10 @@
 #include <gst/vaapi/gstvaapidisplay.h>
 #include "gstvaapiuploader.h"
 
+#ifdef HAVE_GST_GL_GL_H
+# include <gst/gl/gstglcontext.h>
+#endif
+
 G_BEGIN_DECLS
 
 typedef struct _GstVaapiPluginBase GstVaapiPluginBase;
@@ -126,25 +130,23 @@
   gboolean sinkpad_caps_is_raw;
   GstVideoInfo sinkpad_info;
   GstPadQueryFunction sinkpad_query;
-#if GST_CHECK_VERSION(1,0,0)
   GstBufferPool *sinkpad_buffer_pool;
   guint sinkpad_buffer_size;
-#endif
 
   GstPad *srcpad;
   GstCaps *srcpad_caps;
   gboolean srcpad_caps_changed;
   GstVideoInfo srcpad_info;
   GstPadQueryFunction srcpad_query;
-#if GST_CHECK_VERSION(1,0,0)
   GstBufferPool *srcpad_buffer_pool;
-#endif
 
   GstVaapiDisplay *display;
   GstVaapiDisplayType display_type;
   GstVaapiDisplayType display_type_req;
   gchar *display_name;
 
+  GstObject *gl_context;
+
   GstVaapiUploader *uploader;
   gboolean uploader_used;
 };
@@ -191,6 +193,11 @@
 gst_vaapi_plugin_base_close (GstVaapiPluginBase * plugin);
 
 G_GNUC_INTERNAL
+gboolean
+gst_vaapi_plugin_base_has_display_type (GstVaapiPluginBase * plugin,
+    GstVaapiDisplayType display_type_req);
+
+G_GNUC_INTERNAL
 void
 gst_vaapi_plugin_base_set_display_type (GstVaapiPluginBase * plugin,
     GstVaapiDisplayType display_type);
@@ -233,6 +240,11 @@
 gst_vaapi_plugin_base_get_input_buffer (GstVaapiPluginBase * plugin,
     GstBuffer * inbuf, GstBuffer ** outbuf_ptr);
 
+G_GNUC_INTERNAL
+void
+gst_vaapi_plugin_base_set_gl_context (GstVaapiPluginBase * plugin,
+    GstObject * object);
+
 G_END_DECLS
 
 #endif /* GST_VAAPI_PLUGIN_BASE_H */
diff -Nru gstreamer-vaapi-0.5.10/gst/vaapi/gstvaapipluginutil.c gstreamer-vaapi-0.6.0/gst/vaapi/gstvaapipluginutil.c
--- gstreamer-vaapi-0.5.10/gst/vaapi/gstvaapipluginutil.c	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst/vaapi/gstvaapipluginutil.c	2015-07-15 12:47:43.000000000 +0000
@@ -22,7 +22,7 @@
  *  Boston, MA 02110-1301 USA
  */
 
-#include "gst/vaapi/sysdeps.h"
+#include "gstcompat.h"
 #include "gstvaapivideocontext.h"
 #if USE_DRM
 # include <gst/vaapi/gstvaapidisplay_drm.h>
@@ -33,6 +33,9 @@
 #if USE_GLX
 # include <gst/vaapi/gstvaapidisplay_glx.h>
 #endif
+#if USE_EGL
+# include <gst/vaapi/gstvaapidisplay_egl.h>
+#endif
 #if USE_WAYLAND
 # include <gst/vaapi/gstvaapidisplay_wayland.h>
 #endif
@@ -58,36 +61,48 @@
   NULL
 };
 
+typedef GstVaapiDisplay *(*GstVaapiDisplayCreateFunc) (const gchar *);
+typedef GstVaapiDisplay *(*GstVaapiDisplayCreateFromHandleFunc) (gpointer);
+
 typedef struct
 {
   const gchar *type_str;
   GstVaapiDisplayType type;
-  GstVaapiDisplay *(*create_display) (const gchar *);
+  GstVaapiDisplayCreateFunc create_display;
+  GstVaapiDisplayCreateFromHandleFunc create_display_from_handle;
 } DisplayMap;
 
+/* *INDENT-OFF* */
 static const DisplayMap g_display_map[] = {
 #if USE_WAYLAND
   {"wayland",
-        GST_VAAPI_DISPLAY_TYPE_WAYLAND,
-      gst_vaapi_display_wayland_new},
+   GST_VAAPI_DISPLAY_TYPE_WAYLAND,
+   gst_vaapi_display_wayland_new,
+   (GstVaapiDisplayCreateFromHandleFunc)
+   gst_vaapi_display_wayland_new_with_display},
 #endif
 #if USE_GLX
   {"glx",
-        GST_VAAPI_DISPLAY_TYPE_GLX,
-      gst_vaapi_display_glx_new},
+   GST_VAAPI_DISPLAY_TYPE_GLX,
+   gst_vaapi_display_glx_new,
+   (GstVaapiDisplayCreateFromHandleFunc)
+   gst_vaapi_display_glx_new_with_display},
 #endif
 #if USE_X11
   {"x11",
-        GST_VAAPI_DISPLAY_TYPE_X11,
-      gst_vaapi_display_x11_new},
+   GST_VAAPI_DISPLAY_TYPE_X11,
+   gst_vaapi_display_x11_new,
+   (GstVaapiDisplayCreateFromHandleFunc)
+   gst_vaapi_display_x11_new_with_display},
 #endif
 #if USE_DRM
   {"drm",
-        GST_VAAPI_DISPLAY_TYPE_DRM,
-      gst_vaapi_display_drm_new},
+   GST_VAAPI_DISPLAY_TYPE_DRM,
+   gst_vaapi_display_drm_new},
 #endif
   {NULL,}
 };
+/* *INDENT-ON* */
 
 static GstVaapiDisplay *
 gst_vaapi_create_display (GstVaapiDisplayType display_type,
@@ -107,105 +122,161 @@
   return display;
 }
 
-gboolean
-gst_vaapi_ensure_display (gpointer element, GstVaapiDisplayType type)
+static GstVaapiDisplay *
+gst_vaapi_create_display_from_handle (GstVaapiDisplayType display_type,
+    gpointer handle)
 {
-  GstVaapiPluginBase *const plugin = GST_VAAPI_PLUGIN_BASE (element);
   GstVaapiDisplay *display;
-  GstVideoContext *context;
-
-  g_return_val_if_fail (GST_IS_VIDEO_CONTEXT (element), FALSE);
-
-  context = GST_VIDEO_CONTEXT (element);
-  g_return_val_if_fail (context != NULL, FALSE);
-
-  gst_vaapi_video_context_prepare (context, display_types);
-
-  /* Neighbour found and it updated the display */
-  if (plugin->display
-      && gst_vaapi_display_type_is_compatible (plugin->display_type, type))
-    return TRUE;
+  const DisplayMap *m;
 
-  /* If no neighboor, or application not interested, use system default */
-  display = gst_vaapi_create_display (type, plugin->display_name);
-  if (!display)
-    return FALSE;
+  if (display_type == GST_VAAPI_DISPLAY_TYPE_ANY)
+    return NULL;
 
-  gst_vaapi_video_context_propagate (context, display);
-  GST_VAAPI_PLUGIN_BASE_DISPLAY_REPLACE (plugin, display);
-  gst_vaapi_display_unref (display);
-  return TRUE;
+  for (m = g_display_map; m->type_str != NULL; m++) {
+    if (m->type == display_type) {
+      display = m->create_display_from_handle ?
+          m->create_display_from_handle (handle) : NULL;
+      return display;
+    }
+  }
+  return NULL;
 }
 
-void
-gst_vaapi_set_display (const gchar * type,
-    const GValue * value, GstVaapiDisplay ** display_ptr)
+static GstVaapiDisplay *
+gst_vaapi_create_display_from_gl_context (GstObject * gl_context_object)
 {
-  GstVaapiDisplay *display = NULL;
+#if USE_GST_GL_HELPERS
+  GstGLContext *const gl_context = GST_GL_CONTEXT (gl_context_object);
+  GstGLDisplay *const gl_display = gst_gl_context_get_display (gl_context);
+  gpointer native_display =
+      GSIZE_TO_POINTER (gst_gl_display_get_handle (gl_display));
+  GstVaapiDisplay *display, *out_display;
+  GstVaapiDisplayType display_type;
 
-  if (!strcmp (type, "vaapi-display")) {
-    g_return_if_fail (G_VALUE_HOLDS_POINTER (value));
-    display = gst_vaapi_display_new_with_display (g_value_get_pointer (value));
-  } else if (!strcmp (type, "gst-vaapi-display")) {
-    g_return_if_fail (G_VALUE_HOLDS_POINTER (value));
-    display = gst_vaapi_display_ref (g_value_get_pointer (value));
-  }
-#if USE_DRM
-  else if (!strcmp (type, "drm-device")) {
-    gint device;
-    g_return_if_fail (G_VALUE_HOLDS_INT (value));
-    device = g_value_get_int (value);
-    display = gst_vaapi_display_drm_new_with_device (device);
-  } else if (!strcmp (type, "drm-device-path")) {
-    const gchar *device_path;
-    g_return_if_fail (G_VALUE_HOLDS_STRING (value));
-    device_path = g_value_get_string (value);
-    display = gst_vaapi_display_drm_new (device_path);
-  }
+  switch (gst_gl_display_get_handle_type (gl_display)) {
+#if USE_X11
+    case GST_GL_DISPLAY_TYPE_X11:
+      display_type = GST_VAAPI_DISPLAY_TYPE_X11;
+      break;
 #endif
+#if USE_WAYLAND
+    case GST_GL_DISPLAY_TYPE_WAYLAND:
+      display_type = GST_VAAPI_DISPLAY_TYPE_WAYLAND;
+      break;
+#endif
+    case GST_GL_DISPLAY_TYPE_ANY:{
+      /* Derive from the active window */
+      GstGLWindow *const gl_window = gst_gl_context_get_window (gl_context);
+      const gchar *const gl_window_type = g_getenv ("GST_GL_WINDOW");
+
+      display_type = GST_VAAPI_DISPLAY_TYPE_ANY;
+      if (!gl_window)
+        break;
+      native_display = GSIZE_TO_POINTER (gst_gl_window_get_display (gl_window));
+
+      if (gl_window_type) {
 #if USE_X11
-  else if (!strcmp (type, "x11-display-name")) {
-    g_return_if_fail (G_VALUE_HOLDS_STRING (value));
-#if USE_GLX
-    display = gst_vaapi_display_glx_new (g_value_get_string (value));
+        if (!display_type && g_strcmp0 (gl_window_type, "x11") == 0)
+          display_type = GST_VAAPI_DISPLAY_TYPE_X11;
 #endif
-    if (!display)
-      display = gst_vaapi_display_x11_new (g_value_get_string (value));
-  } else if (!strcmp (type, "x11-display")) {
-    g_return_if_fail (G_VALUE_HOLDS_POINTER (value));
-#if USE_GLX
-    display =
-        gst_vaapi_display_glx_new_with_display (g_value_get_pointer (value));
+#if USE_WAYLAND
+        if (!display_type && g_strcmp0 (gl_window_type, "wayland") == 0)
+          display_type = GST_VAAPI_DISPLAY_TYPE_WAYLAND;
 #endif
-    if (!display)
-      display =
-          gst_vaapi_display_x11_new_with_display (g_value_get_pointer (value));
-  }
+      } else {
+#if USE_X11
+        if (!display_type && GST_GL_HAVE_WINDOW_X11)
+          display_type = GST_VAAPI_DISPLAY_TYPE_X11;
 #endif
 #if USE_WAYLAND
-  else if (!strcmp (type, "wl-display")) {
-    struct wl_display *wl_display;
-    g_return_if_fail (G_VALUE_HOLDS_POINTER (value));
-    wl_display = g_value_get_pointer (value);
-    display = gst_vaapi_display_wayland_new_with_display (wl_display);
-  } else if (!strcmp (type, "wl-display-name")) {
-    const gchar *display_name;
-    g_return_if_fail (G_VALUE_HOLDS_STRING (value));
-    display_name = g_value_get_string (value);
-    display = gst_vaapi_display_wayland_new (display_name);
-  }
+        if (!display_type && GST_GL_HAVE_WINDOW_WAYLAND)
+          display_type = GST_VAAPI_DISPLAY_TYPE_WAYLAND;
 #endif
+      }
+      break;
+    }
+    default:
+      display_type = GST_VAAPI_DISPLAY_TYPE_ANY;
+      break;
+  }
+  if (!display_type)
+    return NULL;
 
-  if (display) {
-    gst_vaapi_display_replace (display_ptr, display);
-    gst_vaapi_display_unref (display);
+  display = gst_vaapi_create_display_from_handle (display_type, native_display);
+  if (!display)
+    return NULL;
+
+  switch (gst_gl_context_get_gl_platform (gl_context)) {
+#if USE_EGL
+    case GST_GL_PLATFORM_EGL:{
+      guint gles_version;
+
+      switch (gst_gl_context_get_gl_api (gl_context)) {
+        case GST_GL_API_GLES1:
+          gles_version = 1;
+          goto create_egl_display;
+        case GST_GL_API_GLES2:
+          gles_version = 2;
+          goto create_egl_display;
+        case GST_GL_API_OPENGL:
+        case GST_GL_API_OPENGL3:
+          gles_version = 0;
+        create_egl_display:
+          out_display = gst_vaapi_display_egl_new (display, gles_version);
+          break;
+        default:
+          out_display = NULL;
+          break;
+      }
+      if (!out_display)
+        return NULL;
+      gst_vaapi_display_egl_set_gl_context (GST_VAAPI_DISPLAY_EGL (out_display),
+          GSIZE_TO_POINTER (gst_gl_context_get_gl_context (gl_context)));
+      break;
+    }
+#endif
+    default:
+      out_display = gst_vaapi_display_ref (display);
+      break;
   }
+  gst_vaapi_display_unref (display);
+  return out_display;
+#endif
+  GST_ERROR ("unsupported GStreamer version %s", GST_API_VERSION_S);
+  return NULL;
+}
+
+gboolean
+gst_vaapi_ensure_display (GstElement * element, GstVaapiDisplayType type)
+{
+  GstVaapiPluginBase *const plugin = GST_VAAPI_PLUGIN_BASE (element);
+  GstVaapiDisplay *display;
+
+  g_return_val_if_fail (GST_IS_ELEMENT (element), FALSE);
+
+  gst_vaapi_video_context_prepare (element, display_types);
+
+  /* Neighbour found and it updated the display */
+  if (gst_vaapi_plugin_base_has_display_type (plugin, type))
+    return TRUE;
+
+  /* If no neighboor, or application not interested, use system default */
+  if (plugin->gl_context)
+    display = gst_vaapi_create_display_from_gl_context (plugin->gl_context);
+  else
+    display = gst_vaapi_create_display (type, plugin->display_name);
+  if (!display)
+    return FALSE;
+
+  gst_vaapi_video_context_propagate (element, display);
+  GST_VAAPI_PLUGIN_BASE_DISPLAY_REPLACE (plugin, display);
+  gst_vaapi_display_unref (display);
+  return TRUE;
 }
 
 gboolean
 gst_vaapi_reply_to_query (GstQuery * query, GstVaapiDisplay * display)
 {
-#if GST_CHECK_VERSION(1,1,0)
   const gchar *type = NULL;
   GstContext *context;
 
@@ -226,88 +297,6 @@
   gst_context_unref (context);
 
   return TRUE;
-#else
-  GstVaapiDisplayType display_type;
-  const gchar **types;
-  const gchar *type;
-  gint i;
-  gboolean res = FALSE;
-
-  if (GST_QUERY_TYPE (query) != GST_QUERY_CUSTOM)
-    return FALSE;
-
-  if (!display)
-    return FALSE;
-
-  types = gst_video_context_query_get_supported_types (query);
-
-  if (!types)
-    return FALSE;
-
-  display_type = gst_vaapi_display_get_display_type (display);
-  for (i = 0; types[i] && !res; i++) {
-    type = types[i];
-
-    res = TRUE;
-    if (!strcmp (type, "gst-vaapi-display")) {
-      gst_video_context_query_set_pointer (query, type, display);
-    } else if (!strcmp (type, "vaapi-display")) {
-      VADisplay vadpy = gst_vaapi_display_get_display (display);
-      gst_video_context_query_set_pointer (query, type, vadpy);
-    } else {
-      switch (display_type) {
-#if USE_DRM
-        case GST_VAAPI_DISPLAY_TYPE_DRM:{
-          GstVaapiDisplayDRM *const drm_dpy = GST_VAAPI_DISPLAY_DRM (display);
-          if (!strcmp (type, "drm-device-path"))
-            gst_video_context_query_set_string (query, type,
-                gst_vaapi_display_drm_get_device_path (drm_dpy));
-#if 0
-          /* XXX: gst_video_context_query_set_int() does not exist yet */
-          else if (!strcmp (type, "drm-device"))
-            gst_video_context_query_set_int (query, type,
-                gst_vaapi_display_drm_get_device (drm_dpy));
-#endif
-          else
-            res = FALSE;
-          break;
-        }
-#endif
-#if USE_X11
-        case GST_VAAPI_DISPLAY_TYPE_X11:{
-          GstVaapiDisplayX11 *const xvadpy = GST_VAAPI_DISPLAY_X11 (display);
-          Display *const x11dpy = gst_vaapi_display_x11_get_display (xvadpy);
-          if (!strcmp (type, "x11-display"))
-            gst_video_context_query_set_pointer (query, type, x11dpy);
-          else if (!strcmp (type, "x11-display-name"))
-            gst_video_context_query_set_string (query, type,
-                DisplayString (x11dpy));
-          else
-            res = FALSE;
-          break;
-        }
-#endif
-#if USE_WAYLAND
-        case GST_VAAPI_DISPLAY_TYPE_WAYLAND:{
-          GstVaapiDisplayWayland *const wlvadpy =
-              GST_VAAPI_DISPLAY_WAYLAND (display);
-          struct wl_display *const wldpy =
-              gst_vaapi_display_wayland_get_display (wlvadpy);
-          if (!strcmp (type, "wl-display"))
-            gst_video_context_query_set_pointer (query, type, wldpy);
-          else
-            res = FALSE;
-          break;
-        }
-#endif
-        default:
-          res = FALSE;
-          break;
-      }
-    }
-  }
-  return res;
-#endif /* !GST_CHECK_VERSION(1,1,0) */
 }
 
 gboolean
@@ -341,17 +330,12 @@
 gboolean
 gst_vaapi_apply_composition (GstVaapiSurface * surface, GstBuffer * buffer)
 {
-#if GST_CHECK_VERSION(1,0,0)
   GstVideoOverlayCompositionMeta *const cmeta =
       gst_buffer_get_video_overlay_composition_meta (buffer);
   GstVideoOverlayComposition *composition = NULL;
 
   if (cmeta)
     composition = cmeta->overlay;
-#else
-  GstVideoOverlayComposition *const composition =
-      gst_video_buffer_get_overlay_composition (buffer);
-#endif
   return gst_vaapi_surface_set_subpictures_from_composition (surface,
       composition, TRUE);
 }
@@ -359,7 +343,6 @@
 gboolean
 gst_vaapi_value_set_format (GValue * value, GstVideoFormat format)
 {
-#if GST_CHECK_VERSION(1,0,0)
   const gchar *str;
 
   str = gst_video_format_to_string (format);
@@ -368,16 +351,6 @@
 
   g_value_init (value, G_TYPE_STRING);
   g_value_set_string (value, str);
-#else
-  guint32 fourcc;
-
-  fourcc = gst_video_format_to_fourcc (format);
-  if (!fourcc)
-    return FALSE;
-
-  g_value_init (value, GST_TYPE_FOURCC);
-  gst_value_set_fourcc (value, fourcc);
-#endif
   return TRUE;
 }
 
@@ -414,7 +387,6 @@
 GstCaps *
 gst_vaapi_video_format_new_template_caps (GstVideoFormat format)
 {
-#if GST_CHECK_VERSION(1,0,0)
   GstCaps *caps;
 
   g_return_val_if_fail (format != GST_VIDEO_FORMAT_UNKNOWN, NULL);
@@ -427,15 +399,11 @@
       "format", G_TYPE_STRING, gst_video_format_to_string (format), NULL);
   set_video_template_caps (caps);
   return caps;
-#else
-  return gst_video_format_new_template_caps (format);
-#endif
 }
 
 GstCaps *
 gst_vaapi_video_format_new_template_caps_from_list (GArray * formats)
 {
-#if GST_CHECK_VERSION(1,0,0)
   GValue v_formats = G_VALUE_INIT;
   GstCaps *caps;
 
@@ -451,23 +419,6 @@
   gst_caps_set_value (caps, "format", &v_formats);
   set_video_template_caps (caps);
   g_value_unset (&v_formats);
-#else
-  GstCaps *caps, *tmp_caps;
-  guint i;
-
-  g_return_val_if_fail (formats != NULL, NULL);
-
-  caps = gst_caps_new_empty ();
-  if (!caps)
-    return NULL;
-
-  for (i = 0; i < formats->len; i++) {
-    const GstVideoFormat format = g_array_index (formats, GstVideoFormat, i);
-    tmp_caps = gst_vaapi_video_format_new_template_caps (format);
-    if (tmp_caps)
-      gst_caps_append (caps, tmp_caps);
-  }
-#endif
   return caps;
 }
 
@@ -481,7 +432,6 @@
   if (!caps)
     return NULL;
 
-#if GST_CHECK_VERSION(1,1,0)
   GstCapsFeatures *const features =
       gst_caps_features_new (features_string, NULL);
   if (!features) {
@@ -489,44 +439,52 @@
     return NULL;
   }
   gst_caps_set_features (caps, 0, features);
-#endif
   return caps;
 }
 
+static GstCaps *
+new_gl_texture_upload_meta_caps (void)
+{
+  return
+      gst_caps_from_string (GST_VIDEO_CAPS_MAKE_WITH_FEATURES
+      (GST_CAPS_FEATURE_META_GST_VIDEO_GL_TEXTURE_UPLOAD_META,
+          "{ RGBA, BGRA }"));
+}
+
 GstVaapiCapsFeature
-gst_vaapi_find_preferred_caps_feature (GstPad * pad, GstVideoFormat format)
+gst_vaapi_find_preferred_caps_feature (GstPad * pad, GstVideoFormat format,
+    GstVideoFormat * out_format_ptr)
 {
   GstVaapiCapsFeature feature = GST_VAAPI_CAPS_FEATURE_SYSTEM_MEMORY;
-#if GST_CHECK_VERSION(1,1,0)
   guint i, num_structures;
   GstCaps *caps = NULL;
   GstCaps *gl_texture_upload_caps = NULL;
   GstCaps *sysmem_caps = NULL;
   GstCaps *vaapi_caps = NULL;
   GstCaps *out_caps;
+  GstVideoFormat out_format;
 
-  out_caps = gst_pad_peer_query_caps (pad, NULL);
-  if (!out_caps)
+  out_caps = gst_pad_get_allowed_caps (pad);
+  if (!out_caps) {
+    feature = GST_VAAPI_CAPS_FEATURE_NOT_NEGOTIATED;
     goto cleanup;
+  }
 
-  gl_texture_upload_caps =
-      gst_vaapi_video_format_new_template_caps_with_features
-      (GST_VIDEO_FORMAT_RGBA,
-      GST_CAPS_FEATURE_META_GST_VIDEO_GL_TEXTURE_UPLOAD_META);
+  out_format = format == GST_VIDEO_FORMAT_ENCODED ?
+      GST_VIDEO_FORMAT_I420 : format;
+
+  gl_texture_upload_caps = new_gl_texture_upload_meta_caps ();
   if (!gl_texture_upload_caps)
     goto cleanup;
 
-  if (format == GST_VIDEO_FORMAT_ENCODED)
-    format = GST_VIDEO_FORMAT_I420;
-
   vaapi_caps =
-      gst_vaapi_video_format_new_template_caps_with_features (format,
+      gst_vaapi_video_format_new_template_caps_with_features (out_format,
       GST_CAPS_FEATURE_MEMORY_VAAPI_SURFACE);
   if (!vaapi_caps)
     goto cleanup;
 
   sysmem_caps =
-      gst_vaapi_video_format_new_template_caps_with_features (format,
+      gst_vaapi_video_format_new_template_caps_with_features (out_format,
       GST_CAPS_FEATURE_MEMORY_SYSTEM_MEMORY);
   if (!sysmem_caps)
     goto cleanup;
@@ -566,13 +524,37 @@
 #endif
   }
 
+  if (out_format_ptr) {
+    if (feature == GST_VAAPI_CAPS_FEATURE_GL_TEXTURE_UPLOAD_META) {
+      GstStructure *structure;
+      gchar *format_str;
+      out_format = GST_VIDEO_FORMAT_UNKNOWN;
+      do {
+        caps = gst_caps_intersect_full (out_caps, gl_texture_upload_caps,
+            GST_CAPS_INTERSECT_FIRST);
+        if (!caps)
+          break;
+        structure = gst_caps_get_structure (caps, 0);
+        if (!structure)
+          break;
+        if (!gst_structure_get (structure, "format", G_TYPE_STRING,
+                &format_str, NULL))
+          break;
+        out_format = gst_video_format_from_string (format_str);
+        g_free (format_str);
+      } while (0);
+      if (!out_format)
+        goto cleanup;
+    }
+    *out_format_ptr = out_format;
+  }
+
 cleanup:
   gst_caps_replace (&gl_texture_upload_caps, NULL);
   gst_caps_replace (&sysmem_caps, NULL);
   gst_caps_replace (&vaapi_caps, NULL);
   gst_caps_replace (&caps, NULL);
   gst_caps_replace (&out_caps, NULL);
-#endif
   return feature;
 }
 
@@ -582,7 +564,6 @@
   const gchar *str;
 
   switch (feature) {
-#if GST_CHECK_VERSION(1,1,0)
     case GST_VAAPI_CAPS_FEATURE_SYSTEM_MEMORY:
       str = GST_CAPS_FEATURE_MEMORY_SYSTEM_MEMORY;
       break;
@@ -592,7 +573,6 @@
     case GST_VAAPI_CAPS_FEATURE_VAAPI_SURFACE:
       str = GST_CAPS_FEATURE_MEMORY_VAAPI_SURFACE;
       break;
-#endif
     default:
       str = NULL;
       break;
@@ -603,7 +583,6 @@
 gboolean
 gst_caps_set_interlaced (GstCaps * caps, GstVideoInfo * vip)
 {
-#if GST_CHECK_VERSION(1,0,0)
   GstVideoInterlaceMode mode;
   const gchar *mode_str;
 
@@ -625,10 +604,6 @@
   }
 
   gst_caps_set_simple (caps, "interlace-mode", G_TYPE_STRING, mode_str, NULL);
-#else
-  gst_caps_set_simple (caps, "interlaced", G_TYPE_BOOLEAN,
-      vip ? GST_VIDEO_INFO_IS_INTERLACED (vip) : FALSE, NULL);
-#endif
   return TRUE;
 }
 
@@ -645,7 +620,6 @@
   if (num_structures < 1)
     return FALSE;
 
-#if GST_CHECK_VERSION(1,1,0)
   for (i = 0; i < num_structures && !found_caps; i++) {
     GstCapsFeatures *const features = gst_caps_get_features (caps, i);
 
@@ -658,21 +632,6 @@
     found_caps = gst_caps_features_contains (features,
         GST_CAPS_FEATURE_MEMORY_VAAPI_SURFACE);
   }
-#else
-  for (i = 0; i < num_structures && !found_caps; i++) {
-    GstStructure *const structure = gst_caps_get_structure (caps, i);
-    GstCaps *test_caps;
-    GstVideoInfo vi;
-
-    test_caps = gst_caps_new_full (gst_structure_copy (structure), NULL);
-    if (!test_caps)
-      continue;
-
-    found_caps = gst_video_info_from_caps (&vi, test_caps) &&
-        GST_VIDEO_INFO_FORMAT (&vi) == GST_VIDEO_FORMAT_ENCODED;
-    gst_caps_unref (test_caps);
-  }
-#endif
   return found_caps;
 }
 
diff -Nru gstreamer-vaapi-0.5.10/gst/vaapi/gstvaapipluginutil.h gstreamer-vaapi-0.6.0/gst/vaapi/gstvaapipluginutil.h
--- gstreamer-vaapi-0.5.10/gst/vaapi/gstvaapipluginutil.h	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst/vaapi/gstvaapipluginutil.h	2015-07-15 12:47:43.000000000 +0000
@@ -27,18 +27,11 @@
 
 #include <gst/vaapi/gstvaapidisplay.h>
 #include <gst/vaapi/gstvaapisurface.h>
-#if GST_CHECK_VERSION(1,0,0)
 #include "gstvaapivideomemory.h"
-#endif
 
 G_GNUC_INTERNAL
 gboolean
-gst_vaapi_ensure_display (gpointer element, GstVaapiDisplayType type);
-
-G_GNUC_INTERNAL
-void
-gst_vaapi_set_display (const gchar * type,
-    const GValue * value, GstVaapiDisplay ** display_ptr);
+gst_vaapi_ensure_display (GstElement * element, GstVaapiDisplayType type);
 
 G_GNUC_INTERNAL
 gboolean
@@ -70,7 +63,8 @@
 /* Helpers to build video caps */
 typedef enum
 {
-  GST_VAAPI_CAPS_FEATURE_SYSTEM_MEMORY = 1,
+  GST_VAAPI_CAPS_FEATURE_NOT_NEGOTIATED,
+  GST_VAAPI_CAPS_FEATURE_SYSTEM_MEMORY,
   GST_VAAPI_CAPS_FEATURE_GL_TEXTURE_UPLOAD_META,
   GST_VAAPI_CAPS_FEATURE_VAAPI_SURFACE,
 } GstVaapiCapsFeature;
@@ -90,24 +84,18 @@
 
 G_GNUC_INTERNAL
 GstVaapiCapsFeature
-gst_vaapi_find_preferred_caps_feature (GstPad * pad, GstVideoFormat format);
+gst_vaapi_find_preferred_caps_feature (GstPad * pad, GstVideoFormat format,
+    GstVideoFormat * out_format_ptr);
 
 G_GNUC_INTERNAL
 const gchar *
 gst_vaapi_caps_feature_to_string (GstVaapiCapsFeature feature);
 
 /* Helpers to handle interlaced contents */
-#if GST_CHECK_VERSION(1,0,0)
 # define GST_CAPS_INTERLACED_MODES \
     "interlace-mode = (string){ progressive, interleaved, mixed }"
 # define GST_CAPS_INTERLACED_FALSE \
     "interlace-mode = (string)progressive"
-#else
-# define GST_CAPS_INTERLACED_MODES \
-    "interlaced = (boolean){ true, false }"
-# define GST_CAPS_INTERLACED_FALSE \
-    "interlaced = (boolean)false"
-#endif
 
 G_GNUC_INTERNAL
 gboolean
diff -Nru gstreamer-vaapi-0.5.10/gst/vaapi/gstvaapipostproc.c gstreamer-vaapi-0.6.0/gst/vaapi/gstvaapipostproc.c
--- gstreamer-vaapi-0.5.10/gst/vaapi/gstvaapipostproc.c	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst/vaapi/gstvaapipostproc.c	2015-07-15 12:47:43.000000000 +0000
@@ -29,16 +29,14 @@
  * implemented.
  */
 
-#include "gst/vaapi/sysdeps.h"
+#include "gstcompat.h"
 #include <gst/video/video.h>
 
 #include "gstvaapipostproc.h"
 #include "gstvaapipluginutil.h"
 #include "gstvaapivideobuffer.h"
-#if GST_CHECK_VERSION(1,0,0)
 #include "gstvaapivideobufferpool.h"
 #include "gstvaapivideomemory.h"
-#endif
 
 #define GST_PLUGIN_NAME "vaapipostproc"
 #define GST_PLUGIN_DESC "A video postprocessing filter"
@@ -46,28 +44,16 @@
 GST_DEBUG_CATEGORY_STATIC (gst_debug_vaapipostproc);
 #define GST_CAT_DEFAULT gst_debug_vaapipostproc
 
-#if GST_CHECK_VERSION(1,1,0)
 # define GST_VAAPIPOSTPROC_SURFACE_CAPS \
     GST_VIDEO_CAPS_MAKE_WITH_FEATURES(  \
         GST_CAPS_FEATURE_MEMORY_VAAPI_SURFACE, "{ ENCODED, I420, YV12, NV12 }")
-#else
-# define GST_VAAPIPOSTPROC_SURFACE_CAPS \
-    GST_VAAPI_SURFACE_CAPS
-#endif
 
 /* Default templates */
 /* *INDENT-OFF* */
 static const char gst_vaapipostproc_sink_caps_str[] =
   GST_VAAPIPOSTPROC_SURFACE_CAPS ", "
   GST_CAPS_INTERLACED_MODES "; "
-#if GST_CHECK_VERSION(1,0,0)
   GST_VIDEO_CAPS_MAKE (GST_VIDEO_FORMATS_ALL) ", "
-#else
-  "video/x-raw-yuv, "
-  "width  = " GST_VIDEO_SIZE_RANGE ", "
-  "height = " GST_VIDEO_SIZE_RANGE ", "
-  "framerate = " GST_VIDEO_FPS_RANGE ", "
-#endif
    GST_CAPS_INTERLACED_MODES;
 /* *INDENT-ON* */
 
@@ -75,19 +61,10 @@
 static const char gst_vaapipostproc_src_caps_str[] =
   GST_VAAPIPOSTPROC_SURFACE_CAPS ", "
   GST_CAPS_INTERLACED_FALSE "; "
-#if GST_CHECK_VERSION(1,1,0)
   GST_VIDEO_CAPS_MAKE_WITH_FEATURES (
-      GST_CAPS_FEATURE_META_GST_VIDEO_GL_TEXTURE_UPLOAD_META, "RGBA") ", "
+      GST_CAPS_FEATURE_META_GST_VIDEO_GL_TEXTURE_UPLOAD_META, "{ RGBA, BGRA }") ", "
   GST_CAPS_INTERLACED_FALSE "; "
-#endif
-#if GST_CHECK_VERSION(1,0,0)
   GST_VIDEO_CAPS_MAKE (GST_VIDEO_FORMATS_ALL) ", "
-#else
-  "video/x-raw-yuv, "
-  "width  = " GST_VIDEO_SIZE_RANGE ", "
-  "height = " GST_VIDEO_SIZE_RANGE ", "
-  "framerate = " GST_VIDEO_FPS_RANGE ", "
-#endif
   GST_CAPS_INTERLACED_FALSE;
 /* *INDENT-ON* */
 
@@ -107,8 +84,15 @@
     GST_STATIC_CAPS (gst_vaapipostproc_src_caps_str));
 /* *INDENT-ON* */
 
+static void gst_vaapipostproc_colorbalance_init (gpointer iface, gpointer data);
+
 G_DEFINE_TYPE_WITH_CODE (GstVaapiPostproc, gst_vaapipostproc,
-    GST_TYPE_BASE_TRANSFORM, GST_VAAPI_PLUGIN_BASE_INIT_INTERFACES);
+    GST_TYPE_BASE_TRANSFORM, GST_VAAPI_PLUGIN_BASE_INIT_INTERFACES
+    G_IMPLEMENT_INTERFACE (GST_TYPE_COLOR_BALANCE,
+        gst_vaapipostproc_colorbalance_init));
+
+static GstVideoFormat native_formats[] =
+    { GST_VIDEO_FORMAT_NV12, GST_VIDEO_FORMAT_YV12, GST_VIDEO_FORMAT_I420 };
 
 enum
 {
@@ -127,6 +111,7 @@
   PROP_BRIGHTNESS,
   PROP_CONTRAST,
   PROP_SCALE_METHOD,
+  PROP_SKIN_TONE_ENHANCEMENT,
 };
 
 #define DEFAULT_FORMAT                  GST_VIDEO_FORMAT_ENCODED
@@ -247,6 +232,9 @@
   if (!gst_vaapipostproc_ensure_display (postproc))
     return FALSE;
 
+  gst_caps_replace (&postproc->allowed_srcpad_caps, NULL);
+  gst_caps_replace (&postproc->allowed_sinkpad_caps, NULL);
+
   postproc->filter =
       gst_vaapi_filter_new (GST_VAAPI_PLUGIN_BASE_DISPLAY (postproc));
   if (!postproc->filter)
@@ -297,9 +285,12 @@
     g_ptr_array_unref (postproc->filter_ops);
     postproc->filter_ops = NULL;
   }
+  if (postproc->cb_channels) {
+    g_list_free_full (postproc->cb_channels, g_object_unref);
+    postproc->cb_channels = NULL;
+  }
   gst_vaapi_filter_replace (&postproc->filter, NULL);
   gst_vaapi_video_pool_replace (&postproc->filter_pool, NULL);
-  postproc->filter_pool_active = FALSE;
 }
 
 static void
@@ -321,7 +312,7 @@
   ds_reset (&postproc->deinterlace_state);
   if (!gst_vaapi_plugin_base_open (GST_VAAPI_PLUGIN_BASE (postproc)))
     return FALSE;
-  if (!gst_vaapipostproc_ensure_display (postproc))
+  if (!gst_vaapipostproc_ensure_filter (postproc))
     return FALSE;
   return TRUE;
 }
@@ -333,12 +324,11 @@
 
   ds_reset (&postproc->deinterlace_state);
   gst_vaapi_plugin_base_close (GST_VAAPI_PLUGIN_BASE (postproc));
-  postproc->filter_pool_active = FALSE;
 
   postproc->field_duration = GST_CLOCK_TIME_NONE;
-  gst_video_info_init(&postproc->sinkpad_info);
-  gst_video_info_init(&postproc->srcpad_info);
-  gst_video_info_init(&postproc->filter_pool_info);
+  gst_video_info_init (&postproc->sinkpad_info);
+  gst_video_info_init (&postproc->srcpad_info);
+  gst_video_info_init (&postproc->filter_pool_info);
 
   return TRUE;
 }
@@ -361,13 +351,8 @@
     case GST_VIDEO_INTERLACE_MODE_PROGRESSIVE:
       return FALSE;
     case GST_VIDEO_INTERLACE_MODE_MIXED:
-#if GST_CHECK_VERSION(1,0,0)
       if (GST_BUFFER_FLAG_IS_SET (buf, GST_VIDEO_BUFFER_FLAG_INTERLACED))
         return TRUE;
-#else
-      if (!GST_BUFFER_FLAG_IS_SET (buf, GST_VIDEO_BUFFER_PROGRESSIVE))
-        return TRUE;
-#endif
       break;
     default:
       GST_ERROR ("unhandled \"interlace-mode\", disabling deinterlacing");
@@ -381,42 +366,27 @@
 {
   GstBuffer *outbuf;
 
-#if GST_CHECK_VERSION(1,0,0)
   GstBufferPool *const pool =
       GST_VAAPI_PLUGIN_BASE (postproc)->srcpad_buffer_pool;
   GstFlowReturn ret;
 
   g_return_val_if_fail (pool != NULL, NULL);
 
-  if (!postproc->filter_pool_active) {
-    if (!gst_buffer_pool_set_active (pool, TRUE))
-      goto error_activate_pool;
-    postproc->filter_pool_active = TRUE;
-  }
+  if (!gst_buffer_pool_set_active (pool, TRUE))
+    goto error_activate_pool;
 
   outbuf = NULL;
   ret = gst_buffer_pool_acquire_buffer (pool, &outbuf, NULL);
   if (ret != GST_FLOW_OK || !outbuf)
     goto error_create_buffer;
-#else
-  /* Create a raw VA video buffer without GstVaapiVideoMeta attached
-     to it yet, as this will be done next in the transform() hook */
-  outbuf = gst_vaapi_video_buffer_new_empty ();
-  if (!outbuf)
-    goto error_create_buffer;
-
-  gst_buffer_set_caps (outbuf, GST_VAAPI_PLUGIN_BASE_SRC_PAD_CAPS (postproc));
-#endif
   return outbuf;
 
   /* ERRORS */
-#if GST_CHECK_VERSION(1,0,0)
 error_activate_pool:
   {
     GST_ERROR ("failed to activate output video buffer pool");
     return NULL;
   }
-#endif
 error_create_buffer:
   {
     GST_ERROR ("failed to create output video buffer");
@@ -434,7 +404,6 @@
   gst_buffer_copy_into (outbuf, inbuf, flags | GST_BUFFER_COPY_FLAGS, 0, -1);
 
   /* GstVideoCropMeta */
-#if GST_CHECK_VERSION(1,0,0)
   if (!postproc->use_vpp) {
     GstVideoCropMeta *const crop_meta = gst_buffer_get_video_crop_meta (inbuf);
     if (crop_meta) {
@@ -444,7 +413,6 @@
         *out_crop_meta = *crop_meta;
     }
   }
-#endif
 
   /* GstVaapiVideoMeta */
   inbuf_meta = gst_buffer_get_vaapi_video_meta (inbuf);
@@ -529,9 +497,7 @@
   guint flags, deint_flags;
   gboolean tff, deint, deint_refs, deint_changed;
   GstVaapiRectangle *crop_rect = NULL;
-#if GST_CHECK_VERSION(1,0,0)
   GstVaapiRectangle tmp_rect;
-#endif
 
   /* Validate filters */
   if ((postproc->flags & GST_VAAPI_POSTPROC_FLAG_FORMAT) &&
@@ -568,12 +534,16 @@
       !gst_vaapi_filter_set_scaling (postproc->filter, postproc->scale_method))
     return GST_FLOW_NOT_SUPPORTED;
 
+  if ((postproc->flags & GST_VAAPI_POSTPROC_FLAG_SKINTONE) &&
+      !gst_vaapi_filter_set_skintone (postproc->filter,
+          postproc->skintone_enhance))
+    return GST_FLOW_NOT_SUPPORTED;
+
   inbuf_meta = gst_buffer_get_vaapi_video_meta (inbuf);
   if (!inbuf_meta)
     goto error_invalid_buffer;
   inbuf_surface = gst_vaapi_video_meta_get_surface (inbuf_meta);
 
-#if GST_CHECK_VERSION(1,0,0)
   GstVideoCropMeta *const crop_meta = gst_buffer_get_video_crop_meta (inbuf);
   if (crop_meta) {
     crop_rect = &tmp_rect;
@@ -582,7 +552,6 @@
     crop_rect->width = crop_meta->width;
     crop_rect->height = crop_meta->height;
   }
-#endif
   if (!crop_rect)
     crop_rect = (GstVaapiRectangle *)
         gst_vaapi_video_meta_get_render_rect (inbuf_meta);
@@ -910,6 +879,8 @@
   GstVideoInfo vi;
   gboolean deinterlace;
 
+  GST_INFO_OBJECT (postproc, "new sink caps = %" GST_PTR_FORMAT, caps);
+
   if (!gst_video_info_from_caps (&vi, caps))
     return FALSE;
 
@@ -933,6 +904,8 @@
 {
   GstVideoInfo vi;
 
+  GST_INFO_OBJECT (postproc, "new src caps = %" GST_PTR_FORMAT, caps);
+
   if (!gst_video_info_from_caps (&vi, caps))
     return FALSE;
 
@@ -987,10 +960,8 @@
 {
   GValue value = G_VALUE_INIT, v_format = G_VALUE_INIT;
   guint i, num_structures;
-  gboolean had_filter;
 
-  had_filter = postproc->filter != NULL;
-  if (!had_filter && !gst_vaapipostproc_ensure_filter (postproc))
+  if (postproc->filter == NULL)
     goto cleanup;
   if (!gst_vaapipostproc_ensure_filter_caps (postproc))
     goto cleanup;
@@ -1005,12 +976,10 @@
 
   num_structures = gst_caps_get_size (caps);
   for (i = 0; i < num_structures; i++) {
-#if GST_CHECK_VERSION(1,1,0)
     GstCapsFeatures *const features = gst_caps_get_features (caps, i);
     if (gst_caps_features_contains (features,
             GST_CAPS_FEATURE_META_GST_VIDEO_GL_TEXTURE_UPLOAD_META))
       continue;
-#endif
 
     GstStructure *const structure = gst_caps_get_structure (caps, i);
     if (!structure)
@@ -1020,8 +989,6 @@
   g_value_unset (&value);
 
 cleanup:
-  if (!had_filter)
-    gst_vaapipostproc_destroy_filter (postproc);
   return caps;
 }
 
@@ -1082,10 +1049,8 @@
   GstVideoInfo vi;
   GstVideoFormat out_format;
   GstCaps *out_caps;
-#if GST_CHECK_VERSION(1,1,0)
   GstVaapiCapsFeature feature;
   const gchar *feature_str;
-#endif
   guint width, height;
 
   /* Generate the sink pad caps, that could be fixated afterwards */
@@ -1117,7 +1082,6 @@
     GST_VIDEO_INFO_FPS_N (&vi) = fps_n;
     GST_VIDEO_INFO_FPS_D (&vi) = fps_d;
   }
-
   // Signal the other pad that we only generate progressive frames
   GST_VIDEO_INFO_INTERLACE_MODE (&vi) = GST_VIDEO_INTERLACE_MODE_PROGRESSIVE;
 
@@ -1125,7 +1089,6 @@
   find_best_size (postproc, &vi, &width, &height);
 
   // Update format from user-specified parameters
-#if GST_CHECK_VERSION(1,1,0)
   /* XXX: this is a workaround until auto-plugging is fixed when
    * format=ENCODED + memory:VASurface caps feature are provided.
    * use the downstream negotiated video format as the output format
@@ -1152,20 +1115,9 @@
 
   feature =
       gst_vaapi_find_preferred_caps_feature (GST_BASE_TRANSFORM_SRC_PAD (trans),
-      out_format);
-  switch (feature) {
-    case GST_VAAPI_CAPS_FEATURE_GL_TEXTURE_UPLOAD_META:
-      out_format = GST_VIDEO_FORMAT_RGBA;
-      break;
-    default:
-      break;
-  }
-#else
-  out_format = GST_VIDEO_FORMAT_ENCODED;
-#endif
+      out_format, &out_format);
   gst_video_info_change_format (&vi, out_format, width, height);
 
-#if GST_CHECK_VERSION(1,1,0)
   out_caps = gst_video_info_to_caps (&vi);
   if (!out_caps)
     return NULL;
@@ -1176,29 +1128,16 @@
       gst_caps_set_features (out_caps, 0,
           gst_caps_features_new (feature_str, NULL));
   }
-#else
-  /* XXX: gst_video_info_to_caps() from GStreamer 0.10 does not
-     reconstruct suitable caps for "encoded" video formats */
-  out_caps = gst_caps_from_string (GST_VAAPI_SURFACE_CAPS_NAME);
-  if (!out_caps)
-    return NULL;
-
-  gst_caps_set_simple (out_caps,
-      "type", G_TYPE_STRING, "vaapi",
-      "opengl", G_TYPE_BOOLEAN, USE_GLX,
-      "width", G_TYPE_INT, GST_VIDEO_INFO_WIDTH (&vi),
-      "height", G_TYPE_INT, GST_VIDEO_INFO_HEIGHT (&vi),
-      "framerate", GST_TYPE_FRACTION, GST_VIDEO_INFO_FPS_N (&vi),
-      GST_VIDEO_INFO_FPS_D (&vi),
-      "pixel-aspect-ratio", GST_TYPE_FRACTION, GST_VIDEO_INFO_PAR_N (&vi),
-      GST_VIDEO_INFO_PAR_D (&vi), NULL);
 
-  gst_caps_set_interlaced (out_caps, &vi);
-#endif
+  /* we don't need to do format conversion if GL_TEXTURE_UPLOAD_META
+   * is negotiated */
+  if (feature != GST_VAAPI_CAPS_FEATURE_GL_TEXTURE_UPLOAD_META &&
+      postproc->format != out_format) {
+    postproc->format = out_format;
+  }
   return out_caps;
 }
 
-#if GST_CHECK_VERSION(1,0,0)
 static GstCaps *
 gst_vaapipostproc_transform_caps (GstBaseTransform * trans,
     GstPadDirection direction, GstCaps * caps, GstCaps * filter)
@@ -1213,21 +1152,11 @@
   }
   return caps;
 }
-#else
-#define gst_vaapipostproc_transform_caps \
-    gst_vaapipostproc_transform_caps_impl
-#endif
-
-#if GST_CHECK_VERSION(1,0,0)
-typedef gsize GstBaseTransformSizeType;
-#else
-typedef guint GstBaseTransformSizeType;
-#endif
 
 static gboolean
 gst_vaapipostproc_transform_size (GstBaseTransform * trans,
-    GstPadDirection direction, GstCaps * caps, GstBaseTransformSizeType size,
-    GstCaps * othercaps, GstBaseTransformSizeType * othersize)
+    GstPadDirection direction, GstCaps * caps, gsize size,
+    GstCaps * othercaps, gsize * othersize)
 {
   GstVaapiPostproc *const postproc = GST_VAAPIPOSTPROC (trans);
 
@@ -1282,11 +1211,7 @@
 
 static GstFlowReturn
 gst_vaapipostproc_prepare_output_buffer (GstBaseTransform * trans,
-    GstBuffer * inbuf,
-#if !GST_CHECK_VERSION(1,0,0)
-    gint size, GstCaps * caps,
-#endif
-    GstBuffer ** outbuf_ptr)
+    GstBuffer * inbuf, GstBuffer ** outbuf_ptr)
 {
   GstVaapiPostproc *const postproc = GST_VAAPIPOSTPROC (trans);
 
@@ -1322,14 +1247,36 @@
 }
 
 static gboolean
+is_native_video_format (GstVideoFormat format)
+{
+  guint i = 0;
+  for (i = 0; i < G_N_ELEMENTS (native_formats); i++)
+    if (native_formats[i] == format)
+      return TRUE;
+  return FALSE;
+}
+
+static gboolean
 gst_vaapipostproc_set_caps (GstBaseTransform * trans, GstCaps * caps,
     GstCaps * out_caps)
 {
   GstVaapiPostproc *const postproc = GST_VAAPIPOSTPROC (trans);
   gboolean caps_changed = FALSE;
+  GstVideoInfo vinfo;
 
   if (!gst_vaapipostproc_update_sink_caps (postproc, caps, &caps_changed))
     return FALSE;
+  /* HACK: This is a workaround to deal with the va-intel-driver for non-native
+   * formats while doing advanced deinterlacing. The format of reference surfaces must
+   * be same as the format used by the driver internally for motion adaptive
+   * deinterlacing and motion compensated deinterlacing */
+  gst_video_info_from_caps (&vinfo, caps);
+  if (deint_method_is_advanced (postproc->deinterlace_method)
+      && !is_native_video_format (GST_VIDEO_INFO_FORMAT (&vinfo))) {
+    GST_WARNING_OBJECT (postproc,
+        "Advanced deinterlacing requires the native video formats used by the driver internally");
+    return FALSE;
+  }
   if (!gst_vaapipostproc_update_src_caps (postproc, out_caps, &caps_changed))
     return FALSE;
 
@@ -1353,11 +1300,10 @@
 {
   GstVaapiPostproc *const postproc = GST_VAAPIPOSTPROC (trans);
 
-  GST_INFO_OBJECT (trans, "query type `%s'", GST_QUERY_TYPE_NAME (query));
-
   if (gst_vaapi_reply_to_query (query,
           GST_VAAPI_PLUGIN_BASE_DISPLAY (postproc))) {
-    GST_DEBUG ("sharing display %p", GST_VAAPI_PLUGIN_BASE_DISPLAY (postproc));
+    GST_DEBUG_OBJECT (postproc, "sharing display %p",
+        GST_VAAPI_PLUGIN_BASE_DISPLAY (postproc));
     return TRUE;
   }
 
@@ -1366,7 +1312,6 @@
       direction, query);
 }
 
-#if GST_CHECK_VERSION(1,0,0)
 static gboolean
 gst_vaapipostproc_propose_allocation (GstBaseTransform * trans,
     GstQuery * decide_query, GstQuery * query)
@@ -1388,7 +1333,6 @@
   return gst_vaapi_plugin_base_decide_allocation (GST_VAAPI_PLUGIN_BASE (trans),
       query, 0);
 }
-#endif
 
 static void
 gst_vaapipostproc_finalize (GObject * object)
@@ -1454,6 +1398,10 @@
       postproc->scale_method = g_value_get_enum (value);
       postproc->flags |= GST_VAAPI_POSTPROC_FLAG_SCALE;
       break;
+    case PROP_SKIN_TONE_ENHANCEMENT:
+      postproc->skintone_enhance = g_value_get_boolean (value);
+      postproc->flags |= GST_VAAPI_POSTPROC_FLAG_SKINTONE;
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -1506,6 +1454,9 @@
     case PROP_SCALE_METHOD:
       g_value_set_enum (value, postproc->scale_method);
       break;
+    case PROP_SKIN_TONE_ENHANCEMENT:
+      g_value_set_boolean (value, postproc->skintone_enhance);
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -1537,11 +1488,8 @@
   trans_class->transform = gst_vaapipostproc_transform;
   trans_class->set_caps = gst_vaapipostproc_set_caps;
   trans_class->query = gst_vaapipostproc_query;
-
-#if GST_CHECK_VERSION(1,0,0)
   trans_class->propose_allocation = gst_vaapipostproc_propose_allocation;
   trans_class->decide_allocation = gst_vaapipostproc_decide_allocation;
-#endif
 
   trans_class->prepare_output_buffer = gst_vaapipostproc_prepare_output_buffer;
 
@@ -1724,12 +1672,60 @@
     g_object_class_install_property (object_class,
         PROP_SCALE_METHOD, filter_op->pspec);
 
+  /**
+   * GstVaapiPostproc:skin-tone-enhancement:
+   *
+   * Apply the skin tone enhancement algorithm.
+   */
+  filter_op = find_filter_op (filter_ops, GST_VAAPI_FILTER_OP_SKINTONE);
+  if (filter_op)
+    g_object_class_install_property (object_class,
+        PROP_SKIN_TONE_ENHANCEMENT, filter_op->pspec);
+
   g_ptr_array_unref (filter_ops);
 }
 
+static float *
+find_value_ptr (GstVaapiPostproc * postproc, GstVaapiFilterOp op)
+{
+  switch (op) {
+    case GST_VAAPI_FILTER_OP_HUE:
+      return &postproc->hue;
+    case GST_VAAPI_FILTER_OP_SATURATION:
+      return &postproc->saturation;
+    case GST_VAAPI_FILTER_OP_BRIGHTNESS:
+      return &postproc->brightness;
+    case GST_VAAPI_FILTER_OP_CONTRAST:
+      return &postproc->contrast;
+    default:
+      return NULL;
+  }
+}
+
+static void
+cb_set_default_value (GstVaapiPostproc * postproc, GPtrArray * filter_ops,
+    GstVaapiFilterOp op)
+{
+  GstVaapiFilterOpInfo *filter_op;
+  GParamSpecFloat *pspec;
+  float *var;
+
+  filter_op = find_filter_op (filter_ops, op);
+  if (!filter_op)
+    return;
+  var = find_value_ptr (postproc, op);
+  if (!var)
+    return;
+  pspec = G_PARAM_SPEC_FLOAT (filter_op->pspec);
+  *var = pspec->default_value;
+}
+
 static void
 gst_vaapipostproc_init (GstVaapiPostproc * postproc)
 {
+  GPtrArray *filter_ops;
+  guint i;
+
   gst_vaapi_plugin_base_init (GST_VAAPI_PLUGIN_BASE (postproc),
       GST_CAT_DEFAULT);
 
@@ -1740,7 +1736,156 @@
   postproc->keep_aspect = TRUE;
   postproc->get_va_surfaces = TRUE;
 
+  filter_ops = gst_vaapi_filter_get_operations (NULL);
+  if (filter_ops) {
+    for (i = GST_VAAPI_FILTER_OP_HUE; i <= GST_VAAPI_FILTER_OP_CONTRAST; i++)
+      cb_set_default_value (postproc, filter_ops, i);
+    g_ptr_array_unref (filter_ops);
+  }
+
   gst_video_info_init (&postproc->sinkpad_info);
   gst_video_info_init (&postproc->srcpad_info);
   gst_video_info_init (&postproc->filter_pool_info);
 }
+
+/* ------------------------------------------------------------------------ */
+/* --- GstColorBalance interface                                        --- */
+/* ------------------------------------------------------------------------ */
+
+#define CB_CHANNEL_FACTOR 1000.0
+
+typedef struct
+{
+  GstVaapiFilterOp op;
+  const gchar *name;
+} ColorBalanceChannel;
+
+ColorBalanceChannel cb_channels[] = {
+  {GST_VAAPI_FILTER_OP_HUE, "VA_FILTER_HUE"},
+  {GST_VAAPI_FILTER_OP_SATURATION, "VA_FILTER_SATURATION"},
+  {GST_VAAPI_FILTER_OP_BRIGHTNESS, "VA_FILTER_BRIGHTNESS"},
+  {GST_VAAPI_FILTER_OP_CONTRAST, "VA_FILTER_CONTRAST"},
+};
+
+static void
+cb_channels_init (GstVaapiPostproc * postproc)
+{
+  GPtrArray *filter_ops;
+  GstVaapiFilterOpInfo *filter_op;
+  GParamSpecFloat *pspec;
+  GstColorBalanceChannel *channel;
+  guint i;
+
+  if (postproc->cb_channels)
+    return;
+
+  if (!gst_vaapipostproc_ensure_filter (postproc))
+    return;
+
+  filter_ops = postproc->filter_ops ? g_ptr_array_ref (postproc->filter_ops)
+      : gst_vaapi_filter_get_operations (postproc->filter);
+  if (!filter_ops)
+    return;
+
+  for (i = 0; i < G_N_ELEMENTS (cb_channels); i++) {
+    filter_op = find_filter_op (filter_ops, cb_channels[i].op);
+    if (!filter_op)
+      continue;
+
+    pspec = G_PARAM_SPEC_FLOAT (filter_op->pspec);
+    channel = g_object_new (GST_TYPE_COLOR_BALANCE_CHANNEL, NULL);
+    channel->label = g_strdup (cb_channels[i].name);
+    channel->min_value = pspec->minimum * CB_CHANNEL_FACTOR;
+    channel->max_value = pspec->maximum * CB_CHANNEL_FACTOR;
+
+    postproc->cb_channels = g_list_prepend (postproc->cb_channels, channel);
+  }
+
+  g_ptr_array_unref (filter_ops);
+}
+
+static const GList *
+gst_vaapipostproc_colorbalance_list_channels (GstColorBalance * balance)
+{
+  GstVaapiPostproc *const postproc = GST_VAAPIPOSTPROC (balance);
+
+  cb_channels_init (postproc);
+  return postproc->cb_channels;
+}
+
+static gfloat *
+cb_get_value_ptr (GstVaapiPostproc * postproc, GstColorBalanceChannel * channel,
+    GstVaapiPostprocFlags * flags)
+{
+  guint i;
+  gfloat *ret = NULL;
+
+  for (i = 0; i < G_N_ELEMENTS (cb_channels); i++) {
+    if (g_ascii_strcasecmp (cb_channels[i].name, channel->label) == 0)
+      break;
+  }
+  if (i >= G_N_ELEMENTS (cb_channels))
+    return NULL;
+
+  ret = find_value_ptr (postproc, cb_channels[i].op);
+  if (flags)
+    *flags = 1 << cb_channels[i].op;
+  return ret;
+}
+
+static void
+gst_vaapipostproc_colorbalance_set_value (GstColorBalance * balance,
+    GstColorBalanceChannel * channel, gint value)
+{
+  GstVaapiPostproc *const postproc = GST_VAAPIPOSTPROC (balance);
+  GstVaapiPostprocFlags flags;
+  gfloat new_val, *var;
+
+  value = CLAMP (value, channel->min_value, channel->max_value);
+  new_val = (gfloat) value / CB_CHANNEL_FACTOR;
+
+  var = cb_get_value_ptr (postproc, channel, &flags);
+  if (var) {
+    *var = new_val;
+    postproc->flags |= flags;
+    gst_color_balance_value_changed (balance, channel, value);
+    return;
+  }
+
+  GST_WARNING_OBJECT (postproc, "unknown channel %s", channel->label);
+}
+
+static gint
+gst_vaapipostproc_colorbalance_get_value (GstColorBalance * balance,
+    GstColorBalanceChannel * channel)
+{
+  GstVaapiPostproc *const postproc = GST_VAAPIPOSTPROC (balance);
+  gfloat *var;
+  gint new_val;
+
+  var = cb_get_value_ptr (postproc, channel, NULL);
+  if (var) {
+    new_val = (gint) ((*var) * CB_CHANNEL_FACTOR);
+    new_val = CLAMP (new_val, channel->min_value, channel->max_value);
+    return new_val;
+  }
+
+  GST_WARNING_OBJECT (postproc, "unknown channel %s", channel->label);
+  return G_MININT;
+}
+
+static GstColorBalanceType
+gst_vaapipostproc_colorbalance_get_balance_type (GstColorBalance * balance)
+{
+  return GST_COLOR_BALANCE_HARDWARE;
+}
+
+static void
+gst_vaapipostproc_colorbalance_init (gpointer iface, gpointer data)
+{
+  GstColorBalanceInterface *cbface = iface;
+  cbface->list_channels = gst_vaapipostproc_colorbalance_list_channels;
+  cbface->set_value = gst_vaapipostproc_colorbalance_set_value;
+  cbface->get_value = gst_vaapipostproc_colorbalance_get_value;
+  cbface->get_balance_type = gst_vaapipostproc_colorbalance_get_balance_type;
+}
diff -Nru gstreamer-vaapi-0.5.10/gst/vaapi/gstvaapipostproc.h gstreamer-vaapi-0.6.0/gst/vaapi/gstvaapipostproc.h
--- gstreamer-vaapi-0.5.10/gst/vaapi/gstvaapipostproc.h	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst/vaapi/gstvaapipostproc.h	2015-07-15 12:47:43.000000000 +0000
@@ -86,6 +86,7 @@
  * @GST_VAAPI_POSTPROC_FLAG_DEINTERLACE: Deinterlacing.
  * @GST_VAAPI_POSTPROC_FLAG_SIZE: Video scaling.
  * @GST_VAAPI_POSTPROC_FLAG_SCALE: Video scaling mode.
+ * @GST_VAAPI_POSTPROC_FLAG_SKINTONE: Skin tone enhancement.
  *
  * The set of operations that are to be performed for each frame.
  */
@@ -100,6 +101,7 @@
   GST_VAAPI_POSTPROC_FLAG_CONTRAST    = 1 << GST_VAAPI_FILTER_OP_CONTRAST,
   GST_VAAPI_POSTPROC_FLAG_DEINTERLACE = 1 << GST_VAAPI_FILTER_OP_DEINTERLACING,
   GST_VAAPI_POSTPROC_FLAG_SCALE       = 1 << GST_VAAPI_FILTER_OP_SCALING,
+  GST_VAAPI_POSTPROC_FLAG_SKINTONE    = 1 << GST_VAAPI_FILTER_OP_SKINTONE,
 
   /* Additional custom flags */
   GST_VAAPI_POSTPROC_FLAG_CUSTOM      = 1 << 20,
@@ -136,7 +138,6 @@
   GPtrArray *filter_ops;
   GstVaapiVideoPool *filter_pool;
   GstVideoInfo filter_pool_info;
-  gboolean filter_pool_active;
   GArray *filter_formats;
   GstVideoFormat format;        /* output video format (encoded) */
   guint width;
@@ -165,10 +166,15 @@
   gfloat brightness;
   gfloat contrast;
 
+  gboolean skintone_enhance;
+
   guint get_va_surfaces:1;
   guint has_vpp:1;
   guint use_vpp:1;
   guint keep_aspect:1;
+
+  /* color balance's channel list */
+  GList *cb_channels;
 };
 
 struct _GstVaapiPostprocClass
diff -Nru gstreamer-vaapi-0.5.10/gst/vaapi/gstvaapisink.c gstreamer-vaapi-0.6.0/gst/vaapi/gstvaapisink.c
--- gstreamer-vaapi-0.5.10/gst/vaapi/gstvaapisink.c	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst/vaapi/gstvaapisink.c	2015-07-15 12:47:43.000000000 +0000
@@ -31,41 +31,22 @@
  * create its own internal window and render into it.
  */
 
-#include "gst/vaapi/sysdeps.h"
+#include "gstcompat.h"
 #include <gst/gst.h>
 #include <gst/video/video.h>
 
 #include <gst/vaapi/gstvaapivalue.h>
 
 /* Supported interfaces */
-#if GST_CHECK_VERSION(1,0,0)
 # include <gst/video/videooverlay.h>
 # include <gst/video/colorbalance.h>
 # include <gst/video/navigation.h>
-#else
-# include <gst/interfaces/xoverlay.h>
-# include <gst/interfaces/colorbalance.h>
-
-# define GST_TYPE_VIDEO_OVERLAY         GST_TYPE_X_OVERLAY
-# define GST_VIDEO_OVERLAY              GST_X_OVERLAY
-# define GstVideoOverlay                GstXOverlay
-# define GstVideoOverlayInterface       GstXOverlayClass
-
-# define gst_video_overlay_prepare_window_handle(sink) \
-    gst_x_overlay_prepare_xwindow_id(sink)
-# define gst_video_overlay_got_window_handle(sink, window_handle) \
-    gst_x_overlay_got_window_handle(sink, window_handle)
-
-# define GstColorBalanceInterface       GstColorBalanceClass
-#endif
 
 #include "gstvaapisink.h"
 #include "gstvaapipluginutil.h"
 #include "gstvaapivideometa.h"
-#if GST_CHECK_VERSION(1,0,0)
 #include "gstvaapivideobufferpool.h"
 #include "gstvaapivideomemory.h"
-#endif
 
 #define GST_PLUGIN_NAME "vaapisink"
 #define GST_PLUGIN_DESC "A VA-API based videosink"
@@ -76,20 +57,19 @@
 /* Default template */
 /* *INDENT-OFF* */
 static const char gst_vaapisink_sink_caps_str[] =
-#if GST_CHECK_VERSION(1,1,0)
-    GST_VIDEO_CAPS_MAKE_WITH_FEATURES (GST_CAPS_FEATURE_MEMORY_VAAPI_SURFACE,
+    GST_VIDEO_CAPS_MAKE_WITH_FEATURES (
+        GST_CAPS_FEATURE_MEMORY_VAAPI_SURFACE,
         "{ ENCODED, NV12, I420, YV12 }") ";"
-    GST_VIDEO_CAPS_MAKE (GST_VIDEO_FORMATS_ALL);
-#else
-#if GST_CHECK_VERSION(1,0,0)
-    GST_VIDEO_CAPS_MAKE (GST_VIDEO_FORMATS_ALL) "; "
-#else
-    "video/x-raw-yuv, "
-    "width  = (int) [ 1, MAX ], "
-    "height = (int) [ 1, MAX ]; "
-#endif
-    GST_VAAPI_SURFACE_CAPS;
+#if GST_CHECK_VERSION(1,3,1)
+    GST_VIDEO_CAPS_MAKE_WITH_FEATURES (
+        GST_CAPS_FEATURE_MEMORY_VAAPI_SURFACE ","
+            GST_CAPS_FEATURE_META_GST_VIDEO_OVERLAY_COMPOSITION,
+        "{ ENCODED, NV12, I420, YV12 }") ";"
+    GST_VIDEO_CAPS_MAKE_WITH_FEATURES (
+        GST_CAPS_FEATURE_META_GST_VIDEO_OVERLAY_COMPOSITION,
+        GST_VIDEO_FORMATS_ALL) ";"
 #endif
+    GST_VIDEO_CAPS_MAKE (GST_VIDEO_FORMATS_ALL);
 /* *INDENT-ON* */
 
 static GstStaticPadTemplate gst_vaapisink_sink_factory =
@@ -126,6 +106,14 @@
 
 enum
 {
+  HANDOFF_SIGNAL,
+  LAST_SIGNAL
+};
+
+static guint gst_vaapisink_signals[LAST_SIGNAL] = { 0 };
+
+enum
+{
   PROP_0,
 
   PROP_DISPLAY_TYPE,
@@ -138,26 +126,26 @@
   PROP_SATURATION,
   PROP_BRIGHTNESS,
   PROP_CONTRAST,
+  PROP_SIGNAL_HANDOFFS,
 
   N_PROPERTIES
 };
 
 #define DEFAULT_DISPLAY_TYPE            GST_VAAPI_DISPLAY_TYPE_ANY
 #define DEFAULT_ROTATION                GST_VAAPI_ROTATION_0
+#define DEFAULT_SIGNAL_HANDOFFS         FALSE
 
 static GParamSpec *g_properties[N_PROPERTIES] = { NULL, };
 
-static void
-gst_vaapisink_video_overlay_expose (GstVideoOverlay * overlay);
+static void gst_vaapisink_video_overlay_expose (GstVideoOverlay * overlay);
 
-static gboolean
-gst_vaapisink_reconfigure_window (GstVaapiSink * sink);
+static gboolean gst_vaapisink_reconfigure_window (GstVaapiSink * sink);
 
 static void
 gst_vaapisink_set_event_handling (GstVaapiSink * sink, gboolean handle_events);
 
 static GstFlowReturn
-gst_vaapisink_show_frame (GstBaseSink * base_sink, GstBuffer * buffer);
+gst_vaapisink_show_frame (GstVideoSink * video_sink, GstBuffer * buffer);
 
 static gboolean
 gst_vaapisink_ensure_render_rect (GstVaapiSink * sink, guint width,
@@ -583,7 +571,7 @@
 
   if (sink->video_buffer) {
     gst_vaapisink_reconfigure_window (sink);
-    gst_vaapisink_show_frame (GST_BASE_SINK_CAST (sink), sink->video_buffer);
+    gst_vaapisink_show_frame (GST_VIDEO_SINK_CAST (sink), sink->video_buffer);
   }
 }
 
@@ -831,11 +819,7 @@
   iface->list_channels = gst_vaapisink_color_balance_list_channels;
   iface->set_value = gst_vaapisink_color_balance_set_value;
   iface->get_value = gst_vaapisink_color_balance_get_value;
-#if GST_CHECK_VERSION(1,0,0)
   iface->get_balance_type = gst_vaapisink_color_balance_get_type;
-#else
-  iface->balance_type = gst_vaapisink_color_balance_get_type (NULL);
-#endif
 }
 
 /* ------------------------------------------------------------------------ */
@@ -1232,11 +1216,7 @@
   GstVaapiSink *const sink = GST_VAAPISINK_CAST (base_sink);
   GstCaps *out_caps, *yuv_caps;
 
-#if GST_CHECK_VERSION(1,1,0)
   out_caps = gst_static_pad_template_get_caps (&gst_vaapisink_sink_factory);
-#else
-  out_caps = gst_caps_from_string (GST_VAAPI_SURFACE_CAPS);
-#endif
   if (!out_caps)
     return NULL;
 
@@ -1250,7 +1230,6 @@
   return out_caps;
 }
 
-#if GST_CHECK_VERSION(1,0,0)
 static inline GstCaps *
 gst_vaapisink_get_caps (GstBaseSink * base_sink, GstCaps * filter)
 {
@@ -1264,14 +1243,10 @@
     out_caps = caps;
   return out_caps;
 }
-#else
-#define gst_vaapisink_get_caps gst_vaapisink_get_caps_impl
-#endif
 
 static void
 update_colorimetry (GstVaapiSink * sink, GstVideoColorimetry * cinfo)
 {
-#if GST_CHECK_VERSION(1,0,0)
   if (gst_video_colorimetry_matches (cinfo, GST_VIDEO_COLORIMETRY_BT601))
     sink->color_standard = GST_VAAPI_COLOR_STANDARD_ITUR_BT_601;
   else if (gst_video_colorimetry_matches (cinfo, GST_VIDEO_COLORIMETRY_BT709))
@@ -1282,7 +1257,12 @@
   else
     sink->color_standard = 0;
 
-  GST_DEBUG ("colorimetry %s", gst_video_colorimetry_to_string (cinfo));
+#ifndef GST_DISABLE_GST_DEBUG
+  {
+    gchar *const colorimetry_string = gst_video_colorimetry_to_string (cinfo);
+    GST_DEBUG ("colorimetry %s", colorimetry_string);
+    g_free (colorimetry_string);
+  }
 #endif
 }
 
@@ -1351,13 +1331,10 @@
   GstBuffer *buffer;
   guint flags;
   GstVaapiRectangle *surface_rect = NULL;
-#if GST_CHECK_VERSION(1,0,0)
   GstVaapiRectangle tmp_rect;
-#endif
   GstFlowReturn ret;
   gint32 view_id;
 
-#if GST_CHECK_VERSION(1,0,0)
   GstVideoCropMeta *const crop_meta =
       gst_buffer_get_video_crop_meta (src_buffer);
   if (crop_meta) {
@@ -1367,7 +1344,6 @@
     surface_rect->width = crop_meta->width;
     surface_rect->height = crop_meta->height;
   }
-#endif
 
   ret = gst_vaapi_plugin_base_get_input_buffer (GST_VAAPI_PLUGIN_BASE (sink),
       src_buffer, &buffer);
@@ -1380,19 +1356,19 @@
 
   proxy = gst_vaapi_video_meta_get_surface_proxy (meta);
   if (!proxy)
-    goto error;
+    goto no_surface;
 
   surface = gst_vaapi_video_meta_get_surface (meta);
   if (!surface)
-    goto error;
+    goto no_surface;
 
   /* Validate view component to display */
   view_id = GST_VAAPI_SURFACE_PROXY_VIEW_ID (proxy);
   if (G_UNLIKELY (sink->view_id == -1))
     sink->view_id = view_id;
   else if (sink->view_id != view_id) {
-    gst_buffer_unref (buffer);
-    return GST_FLOW_OK;
+    ret = GST_FLOW_OK;
+    goto done;
   }
 
   gst_vaapisink_ensure_colorbalance (sink);
@@ -1423,20 +1399,38 @@
   if (!sink->backend->render_surface (sink, surface, surface_rect, flags))
     goto error;
 
+  if (sink->signal_handoffs)
+    g_signal_emit (sink, gst_vaapisink_signals[HANDOFF_SIGNAL], 0, buffer);
+
   /* Retain VA surface until the next one is displayed */
+  /* Need to release the lock for the duration, otherwise a deadlock is possible */
+  gst_vaapi_display_unlock (GST_VAAPI_PLUGIN_BASE_DISPLAY (sink));
   gst_buffer_replace (&sink->video_buffer, buffer);
+  gst_vaapi_display_lock (GST_VAAPI_PLUGIN_BASE_DISPLAY (sink));
+
+  ret = GST_FLOW_OK;
+
+done:
   gst_buffer_unref (buffer);
-  return GST_FLOW_OK;
+  return ret;
 
 error:
-  gst_buffer_unref (buffer);
-  return GST_FLOW_EOS;
+  GST_ELEMENT_ERROR (sink, RESOURCE, WRITE,
+      ("Internal error: could not render surface"), (NULL));
+  ret = GST_FLOW_ERROR;
+  goto done;
+
+no_surface:
+  /* No surface or surface proxy. That's very bad! */
+  GST_WARNING_OBJECT (sink, "could not get surface");
+  ret = GST_FLOW_ERROR;
+  goto done;
 }
 
 static GstFlowReturn
-gst_vaapisink_show_frame (GstBaseSink * base_sink, GstBuffer * src_buffer)
+gst_vaapisink_show_frame (GstVideoSink * video_sink, GstBuffer * src_buffer)
 {
-  GstVaapiSink *const sink = GST_VAAPISINK_CAST (base_sink);
+  GstVaapiSink *const sink = GST_VAAPISINK_CAST (video_sink);
   GstFlowReturn ret;
 
   /* We need at least to protect the gst_vaapi_aplpy_composition()
@@ -1445,10 +1439,10 @@
   gst_vaapi_display_lock (GST_VAAPI_PLUGIN_BASE_DISPLAY (sink));
   ret = gst_vaapisink_show_frame_unlocked (sink, src_buffer);
   gst_vaapi_display_unlock (GST_VAAPI_PLUGIN_BASE_DISPLAY (sink));
+
   return ret;
 }
 
-#if GST_CHECK_VERSION(1,0,0)
 static gboolean
 gst_vaapisink_propose_allocation (GstBaseSink * base_sink, GstQuery * query)
 {
@@ -1462,16 +1456,6 @@
       GST_VIDEO_OVERLAY_COMPOSITION_META_API_TYPE, NULL);
   return TRUE;
 }
-#else
-static GstFlowReturn
-gst_vaapisink_buffer_alloc (GstBaseSink * base_sink, guint64 offset, guint size,
-    GstCaps * caps, GstBuffer ** outbuf_ptr)
-{
-  return
-      gst_vaapi_plugin_base_allocate_input_buffer (GST_VAAPI_PLUGIN_BASE
-      (base_sink), caps, outbuf_ptr);
-}
-#endif
 
 static gboolean
 gst_vaapisink_query (GstBaseSink * base_sink, GstQuery * query)
@@ -1534,6 +1518,9 @@
     case PROP_FORCE_ASPECT_RATIO:
       sink->keep_aspect = g_value_get_boolean (value);
       break;
+    case PROP_SIGNAL_HANDOFFS:
+      sink->signal_handoffs = g_value_get_boolean (value);
+      break;
     case PROP_HUE:
     case PROP_SATURATION:
     case PROP_BRIGHTNESS:
@@ -1571,6 +1558,9 @@
     case PROP_FORCE_ASPECT_RATIO:
       g_value_set_boolean (value, sink->keep_aspect);
       break;
+    case PROP_SIGNAL_HANDOFFS:
+      g_value_set_boolean (value, sink->signal_handoffs);
+      break;
     case PROP_HUE:
     case PROP_SATURATION:
     case PROP_BRIGHTNESS:
@@ -1584,6 +1574,28 @@
   }
 }
 
+static gboolean
+gst_vaapisink_unlock (GstBaseSink * base_sink)
+{
+  GstVaapiSink *const sink = GST_VAAPISINK_CAST (base_sink);
+
+  if (sink->window)
+    return gst_vaapi_window_unblock (sink->window);
+
+  return TRUE;
+}
+
+static gboolean
+gst_vaapisink_unlock_stop (GstBaseSink * base_sink)
+{
+  GstVaapiSink *const sink = GST_VAAPISINK_CAST (base_sink);
+
+  if (sink->window)
+    return gst_vaapi_window_unblock_cancel (sink->window);
+
+  return TRUE;
+}
+
 static void
 gst_vaapisink_set_bus (GstElement * element, GstBus * bus)
 {
@@ -1603,6 +1615,7 @@
   GObjectClass *const object_class = G_OBJECT_CLASS (klass);
   GstElementClass *const element_class = GST_ELEMENT_CLASS (klass);
   GstBaseSinkClass *const basesink_class = GST_BASE_SINK_CLASS (klass);
+  GstVideoSinkClass *const videosink_class = GST_VIDEO_SINK_CLASS (klass);
   GstVaapiPluginBaseClass *const base_plugin_class =
       GST_VAAPI_PLUGIN_BASE_CLASS (klass);
   GstPadTemplate *pad_template;
@@ -1622,14 +1635,12 @@
   basesink_class->stop = gst_vaapisink_stop;
   basesink_class->get_caps = gst_vaapisink_get_caps;
   basesink_class->set_caps = gst_vaapisink_set_caps;
-  basesink_class->preroll = gst_vaapisink_show_frame;
-  basesink_class->render = gst_vaapisink_show_frame;
-  basesink_class->query = gst_vaapisink_query;
-#if GST_CHECK_VERSION(1,0,0)
+  basesink_class->query = GST_DEBUG_FUNCPTR (gst_vaapisink_query);
   basesink_class->propose_allocation = gst_vaapisink_propose_allocation;
-#else
-  basesink_class->buffer_alloc = gst_vaapisink_buffer_alloc;
-#endif
+  basesink_class->unlock = gst_vaapisink_unlock;
+  basesink_class->unlock_stop = gst_vaapisink_unlock_stop;
+
+  videosink_class->show_frame = GST_DEBUG_FUNCPTR (gst_vaapisink_show_frame);
 
   element_class->set_bus = gst_vaapisink_set_bus;
   gst_element_class_set_static_metadata (element_class,
@@ -1697,6 +1708,16 @@
       TRUE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
 
   /**
+   * GstVaapiSink:signal-handoffs:
+   *
+   * Send a signal after rendering the buffer.
+   */
+  g_properties[PROP_SIGNAL_HANDOFFS] =
+      g_param_spec_boolean ("signal-handoffs", "Signal handoffs",
+      "Send a signal after rendering the buffer", DEFAULT_SIGNAL_HANDOFFS,
+      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+
+  /**
    * GstVaapiSink:view-id:
    *
    * When not set to -1, the displayed frame will always be the one
@@ -1758,6 +1779,18 @@
       G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT);
 
   g_object_class_install_properties (object_class, N_PROPERTIES, g_properties);
+
+  /**
+   * GstVaapiSink::handoff:
+   * @object: the #GstVaapiSink instance
+   * @buffer: the buffer that was rendered
+   *
+   * This signal gets emitted after rendering the frame.
+   */
+  gst_vaapisink_signals[HANDOFF_SIGNAL] =
+      g_signal_new ("handoff", G_TYPE_FROM_CLASS (klass),
+      G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_generic,
+      G_TYPE_NONE, 1, GST_TYPE_BUFFER | G_SIGNAL_TYPE_STATIC_SCOPE);
 }
 
 static void
@@ -1776,6 +1809,7 @@
   sink->rotation = DEFAULT_ROTATION;
   sink->rotation_req = DEFAULT_ROTATION;
   sink->keep_aspect = TRUE;
+  sink->signal_handoffs = DEFAULT_SIGNAL_HANDOFFS;
   gst_video_info_init (&sink->video_info);
 
   for (i = 0; i < G_N_ELEMENTS (sink->cb_values); i++)
diff -Nru gstreamer-vaapi-0.5.10/gst/vaapi/gstvaapisink.h gstreamer-vaapi-0.6.0/gst/vaapi/gstvaapisink.h
--- gstreamer-vaapi-0.5.10/gst/vaapi/gstvaapisink.h	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst/vaapi/gstvaapisink.h	2015-07-15 12:47:43.000000000 +0000
@@ -110,6 +110,7 @@
   guint use_overlay : 1;
   guint use_rotation : 1;
   guint keep_aspect : 1;
+  guint signal_handoffs : 1;
 };
 
 struct _GstVaapiSinkClass
diff -Nru gstreamer-vaapi-0.5.10/gst/vaapi/gstvaapiupload.c gstreamer-vaapi-0.6.0/gst/vaapi/gstvaapiupload.c
--- gstreamer-vaapi-0.5.10/gst/vaapi/gstvaapiupload.c	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst/vaapi/gstvaapiupload.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,445 +0,0 @@
-/*
- *  gstvaapiupload.c - VA-API video upload element
- *
- *  Copyright (C) 2010-2011 Splitted-Desktop Systems
- *    Author: Gwenole Beauchesne <gwenole.beauchesne@splitted-desktop.com>
- *  Copyright (C) 2011-2013 Intel Corporation
- *    Author: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public License
- *  as published by the Free Software Foundation; either version 2.1
- *  of the License, or (at your option) any later version.
- *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free
- *  Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- *  Boston, MA 02110-1301 USA
- */
-
-/**
- * SECTION:gstvaapiupload
- * @short_description: A video to VA flow filter
- *
- * vaapiupload converts from raw YUV pixels to VA surfaces suitable
- * for the vaapisink element, for example.
- */
-
-#include "gst/vaapi/sysdeps.h"
-#include <gst/gst.h>
-#include <gst/video/video.h>
-
-#include "gstvaapiupload.h"
-#include "gstvaapipluginutil.h"
-#include "gstvaapivideobuffer.h"
-
-#define GST_PLUGIN_NAME "vaapiupload"
-#define GST_PLUGIN_DESC "A video to VA flow filter"
-
-GST_DEBUG_CATEGORY_STATIC(gst_debug_vaapiupload);
-#define GST_CAT_DEFAULT gst_debug_vaapiupload
-
-/* Default templates */
-static const char gst_vaapiupload_yuv_caps_str[] =
-    "video/x-raw-yuv, "
-    "width  = (int) [ 1, MAX ], "
-    "height = (int) [ 1, MAX ]; ";
-
-static const char gst_vaapiupload_vaapi_caps_str[] =
-    GST_VAAPI_SURFACE_CAPS;
-
-static GstStaticPadTemplate gst_vaapiupload_sink_factory =
-    GST_STATIC_PAD_TEMPLATE(
-        "sink",
-        GST_PAD_SINK,
-        GST_PAD_ALWAYS,
-        GST_STATIC_CAPS(gst_vaapiupload_yuv_caps_str));
-
-static GstStaticPadTemplate gst_vaapiupload_src_factory =
-    GST_STATIC_PAD_TEMPLATE(
-        "src",
-        GST_PAD_SRC,
-        GST_PAD_ALWAYS,
-        GST_STATIC_CAPS(gst_vaapiupload_vaapi_caps_str));
-
-G_DEFINE_TYPE_WITH_CODE(
-    GstVaapiUpload,
-    gst_vaapiupload,
-    GST_TYPE_BASE_TRANSFORM,
-    GST_VAAPI_PLUGIN_BASE_INIT_INTERFACES)
-
-static gboolean
-gst_vaapiupload_start(GstBaseTransform *trans);
-
-static gboolean
-gst_vaapiupload_stop(GstBaseTransform *trans);
-
-static GstFlowReturn
-gst_vaapiupload_transform(
-    GstBaseTransform *trans,
-    GstBuffer        *inbuf,
-    GstBuffer        *outbuf
-);
-
-static GstCaps *
-gst_vaapiupload_transform_caps(
-    GstBaseTransform *trans,
-    GstPadDirection   direction,
-    GstCaps          *caps
-);
-
-static gboolean
-gst_vaapiupload_set_caps(
-    GstBaseTransform *trans,
-    GstCaps          *incaps,
-    GstCaps          *outcaps
-);
-
-static gboolean
-gst_vaapiupload_get_unit_size(
-    GstBaseTransform *trans,
-    GstCaps          *caps,
-    guint            *size
-);
-
-static GstFlowReturn
-gst_vaapiupload_sinkpad_buffer_alloc(
-    GstPad           *pad,
-    guint64           offset,
-    guint             size,
-    GstCaps          *caps,
-    GstBuffer       **pbuf
-);
-
-static GstFlowReturn
-gst_vaapiupload_prepare_output_buffer(
-    GstBaseTransform *trans,
-    GstBuffer        *inbuf,
-    gint              size,
-    GstCaps          *caps,
-    GstBuffer       **poutbuf
-);
-
-static gboolean
-gst_vaapiupload_query(
-    GstPad   *pad,
-    GstQuery *query
-);
-
-static void
-gst_vaapiupload_destroy(GstVaapiUpload *upload)
-{
-    g_clear_object(&upload->uploader);
-}
-
-static void
-gst_vaapiupload_finalize(GObject *object)
-{
-    gst_vaapiupload_destroy(GST_VAAPIUPLOAD(object));
-
-    gst_vaapi_plugin_base_finalize(GST_VAAPI_PLUGIN_BASE(object));
-    G_OBJECT_CLASS(gst_vaapiupload_parent_class)->finalize(object);
-}
-
-static void
-gst_vaapiupload_class_init(GstVaapiUploadClass *klass)
-{
-    GObjectClass * const object_class = G_OBJECT_CLASS(klass);
-    GstElementClass * const element_class = GST_ELEMENT_CLASS(klass);
-    GstBaseTransformClass * const trans_class = GST_BASE_TRANSFORM_CLASS(klass);
-    GstPadTemplate *pad_template;
-
-    GST_DEBUG_CATEGORY_INIT(gst_debug_vaapiupload,
-                            GST_PLUGIN_NAME, 0, GST_PLUGIN_DESC);
-
-    gst_vaapi_plugin_base_class_init(GST_VAAPI_PLUGIN_BASE_CLASS(klass));
-
-    object_class->finalize      = gst_vaapiupload_finalize;
-
-    trans_class->start          = gst_vaapiupload_start;
-    trans_class->stop           = gst_vaapiupload_stop;
-    trans_class->transform      = gst_vaapiupload_transform;
-    trans_class->transform_caps = gst_vaapiupload_transform_caps;
-    trans_class->set_caps       = gst_vaapiupload_set_caps;
-    trans_class->get_unit_size  = gst_vaapiupload_get_unit_size;
-    trans_class->prepare_output_buffer = gst_vaapiupload_prepare_output_buffer;
-
-    gst_element_class_set_static_metadata(element_class,
-        "VA-API colorspace converter",
-        "Filter/Converter/Video",
-        GST_PLUGIN_DESC,
-        "Gwenole Beauchesne <gwenole.beauchesne@intel.com>");
-
-    /* sink pad */
-    pad_template = gst_static_pad_template_get(&gst_vaapiupload_sink_factory);
-    gst_element_class_add_pad_template(element_class, pad_template);
-
-    /* src pad */
-    pad_template = gst_static_pad_template_get(&gst_vaapiupload_src_factory);
-    gst_element_class_add_pad_template(element_class, pad_template);
-}
-
-static void
-gst_vaapiupload_init(GstVaapiUpload *upload)
-{
-    GstPad *sinkpad, *srcpad;
-
-    gst_vaapi_plugin_base_init(GST_VAAPI_PLUGIN_BASE(upload), GST_CAT_DEFAULT);
-
-    /* Override buffer allocator on sink pad */
-    sinkpad = gst_element_get_static_pad(GST_ELEMENT(upload), "sink");
-    gst_pad_set_bufferalloc_function(
-        sinkpad,
-        gst_vaapiupload_sinkpad_buffer_alloc
-    );
-    gst_pad_set_query_function(sinkpad, gst_vaapiupload_query);
-    gst_object_unref(sinkpad);
-
-    /* Override query on src pad */
-    srcpad = gst_element_get_static_pad(GST_ELEMENT(upload), "src");
-    gst_pad_set_query_function(srcpad, gst_vaapiupload_query);
-    gst_object_unref(srcpad);
-}
-
-static inline gboolean
-gst_vaapiupload_ensure_display(GstVaapiUpload *upload)
-{
-    return gst_vaapi_plugin_base_ensure_display(GST_VAAPI_PLUGIN_BASE(upload));
-}
-
-static gboolean
-gst_vaapiupload_ensure_uploader(GstVaapiUpload *upload)
-{
-    if (!gst_vaapiupload_ensure_display(upload))
-        return FALSE;
-
-    if (!upload->uploader) {
-        upload->uploader = gst_vaapi_uploader_new(
-            GST_VAAPI_PLUGIN_BASE_DISPLAY(upload));
-        if (!upload->uploader)
-            return FALSE;
-    }
-    if (!gst_vaapi_uploader_ensure_display(upload->uploader,
-            GST_VAAPI_PLUGIN_BASE_DISPLAY(upload)))
-        return FALSE;
-    return TRUE;
-}
-
-static gboolean
-gst_vaapiupload_start(GstBaseTransform *trans)
-{
-    GstVaapiUpload * const upload = GST_VAAPIUPLOAD(trans);
-
-    if (!gst_vaapi_plugin_base_open(GST_VAAPI_PLUGIN_BASE(trans)))
-        return FALSE;
-    if (!gst_vaapiupload_ensure_uploader(upload))
-        return FALSE;
-    return TRUE;
-}
-
-static gboolean
-gst_vaapiupload_stop(GstBaseTransform *trans)
-{
-    gst_vaapi_plugin_base_close(GST_VAAPI_PLUGIN_BASE(trans));
-    return TRUE;
-}
-
-static GstFlowReturn
-gst_vaapiupload_transform(
-    GstBaseTransform *trans,
-    GstBuffer        *inbuf,
-    GstBuffer        *outbuf
-)
-{
-    GstVaapiUpload * const upload = GST_VAAPIUPLOAD(trans);
-
-    if (!gst_vaapi_uploader_process(upload->uploader, inbuf, outbuf))
-        return GST_FLOW_UNEXPECTED;
-    return GST_FLOW_OK;
-}
-
-static GstCaps *
-gst_vaapiupload_transform_caps(
-    GstBaseTransform *trans,
-    GstPadDirection   direction,
-    GstCaps          *caps
-)
-{
-    GstVaapiUpload * const upload = GST_VAAPIUPLOAD(trans);
-    GstCaps *out_caps = NULL;
-    GstStructure *structure;
-
-    g_return_val_if_fail(GST_IS_CAPS(caps), NULL);
-
-    structure = gst_caps_get_structure(caps, 0);
-
-    if (direction == GST_PAD_SINK) {
-        if (!gst_structure_has_name(structure, "video/x-raw-yuv"))
-            return NULL;
-        out_caps = gst_caps_from_string(gst_vaapiupload_vaapi_caps_str);
-
-        structure = gst_caps_get_structure(out_caps, 0);
-        gst_structure_set(
-            structure,
-            "type", G_TYPE_STRING, "vaapi",
-            "opengl", G_TYPE_BOOLEAN, USE_GLX,
-            NULL
-        );
-    }
-    else {
-        if (!gst_structure_has_name(structure, GST_VAAPI_SURFACE_CAPS_NAME))
-            return NULL;
-        out_caps = gst_caps_from_string(gst_vaapiupload_yuv_caps_str);
-        if (gst_vaapiupload_ensure_uploader(upload)) {
-            GstCaps *allowed_caps, *inter_caps;
-            allowed_caps = gst_vaapi_uploader_get_caps(upload->uploader);
-            if (!allowed_caps)
-                return NULL;
-            inter_caps = gst_caps_intersect(out_caps, allowed_caps);
-            gst_caps_unref(out_caps);
-            out_caps = inter_caps;
-        }
-    }
-
-    if (!gst_vaapi_append_surface_caps(out_caps, caps)) {
-        gst_caps_unref(out_caps);
-        return NULL;
-    }
-    return out_caps;
-}
-
-static gboolean
-gst_vaapiupload_set_caps(
-    GstBaseTransform *trans,
-    GstCaps          *incaps,
-    GstCaps          *outcaps
-)
-{
-    GstVaapiPluginBase * const plugin = GST_VAAPI_PLUGIN_BASE(trans);
-    GstVaapiUpload * const upload = GST_VAAPIUPLOAD(trans);
-
-    if (!gst_vaapi_plugin_base_set_caps(plugin, incaps, outcaps))
-        return FALSE;
-    if (!gst_vaapi_uploader_ensure_caps(upload->uploader, incaps, outcaps))
-        return FALSE;
-    return TRUE;
-}
-
-static gboolean
-gst_vaapiupload_get_unit_size(
-    GstBaseTransform *trans,
-    GstCaps          *caps,
-    guint            *size
-)
-{
-    GstStructure * const structure = gst_caps_get_structure(caps, 0);
-    GstVideoFormat format;
-    gint width, height;
-
-    if (gst_structure_has_name(structure, GST_VAAPI_SURFACE_CAPS_NAME))
-        *size = 0;
-    else {
-        if (!gst_video_format_parse_caps(caps, &format, &width, &height))
-            return FALSE;
-        *size = gst_video_format_get_size(format, width, height);
-    }
-    return TRUE;
-}
-
-static GstFlowReturn
-gst_vaapiupload_buffer_alloc(
-    GstBaseTransform *trans,
-    guint             size,
-    GstCaps          *caps,
-    GstBuffer       **pbuf
-)
-{
-    GstVaapiUpload * const upload = GST_VAAPIUPLOAD(trans);
-
-    *pbuf = NULL;
-
-    if (!gst_vaapi_uploader_ensure_display(upload->uploader,
-            GST_VAAPI_PLUGIN_BASE_DISPLAY(upload)))
-        return GST_FLOW_NOT_SUPPORTED;
-    if (!gst_vaapi_uploader_ensure_caps(upload->uploader, caps, NULL))
-        return GST_FLOW_NOT_SUPPORTED;
-
-    /* Allocate a regular GstBuffer if direct rendering is not supported */
-    if (!gst_vaapi_uploader_has_direct_rendering(upload->uploader))
-        return GST_FLOW_OK;
-
-    *pbuf = gst_vaapi_uploader_get_buffer(upload->uploader);
-    return GST_FLOW_OK;
-}
-
-static GstFlowReturn
-gst_vaapiupload_sinkpad_buffer_alloc(
-    GstPad           *pad,
-    guint64           offset,
-    guint             size,
-    GstCaps          *caps,
-    GstBuffer       **pbuf
-)
-{
-    GstBaseTransform *trans;
-    GstFlowReturn ret;
-
-    trans = GST_BASE_TRANSFORM(gst_pad_get_parent_element(pad));
-    if (!trans)
-        return GST_FLOW_UNEXPECTED;
-
-    ret = gst_vaapiupload_buffer_alloc(trans, size, caps, pbuf);
-    gst_object_unref(trans);
-    return ret;
-}
-
-static GstFlowReturn
-gst_vaapiupload_prepare_output_buffer(
-    GstBaseTransform *trans,
-    GstBuffer        *inbuf,
-    gint              size,
-    GstCaps          *caps,
-    GstBuffer       **poutbuf
-)
-{
-    GstVaapiUpload * const upload = GST_VAAPIUPLOAD(trans);
-    GstBuffer *buffer;
-
-    *poutbuf = NULL;
-
-    if (!gst_vaapi_uploader_has_direct_rendering(upload->uploader))
-        buffer = gst_vaapi_uploader_get_buffer(upload->uploader);
-    else
-        buffer = gst_vaapi_video_buffer_new_from_buffer(inbuf);
-    if (!buffer)
-        return GST_FLOW_UNEXPECTED;
-
-    gst_buffer_set_caps(buffer, caps);
-    GST_BUFFER_DATA(buffer) = NULL;
-    GST_BUFFER_SIZE(buffer) = 0;
-
-    *poutbuf = buffer;
-    return GST_FLOW_OK;
-}
-
-static gboolean
-gst_vaapiupload_query(GstPad *pad, GstQuery *query)
-{
-  GstVaapiUpload *upload = GST_VAAPIUPLOAD (gst_pad_get_parent_element (pad));
-  gboolean res;
-
-  GST_DEBUG ("sharing display %p", GST_VAAPI_PLUGIN_BASE_DISPLAY(upload));
-
-  if (gst_vaapi_reply_to_query (query, GST_VAAPI_PLUGIN_BASE_DISPLAY(upload)))
-    res = TRUE;
-  else
-    res = gst_pad_query_default (pad, query);
-
-  gst_object_unref (upload);
-  return res;
-}
diff -Nru gstreamer-vaapi-0.5.10/gst/vaapi/gstvaapiuploader.c gstreamer-vaapi-0.6.0/gst/vaapi/gstvaapiuploader.c
--- gstreamer-vaapi-0.5.10/gst/vaapi/gstvaapiuploader.c	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst/vaapi/gstvaapiuploader.c	2015-07-15 12:47:43.000000000 +0000
@@ -22,7 +22,7 @@
  *  Boston, MA 02110-1301 USA
  */
 
-#include "gst/vaapi/sysdeps.h"
+#include "gstcompat.h"
 #include <string.h>
 #include <gst/video/video.h>
 #include <gst/vaapi/gstvaapisurface.h>
@@ -479,10 +479,6 @@
     GST_WARNING ("failed to map VA image");
     goto error;
   }
-#if !GST_CHECK_VERSION(1,0,0)
-  GST_BUFFER_DATA (buffer) = gst_vaapi_image_get_plane (image, 0);
-  GST_BUFFER_SIZE (buffer) = gst_vaapi_image_get_data_size (image);
-#endif
   return buffer;
 
 error:
diff -Nru gstreamer-vaapi-0.5.10/gst/vaapi/gstvaapiupload.h gstreamer-vaapi-0.6.0/gst/vaapi/gstvaapiupload.h
--- gstreamer-vaapi-0.5.10/gst/vaapi/gstvaapiupload.h	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst/vaapi/gstvaapiupload.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,77 +0,0 @@
-/*
- *  gstvaapiupload.h - VA-API video upload element
- *
- *  Copyright (C) 2010-2011 Splitted-Desktop Systems
- *    Author: Gwenole Beauchesne <gwenole.beauchesne@splitted-desktop.com>
- *  Copyright (C) 2011-2012 Intel Corporation
- *    Author: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public License
- *  as published by the Free Software Foundation; either version 2.1
- *  of the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this program; if not, write to the Free
- *  Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- *  Boston, MA 02110-1301 USA
-*/
-
-#ifndef GST_VAAPIUPLOAD_H
-#define GST_VAAPIUPLOAD_H
-
-#include "gstvaapipluginbase.h"
-#include "gstvaapiuploader.h"
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_VAAPIUPLOAD \
-    (gst_vaapiupload_get_type())
-
-#define GST_VAAPIUPLOAD(obj)                            \
-    (G_TYPE_CHECK_INSTANCE_CAST((obj),                  \
-                                GST_TYPE_VAAPIUPLOAD,   \
-                                GstVaapiUpload))
-
-#define GST_VAAPIUPLOAD_CLASS(klass)                    \
-    (G_TYPE_CHECK_CLASS_CAST((klass),                   \
-                             GST_TYPE_VAAPIUPLOAD,      \
-                             GstVaapiUploadClass))
-
-#define GST_IS_VAAPIUPLOAD(obj) \
-    (G_TYPE_CHECK_INSTANCE_TYPE((obj), GST_TYPE_VAAPIUPLOAD))
-
-#define GST_IS_VAAPIUPLOAD_CLASS(klass) \
-    (G_TYPE_CHECK_CLASS_TYPE((klass), GST_TYPE_VAAPIUPLOAD))
-
-#define GST_VAAPIUPLOAD_GET_CLASS(obj)                  \
-    (G_TYPE_INSTANCE_GET_CLASS((obj),                   \
-                               GST_TYPE_VAAPIUPLOAD,    \
-                               GstVaapiUploadClass))
-
-typedef struct _GstVaapiUpload                  GstVaapiUpload;
-typedef struct _GstVaapiUploadClass             GstVaapiUploadClass;
-
-struct _GstVaapiUpload {
-    /*< private >*/
-    GstVaapiPluginBase  parent_instance;
-
-    GstVaapiUploader   *uploader;
-};
-
-struct _GstVaapiUploadClass {
-    /*< private >*/
-    GstVaapiPluginBaseClass parent_class;
-};
-
-GType
-gst_vaapiupload_get_type(void) G_GNUC_CONST;
-
-G_END_DECLS
-
-#endif /* GST_VAAPIUPLOAD_H */
diff -Nru gstreamer-vaapi-0.5.10/gst/vaapi/gstvaapivideobuffer.c gstreamer-vaapi-0.6.0/gst/vaapi/gstvaapivideobuffer.c
--- gstreamer-vaapi-0.5.10/gst/vaapi/gstvaapivideobuffer.c	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst/vaapi/gstvaapivideobuffer.c	2015-07-15 12:47:43.000000000 +0000
@@ -27,240 +27,14 @@
  * @short_description: VA video buffer for GStreamer
  */
 
-#include "gst/vaapi/sysdeps.h"
+#include "gstcompat.h"
 #include "gstvaapivideobuffer.h"
-#if USE_X11 && !GST_CHECK_VERSION(1,1,0)
-# include "gstvaapivideoconverter_x11.h"
-#endif
-#if USE_GLX && !GST_CHECK_VERSION(1,1,0)
-# include "gstvaapivideoconverter_glx.h"
-#endif
 
-#if GST_CHECK_VERSION(1,1,0)
 static inline GstBuffer *
 gst_surface_buffer_new (void)
 {
   return gst_buffer_new ();
 }
-#elif GST_CHECK_VERSION(1,0,0)
-#include <gst/video/gstsurfacemeta.h>
-
-#define GST_VAAPI_SURFACE_META_CAST(obj) \
-  ((GstVaapiSurfaceMeta *) (obj))
-
-typedef struct _GstVaapiSurfaceMeta GstVaapiSurfaceMeta;
-struct _GstVaapiSurfaceMeta
-{
-  GstSurfaceMeta base;
-  GstBuffer *buffer;
-};
-
-#define GST_VAAPI_SURFACE_META_INFO \
-  gst_vaapi_surface_meta_get_info ()
-
-static const GstMetaInfo *
-gst_vaapi_surface_meta_get_info (void);
-
-typedef GstSurfaceConverter *(*GstSurfaceConverterCreateFunc) (GstSurfaceMeta *
-    meta, const gchar * type, GValue * dest);
-
-#if USE_X11
-static GstSurfaceConverter *
-gst_vaapi_surface_create_converter_x11 (GstSurfaceMeta * base_meta,
-    const gchar * type, GValue * dest)
-{
-  GstVaapiSurfaceMeta *const meta = GST_VAAPI_SURFACE_META_CAST (base_meta);
-
-  return gst_vaapi_video_converter_x11_new (meta->buffer, type, dest);
-}
-
-#undef  gst_vaapi_video_converter_x11_new
-#define gst_vaapi_video_converter_x11_new \
-  gst_vaapi_surface_create_converter_x11
-#endif
-
-#if USE_GLX
-static GstSurfaceConverter *
-gst_vaapi_surface_create_converter_glx (GstSurfaceMeta * base_meta,
-    const gchar * type, GValue * dest)
-{
-  GstVaapiSurfaceMeta *const meta = GST_VAAPI_SURFACE_META_CAST (base_meta);
-
-  return gst_vaapi_video_converter_glx_new (meta->buffer, type, dest);
-}
-
-#undef  gst_vaapi_video_converter_glx_new
-#define gst_vaapi_video_converter_glx_new \
-  gst_vaapi_surface_create_converter_glx
-#endif
-
-static GstSurfaceConverter *
-gst_vaapi_surface_create_converter (GstSurfaceMeta * base_meta,
-    const gchar * type, GValue * dest)
-{
-  GstVaapiSurfaceMeta *const meta = GST_VAAPI_SURFACE_META_CAST (base_meta);
-  GstVaapiVideoMeta *const vmeta =
-      gst_buffer_get_vaapi_video_meta (meta->buffer);
-  GstSurfaceConverterCreateFunc func;
-
-  if (G_UNLIKELY (!vmeta))
-    return NULL;
-
-  func = (GstSurfaceConverterCreateFunc)
-      gst_vaapi_video_meta_get_surface_converter (vmeta);
-
-  return func ? func (base_meta, type, dest) : NULL;
-}
-
-static gboolean
-gst_vaapi_surface_meta_init (GstVaapiSurfaceMeta * meta, gpointer params,
-    GstBuffer * buffer)
-{
-  meta->base.create_converter = gst_vaapi_surface_create_converter;
-  meta->buffer = buffer;
-  return TRUE;
-}
-
-static void
-gst_vaapi_surface_meta_free (GstVaapiSurfaceMeta * meta, GstBuffer * buffer)
-{
-}
-
-static gboolean
-gst_vaapi_surface_meta_transform (GstBuffer * dst_buffer, GstMeta * meta,
-    GstBuffer * src_buffer, GQuark type, gpointer data)
-{
-  GstVaapiVideoMeta *const src_vmeta =
-      gst_buffer_get_vaapi_video_meta (src_buffer);
-
-  if (GST_META_TRANSFORM_IS_COPY (type)) {
-    GstVaapiSurfaceMeta *const dst_smeta =
-        GST_VAAPI_SURFACE_META_CAST (gst_buffer_add_meta (dst_buffer,
-            GST_VAAPI_SURFACE_META_INFO, NULL));
-
-    /* Note: avoid meta lookups in gst_vaapi_surface_create_converter()
-       by directly calling the GstVaapiVideoMeta::surface_converter hook */
-    dst_smeta->base.create_converter = (GstSurfaceConverterCreateFunc)
-        gst_vaapi_video_meta_get_surface_converter (src_vmeta);
-    return TRUE;
-  }
-  return FALSE;
-}
-
-const GstMetaInfo *
-gst_vaapi_surface_meta_get_info (void)
-{
-  static gsize g_meta_info;
-
-  if (g_once_init_enter (&g_meta_info)) {
-    gsize meta_info =
-        GPOINTER_TO_SIZE (gst_meta_register (GST_SURFACE_META_API_TYPE,
-            "GstVaapiSurfaceMeta", sizeof (GstVaapiSurfaceMeta),
-            (GstMetaInitFunction) gst_vaapi_surface_meta_init,
-            (GstMetaFreeFunction) gst_vaapi_surface_meta_free,
-            (GstMetaTransformFunction) gst_vaapi_surface_meta_transform));
-    g_once_init_leave (&g_meta_info, meta_info);
-  }
-  return GSIZE_TO_POINTER (g_meta_info);
-}
-
-static GstBuffer *
-gst_surface_buffer_new (void)
-{
-  GstBuffer *const buffer = gst_buffer_new ();
-
-  if (buffer)
-    gst_buffer_add_meta (buffer, GST_VAAPI_SURFACE_META_INFO, NULL);
-  return buffer;
-}
-#else
-#include <gst/video/gstsurfacebuffer.h>
-
-#define GST_VAAPI_TYPE_VIDEO_BUFFER \
-  (gst_vaapi_video_buffer_get_type ())
-#define GST_VAAPI_VIDEO_BUFFER(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_VAAPI_TYPE_VIDEO_BUFFER, \
-      GstVaapiVideoBuffer))
-#define GST_VAAPI_VIDEO_BUFFER_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST ((klass), GST_VAAPI_TYPE_VIDEO_BUFFER, \
-      GstVaapiVideoBufferClass))
-#define GST_VAAPI_IS_VIDEO_BUFFER(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_VAAPI_TYPE_VIDEO_BUFFER))
-#define GST_VAAPI_IS_VIDEO_BUFFER_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_VAAPI_TYPE_VIDEO_BUFFER))
-#define GST_VAAPI_VIDEO_BUFFER_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_VAAPI_TYPE_VIDEO_BUFFER, \
-      GstVaapiVideoBufferClass))
-
-typedef struct _GstVaapiVideoBufferClass GstVaapiVideoBufferClass;
-
-/**
- * GstVaapiVideoBuffer:
- *
- * A #GstBuffer holding video objects (#GstVaapiSurface and #GstVaapiImage).
- */
-struct _GstVaapiVideoBuffer
-{
-  /*< private >*/
-  GstSurfaceBuffer parent_instance;
-};
-
-/**
- * GstVaapiVideoBufferClass:
- *
- * A #GstBuffer holding video objects
- */
-struct _GstVaapiVideoBufferClass
-{
-  /*< private >*/
-  GstSurfaceBufferClass parent_class;
-};
-
-GType
-gst_vaapi_video_buffer_get_type (void) G_GNUC_CONST;
-
-G_DEFINE_TYPE (GstVaapiVideoBuffer,
-    gst_vaapi_video_buffer, GST_TYPE_SURFACE_BUFFER);
-
-typedef GstSurfaceConverter *
-(*GstSurfaceConverterCreateFunc) (GstSurfaceBuffer * surface,
-    const gchar * type, GValue * dest);
-
-static GstSurfaceConverter *
-gst_vaapi_video_buffer_create_converter (GstSurfaceBuffer * surface,
-    const gchar * type, GValue * dest)
-{
-  GstVaapiVideoMeta *const meta =
-      gst_buffer_get_vaapi_video_meta (GST_BUFFER (surface));
-  GstSurfaceConverterCreateFunc func;
-
-  g_return_val_if_fail (meta != NULL, NULL);
-
-  func = (GstSurfaceConverterCreateFunc)
-      gst_vaapi_video_meta_get_surface_converter (meta);
-
-  return func ? func (surface, type, dest) : NULL;
-}
-
-static void
-gst_vaapi_video_buffer_class_init (GstVaapiVideoBufferClass * klass)
-{
-  GstSurfaceBufferClass *const surface_class = GST_SURFACE_BUFFER_CLASS (klass);
-
-  surface_class->create_converter = gst_vaapi_video_buffer_create_converter;
-}
-
-static void
-gst_vaapi_video_buffer_init (GstVaapiVideoBuffer * buffer)
-{
-}
-
-static inline GstBuffer *
-gst_surface_buffer_new (void)
-{
-  return GST_BUFFER_CAST (gst_mini_object_new (GST_VAAPI_TYPE_VIDEO_BUFFER));
-}
-#endif
 
 static GFunc
 get_surface_converter (GstVaapiDisplay * display)
@@ -268,16 +42,6 @@
   GFunc func;
 
   switch (gst_vaapi_display_get_class_type (display)) {
-#if USE_X11 && !GST_CHECK_VERSION(1,1,0)
-    case GST_VAAPI_DISPLAY_TYPE_X11:
-      func = (GFunc) gst_vaapi_video_converter_x11_new;
-      break;
-#endif
-#if USE_GLX && !GST_CHECK_VERSION(1,1,0)
-    case GST_VAAPI_DISPLAY_TYPE_GLX:
-      func = (GFunc) gst_vaapi_video_converter_glx_new;
-      break;
-#endif
     default:
       func = NULL;
       break;
diff -Nru gstreamer-vaapi-0.5.10/gst/vaapi/gstvaapivideobufferpool.c gstreamer-vaapi-0.6.0/gst/vaapi/gstvaapivideobufferpool.c
--- gstreamer-vaapi-0.5.10/gst/vaapi/gstvaapivideobufferpool.c	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst/vaapi/gstvaapivideobufferpool.c	2015-07-15 12:47:43.000000000 +0000
@@ -20,11 +20,11 @@
  *  Boston, MA 02110-1301 USA
  */
 
-#include "gst/vaapi/sysdeps.h"
+#include "gstcompat.h"
 #include "gstvaapivideobufferpool.h"
 #include "gstvaapivideobuffer.h"
 #include "gstvaapivideomemory.h"
-#if GST_CHECK_VERSION(1,1,0) && USE_GLX
+#if (USE_GLX || USE_EGL)
 #include "gstvaapivideometa_texture.h"
 #endif
 
@@ -64,10 +64,10 @@
   GstVaapiVideoBufferPoolPrivate *const priv =
       GST_VAAPI_VIDEO_BUFFER_POOL (object)->priv;
 
-  G_OBJECT_CLASS (gst_vaapi_video_buffer_pool_parent_class)->finalize (object);
-
   gst_vaapi_display_replace (&priv->display, NULL);
   g_clear_object (&priv->allocator);
+
+  G_OBJECT_CLASS (gst_vaapi_video_buffer_pool_parent_class)->finalize (object);
 }
 
 static void
@@ -287,8 +287,7 @@
       vmeta->unmap = gst_video_meta_unmap_vaapi_memory;
     }
   }
-
-#if GST_CHECK_VERSION(1,1,0) && USE_GLX
+#if (USE_GLX || USE_EGL)
   if (priv->has_texture_upload_meta)
     gst_buffer_add_texture_upload_meta (buffer);
 #endif
diff -Nru gstreamer-vaapi-0.5.10/gst/vaapi/gstvaapivideocontext.c gstreamer-vaapi-0.6.0/gst/vaapi/gstvaapivideocontext.c
--- gstreamer-vaapi-0.5.10/gst/vaapi/gstvaapivideocontext.c	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst/vaapi/gstvaapivideocontext.c	2015-07-15 12:47:43.000000000 +0000
@@ -23,26 +23,24 @@
  *  Boston, MA 02110-1301 USA
  */
 
-#include "gst/vaapi/sysdeps.h"
+#include "gstcompat.h"
 #include "gstvaapivideocontext.h"
 
-#if GST_CHECK_VERSION(1,1,0)
-
 GST_DEBUG_CATEGORY_STATIC (GST_CAT_CONTEXT);
 
 #define GST_VAAPI_TYPE_DISPLAY \
   gst_vaapi_display_get_type ()
 
 GType
-gst_vaapi_display_get_type (void) G_GNUC_CONST;
+gst_vaapi_display_get_type (void)
+    G_GNUC_CONST;
 
 G_DEFINE_BOXED_TYPE (GstVaapiDisplay, gst_vaapi_display,
     (GBoxedCopyFunc) gst_vaapi_display_ref,
     (GBoxedFreeFunc) gst_vaapi_display_unref);
 
-GstContext *
-gst_vaapi_video_context_new_with_display (GstVaapiDisplay * display,
-    gboolean persistent)
+     GstContext *gst_vaapi_video_context_new_with_display (GstVaapiDisplay *
+    display, gboolean persistent)
 {
   GstContext *context;
   GstStructure *structure;
@@ -177,5 +175,3 @@
   msg = gst_message_new_have_context (GST_OBJECT_CAST (element), context);
   gst_element_post_message (GST_ELEMENT_CAST (element), msg);
 }
-
-#endif
diff -Nru gstreamer-vaapi-0.5.10/gst/vaapi/gstvaapivideocontext.h gstreamer-vaapi-0.6.0/gst/vaapi/gstvaapivideocontext.h
--- gstreamer-vaapi-0.5.10/gst/vaapi/gstvaapivideocontext.h	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst/vaapi/gstvaapivideocontext.h	2015-07-15 12:47:43.000000000 +0000
@@ -29,16 +29,8 @@
 
 #include <gst/vaapi/gstvaapidisplay.h>
 
-#if GST_CHECK_VERSION(1,1,0)
-
 #define GST_VAAPI_DISPLAY_CONTEXT_TYPE_NAME "gst.vaapi.Display"
 
-/* Fake GstVideoContext symbols */
-#define GST_VIDEO_CONTEXT(obj)          (GST_ELEMENT (obj))
-#define GST_IS_VIDEO_CONTEXT(obj)       (GST_IS_ELEMENT (obj))
-#define GstVideoContext                 GstElement
-#define gst_video_context_prepare       gst_vaapi_video_context_prepare
-
 G_GNUC_INTERNAL
 GstContext *
 gst_vaapi_video_context_new_with_display (GstVaapiDisplay * display,
@@ -58,22 +50,4 @@
 gst_vaapi_video_context_propagate (GstElement * element,
     GstVaapiDisplay * display);
 
-#else
-#include <gst/video/videocontext.h>
-
-static inline void
-gst_vaapi_video_context_prepare (GstVideoContext * context,
-    const gchar ** types)
-{
-  gst_video_context_prepare (context, types);
-}
-
-static inline void
-gst_vaapi_video_context_propagate (GstVideoContext * context,
-    GstVaapiDisplay * display)
-{
-}
-
-#endif
-
 #endif /* GST_VAAPI_VIDEO_CONTEXT_H */
diff -Nru gstreamer-vaapi-0.5.10/gst/vaapi/gstvaapivideoconverter_glx.c gstreamer-vaapi-0.6.0/gst/vaapi/gstvaapivideoconverter_glx.c
--- gstreamer-vaapi-0.5.10/gst/vaapi/gstvaapivideoconverter_glx.c	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst/vaapi/gstvaapivideoconverter_glx.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,162 +0,0 @@
-/*
- *  gstvaapivideoconverter_glx.c - Gst VA video converter
- *
- *  Copyright (C) 2011-2013 Intel Corporation
- *    Author: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
- *  Copyright (C) 2011 Collabora Ltd.
- *    Author: Nicolas Dufresne <nicolas.dufresne@collabora.com>
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public License
- *  as published by the Free Software Foundation; either version 2.1
- *  of the License, or (at your option) any later version.
- *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free
- *  Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- *  Boston, MA 02110-1301 USA
- */
-
-#include "gst/vaapi/sysdeps.h"
-#include <gst/vaapi/gstvaapitexture_glx.h>
-#include "gstvaapivideoconverter_glx.h"
-#include "gstvaapivideoconverter_x11.h"
-#include "gstvaapipluginutil.h"
-#include "gstvaapivideometa.h"
-
-#if GST_CHECK_VERSION(1,0,0)
-typedef gboolean (*GstSurfaceUploadFunction) (GstSurfaceConverter *,
-    GstBuffer *);
-#else
-typedef gboolean (*GstSurfaceUploadFunction) (GstSurfaceConverter *,
-    GstSurfaceBuffer *);
-#endif
-
-static void
-gst_vaapi_video_converter_glx_iface_init (GstSurfaceConverterInterface * iface);
-
-G_DEFINE_TYPE_WITH_CODE (GstVaapiVideoConverterGLX,
-    gst_vaapi_video_converter_glx,
-    G_TYPE_OBJECT,
-    G_IMPLEMENT_INTERFACE (GST_TYPE_SURFACE_CONVERTER,
-        gst_vaapi_video_converter_glx_iface_init));
-
-#define GST_VAAPI_VIDEO_CONVERTER_GLX_GET_PRIVATE(obj) \
-  (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GST_VAAPI_TYPE_VIDEO_CONVERTER_GLX, \
-      GstVaapiVideoConverterGLXPrivate))
-
-struct _GstVaapiVideoConverterGLXPrivate
-{
-  GstVaapiTexture *texture;
-};
-
-static gboolean
-gst_vaapi_video_converter_glx_upload (GstSurfaceConverter * self,
-    GstBuffer * buffer);
-
-static void
-gst_vaapi_video_converter_glx_dispose (GObject * object)
-{
-  GstVaapiVideoConverterGLXPrivate *const priv =
-      GST_VAAPI_VIDEO_CONVERTER_GLX (object)->priv;
-
-  gst_vaapi_texture_replace (&priv->texture, NULL);
-
-  G_OBJECT_CLASS (gst_vaapi_video_converter_glx_parent_class)->dispose (object);
-}
-
-static void
-gst_vaapi_video_converter_glx_class_init (GstVaapiVideoConverterGLXClass *
-    klass)
-{
-  GObjectClass *const object_class = G_OBJECT_CLASS (klass);
-
-  g_type_class_add_private (klass, sizeof (GstVaapiVideoConverterGLXPrivate));
-
-  object_class->dispose = gst_vaapi_video_converter_glx_dispose;
-}
-
-static void
-gst_vaapi_video_converter_glx_init (GstVaapiVideoConverterGLX * buffer)
-{
-  buffer->priv = GST_VAAPI_VIDEO_CONVERTER_GLX_GET_PRIVATE (buffer);
-}
-
-static void
-gst_vaapi_video_converter_glx_iface_init (GstSurfaceConverterInterface * iface)
-{
-  iface->upload = (GstSurfaceUploadFunction)
-      gst_vaapi_video_converter_glx_upload;
-}
-
-/**
- * gst_vaapi_video_converter_glx_new:
- * @surface: the #GstSurfaceBuffer
- * @type: type of the target buffer (must be "opengl")
- * @dest: target of the conversion (must be GL texture id)
- *
- * Creates an empty #GstBuffer. The caller is responsible for
- * completing the initialization of the buffer with the
- * gst_vaapi_video_converter_glx_set_*() functions.
- *
- * Return value: the newly allocated #GstBuffer, or %NULL on error
- */
-GstSurfaceConverter *
-gst_vaapi_video_converter_glx_new (GstBuffer * buffer, const gchar * type,
-    GValue * dest)
-{
-  GstVaapiVideoMeta *const meta = gst_buffer_get_vaapi_video_meta (buffer);
-  GstVaapiTexture *texture;
-  GstVaapiVideoConverterGLX *converter;
-
-  /* Check for "opengl" request, or chain up to X11 converter */
-  if (strcmp (type, "opengl") != 0 || !G_VALUE_HOLDS_UINT (dest))
-    return gst_vaapi_video_converter_x11_new (buffer, type, dest);
-
-  /* FIXME Should we assume target and format ? */
-  texture =
-      gst_vaapi_texture_glx_new_wrapped (gst_vaapi_video_meta_get_display
-      (meta), g_value_get_uint (dest), GL_TEXTURE_2D, GL_BGRA);
-  if (!texture)
-    return NULL;
-
-  converter = g_object_new (GST_VAAPI_TYPE_VIDEO_CONVERTER_GLX, NULL);
-  converter->priv->texture = texture;
-  return GST_SURFACE_CONVERTER (converter);
-}
-
-gboolean
-gst_vaapi_video_converter_glx_upload (GstSurfaceConverter * self,
-    GstBuffer * buffer)
-{
-  GstVaapiVideoConverterGLXPrivate *const priv =
-      GST_VAAPI_VIDEO_CONVERTER_GLX (self)->priv;
-  GstVaapiVideoMeta *const meta = gst_buffer_get_vaapi_video_meta (buffer);
-  GstVaapiSurfaceProxy *const proxy =
-      gst_vaapi_video_meta_get_surface_proxy (meta);
-  GstVaapiSurface *const surface = gst_vaapi_surface_proxy_get_surface (proxy);
-  GstVaapiDisplay *new_dpy, *old_dpy;
-
-  new_dpy = gst_vaapi_object_get_display (GST_VAAPI_OBJECT (surface));
-  old_dpy = gst_vaapi_object_get_display (GST_VAAPI_OBJECT (priv->texture));
-
-  if (old_dpy != new_dpy) {
-    const guint texture = gst_vaapi_texture_get_id (priv->texture);
-
-    gst_vaapi_texture_replace (&priv->texture, NULL);
-    priv->texture = gst_vaapi_texture_glx_new_wrapped (new_dpy,
-        texture, GL_TEXTURE_2D, GL_BGRA);
-  }
-
-  if (!gst_vaapi_apply_composition (surface, buffer))
-    GST_WARNING ("could not update subtitles");
-
-  return gst_vaapi_texture_put_surface (priv->texture, surface,
-      gst_vaapi_surface_proxy_get_crop_rect (proxy),
-      gst_vaapi_video_meta_get_render_flags (meta));
-}
diff -Nru gstreamer-vaapi-0.5.10/gst/vaapi/gstvaapivideoconverter_glx.h gstreamer-vaapi-0.6.0/gst/vaapi/gstvaapivideoconverter_glx.h
--- gstreamer-vaapi-0.5.10/gst/vaapi/gstvaapivideoconverter_glx.h	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst/vaapi/gstvaapivideoconverter_glx.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,89 +0,0 @@
-/*
- *  gstvaapivideoconverter_glx.h - Gstreamer/VA video converter
- *
- *  Copyright (C) 2011-2013 Intel Corporation
- *    Author: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
- *  Copyright (C) 2011 Collabora Ltd.
- *    Author: Nicolas Dufresne <nicolas.dufresne@collabora.com>
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public License
- *  as published by the Free Software Foundation; either version 2.1
- *  of the License, or (at your option) any later version.
- *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free
- *  Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- *  Boston, MA 02110-1301 USA
- */
-
-#ifndef GST_VAAPI_VIDEO_CONVERTER_GLX_H
-#define GST_VAAPI_VIDEO_CONVERTER_GLX_H
-
-#include <gst/video/gstsurfaceconverter.h>
-#include "gstvaapivideobuffer.h"
-
-G_BEGIN_DECLS
-
-#define GST_VAAPI_TYPE_VIDEO_CONVERTER_GLX \
-  (gst_vaapi_video_converter_glx_get_type ())
-#define GST_VAAPI_VIDEO_CONVERTER_GLX(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_VAAPI_TYPE_VIDEO_CONVERTER_GLX, \
-      GstVaapiVideoConverterGLX))
-#define GST_VAAPI_VIDEO_CONVERTER_GLX_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST ((klass), GST_VAAPI_TYPE_VIDEO_CONVERTER_GLX, \
-      GstVaapiVideoConverterGLXClass))
-#define GST_VAAPI_IS_VIDEO_CONVERTER_GLX(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_VAAPI_TYPE_VIDEO_CONVERTER_GLX))
-#define GST_VAAPI_IS_VIDEO_CONVERTER_GLX_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_VAAPI_TYPE_VIDEO_CONVERTER_GLX))
-#define GST_VAAPI_VIDEO_CONVERTER_GLX_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_VAAPI_TYPE_VIDEO_CONVERTER_GLX, \
-      GstVaapiVideoConverterGLXClass))
-
-typedef struct _GstVaapiVideoConverterGLX GstVaapiVideoConverterGLX;
-typedef struct _GstVaapiVideoConverterGLXPrivate
-    GstVaapiVideoConverterGLXPrivate;
-typedef struct _GstVaapiVideoConverterGLXClass GstVaapiVideoConverterGLXClass;
-
-/**
- * GstVaapiVideoConverterGLX:
- *
- * Converter to transform VA buffers into GL textures.
- */
-struct _GstVaapiVideoConverterGLX
-{
-  /*< private >*/
-  GObject parent_instance;
-
-  GstVaapiVideoConverterGLXPrivate *priv;
-};
-
-/**
- * GstVaapiVideoConverterGLXClass:
- *
- * Converter class to transform VA buffers into GL textures.
- */
-struct _GstVaapiVideoConverterGLXClass
-{
-  /*< private >*/
-  GObjectClass parent_class;
-};
-
-G_GNUC_INTERNAL
-GType
-gst_vaapi_video_converter_glx_get_type (void) G_GNUC_CONST;
-
-G_GNUC_INTERNAL
-GstSurfaceConverter *
-gst_vaapi_video_converter_glx_new (GstBuffer * buffer, const gchar * type,
-    GValue * dest);
-
-G_END_DECLS
-
-#endif /* GST_VAAPI_VIDEO_CONVERTER_GLX_H */
diff -Nru gstreamer-vaapi-0.5.10/gst/vaapi/gstvaapivideoconverter_x11.c gstreamer-vaapi-0.6.0/gst/vaapi/gstvaapivideoconverter_x11.c
--- gstreamer-vaapi-0.5.10/gst/vaapi/gstvaapivideoconverter_x11.c	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst/vaapi/gstvaapivideoconverter_x11.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,194 +0,0 @@
-/*
- *  gstvaapivideoconverter_x11.h - VA video converter to X11 pixmap
- *
- *  Copyright (C) 2013 Intel Corporation
- *    Author: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public License
- *  as published by the Free Software Foundation; either version 2.1
- *  of the License, or (at your option) any later version.
- *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free
- *  Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- *  Boston, MA 02110-1301 USA
- */
-
-#include "gst/vaapi/sysdeps.h"
-#include <gst/vaapi/gstvaapipixmap_x11.h>
-#include "gstvaapivideoconverter_x11.h"
-#include "gstvaapipluginutil.h"
-#include "gstvaapivideometa.h"
-
-#if GST_CHECK_VERSION(1,0,0)
-typedef gboolean (*GstSurfaceUploadFunction) (GstSurfaceConverter *,
-    GstBuffer *);
-#else
-typedef gboolean (*GstSurfaceUploadFunction) (GstSurfaceConverter *,
-    GstSurfaceBuffer *);
-#endif
-
-static void
-gst_vaapi_video_converter_x11_iface_init (GstSurfaceConverterInterface * iface);
-
-G_DEFINE_TYPE_WITH_CODE (GstVaapiVideoConverterX11,
-    gst_vaapi_video_converter_x11,
-    G_TYPE_OBJECT,
-    G_IMPLEMENT_INTERFACE (GST_TYPE_SURFACE_CONVERTER,
-        gst_vaapi_video_converter_x11_iface_init));
-
-#define GST_VAAPI_VIDEO_CONVERTER_X11_GET_PRIVATE(obj) \
-  (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GST_VAAPI_TYPE_VIDEO_CONVERTER_X11, \
-      GstVaapiVideoConverterX11Private))
-
-struct _GstVaapiVideoConverterX11Private
-{
-  GstVaapiPixmap *pixmap;
-  XID pixmap_id;
-};
-
-static gboolean
-gst_vaapi_video_converter_x11_upload (GstSurfaceConverter * self,
-    GstBuffer * buffer);
-
-static void
-gst_vaapi_video_converter_x11_dispose (GObject * object)
-{
-  GstVaapiVideoConverterX11Private *const priv =
-      GST_VAAPI_VIDEO_CONVERTER_X11 (object)->priv;
-
-  gst_vaapi_pixmap_replace (&priv->pixmap, NULL);
-
-  G_OBJECT_CLASS (gst_vaapi_video_converter_x11_parent_class)->dispose (object);
-}
-
-static void
-gst_vaapi_video_converter_x11_class_init (GstVaapiVideoConverterX11Class *
-    klass)
-{
-  GObjectClass *const object_class = G_OBJECT_CLASS (klass);
-
-  g_type_class_add_private (klass, sizeof (GstVaapiVideoConverterX11Private));
-
-  object_class->dispose = gst_vaapi_video_converter_x11_dispose;
-}
-
-static void
-gst_vaapi_video_converter_x11_init (GstVaapiVideoConverterX11 * buffer)
-{
-  buffer->priv = GST_VAAPI_VIDEO_CONVERTER_X11_GET_PRIVATE (buffer);
-}
-
-static void
-gst_vaapi_video_converter_x11_iface_init (GstSurfaceConverterInterface * iface)
-{
-  iface->upload = (GstSurfaceUploadFunction)
-      gst_vaapi_video_converter_x11_upload;
-}
-
-static gboolean
-set_pixmap (GstVaapiVideoConverterX11 * converter, GstVaapiDisplay * display,
-    XID pixmap_id)
-{
-  GstVaapiVideoConverterX11Private *const priv = converter->priv;
-  GstVaapiPixmap *pixmap;
-
-  pixmap = gst_vaapi_pixmap_x11_new_with_xid (display, pixmap_id);
-  if (!pixmap)
-    return FALSE;
-
-  gst_vaapi_pixmap_replace (&priv->pixmap, pixmap);
-  gst_vaapi_pixmap_unref (pixmap);
-  priv->pixmap_id = pixmap_id;
-  return TRUE;
-}
-
-/**
- * gst_vaapi_video_converter_x11_new:
- * @surface: the #GstSurfaceBuffer
- * @type: type of the target buffer (must be "x11-pixmap")
- * @dest: target of the conversion (must be an X11 pixmap id)
- *
- * Creates an empty #GstBuffer. The caller is responsible for
- * completing the initialization of the buffer with the
- * gst_vaapi_video_converter_x11_set_*() functions.
- *
- * Return value: the newly allocated #GstBuffer, or %NULL on error
- */
-GstSurfaceConverter *
-gst_vaapi_video_converter_x11_new (GstBuffer * buffer, const gchar * type,
-    GValue * dest)
-{
-  GstVaapiVideoMeta *const meta = gst_buffer_get_vaapi_video_meta (buffer);
-  GstVaapiVideoConverterX11 *converter;
-
-  /* We only support X11 pixmap conversion */
-  if (strcmp (type, "x11-pixmap") != 0 || !G_VALUE_HOLDS_UINT (dest))
-    return NULL;
-
-  converter = g_object_new (GST_VAAPI_TYPE_VIDEO_CONVERTER_X11, NULL);
-  if (!converter)
-    return NULL;
-
-  if (!set_pixmap (converter, gst_vaapi_video_meta_get_display (meta),
-          g_value_get_uint (dest)))
-    goto error;
-  return GST_SURFACE_CONVERTER (converter);
-
-error:
-  g_object_unref (converter);
-  return NULL;
-}
-
-gboolean
-gst_vaapi_video_converter_x11_upload (GstSurfaceConverter * self,
-    GstBuffer * buffer)
-{
-  GstVaapiVideoConverterX11 *const converter =
-      GST_VAAPI_VIDEO_CONVERTER_X11 (self);
-  GstVaapiVideoConverterX11Private *const priv = converter->priv;
-  GstVaapiVideoMeta *const meta = gst_buffer_get_vaapi_video_meta (buffer);
-  const GstVaapiRectangle *crop_rect = NULL;
-  GstVaapiSurface *surface;
-  GstVaapiDisplay *old_display, *new_display;
-
-  g_return_val_if_fail (meta != NULL, FALSE);
-
-  surface = gst_vaapi_video_meta_get_surface (meta);
-  if (!surface)
-    return FALSE;
-
-  old_display = gst_vaapi_object_get_display (GST_VAAPI_OBJECT (priv->pixmap));
-  new_display = gst_vaapi_object_get_display (GST_VAAPI_OBJECT (surface));
-
-  if (old_display != new_display) {
-    if (!set_pixmap (converter, new_display, priv->pixmap_id))
-      return FALSE;
-  }
-
-  if (!gst_vaapi_apply_composition (surface, buffer))
-    GST_WARNING ("could not update subtitles");
-
-#if GST_CHECK_VERSION(1,0,0)
-  GstVideoCropMeta *const crop_meta = gst_buffer_get_video_crop_meta (buffer);
-  if (crop_meta) {
-    GstVaapiRectangle crop_rect_tmp;
-    crop_rect = &crop_rect_tmp;
-    crop_rect_tmp.x = crop_meta->x;
-    crop_rect_tmp.y = crop_meta->y;
-    crop_rect_tmp.width = crop_meta->width;
-    crop_rect_tmp.height = crop_meta->height;
-  }
-#endif
-  if (!crop_rect)
-    crop_rect = gst_vaapi_video_meta_get_render_rect (meta);
-
-  return gst_vaapi_pixmap_put_surface (priv->pixmap, surface, crop_rect,
-      gst_vaapi_video_meta_get_render_flags (meta));
-}
diff -Nru gstreamer-vaapi-0.5.10/gst/vaapi/gstvaapivideoconverter_x11.h gstreamer-vaapi-0.6.0/gst/vaapi/gstvaapivideoconverter_x11.h
--- gstreamer-vaapi-0.5.10/gst/vaapi/gstvaapivideoconverter_x11.h	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst/vaapi/gstvaapivideoconverter_x11.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,87 +0,0 @@
-/*
- *  gstvaapivideoconverter_x11.h - VA video converter to X11 pixmap
- *
- *  Copyright (C) 2013 Intel Corporation
- *    Author: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public License
- *  as published by the Free Software Foundation; either version 2.1
- *  of the License, or (at your option) any later version.
- *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free
- *  Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- *  Boston, MA 02110-1301 USA
- */
-
-#ifndef GST_VAAPI_VIDEO_CONVERTER_X11_H
-#define GST_VAAPI_VIDEO_CONVERTER_X11_H
-
-#include <gst/video/gstsurfaceconverter.h>
-#include "gstvaapivideobuffer.h"
-
-G_BEGIN_DECLS
-
-#define GST_VAAPI_TYPE_VIDEO_CONVERTER_X11 \
-  (gst_vaapi_video_converter_x11_get_type ())
-#define GST_VAAPI_VIDEO_CONVERTER_X11(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_VAAPI_TYPE_VIDEO_CONVERTER_X11, \
-      GstVaapiVideoConverterX11))
-#define GST_VAAPI_VIDEO_CONVERTER_X11_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST ((klass), GST_VAAPI_TYPE_VIDEO_CONVERTER_X11, \
-      GstVaapiVideoConverterX11Class))
-#define GST_VAAPI_IS_VIDEO_CONVERTER_X11(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_VAAPI_TYPE_VIDEO_CONVERTER_X11))
-#define GST_VAAPI_IS_VIDEO_CONVERTER_X11_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_VAAPI_TYPE_VIDEO_CONVERTER_X11))
-#define GST_VAAPI_VIDEO_CONVERTER_X11_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_VAAPI_TYPE_VIDEO_CONVERTER_X11, \
-      GstVaapiVideoConverterX11Class))
-
-typedef struct _GstVaapiVideoConverterX11 GstVaapiVideoConverterX11;
-typedef struct _GstVaapiVideoConverterX11Private
-    GstVaapiVideoConverterX11Private;
-typedef struct _GstVaapiVideoConverterX11Class GstVaapiVideoConverterX11Class;
-
-/**
- * GstVaapiVideoConverterX11:
- *
- * Converter to transform VA buffers into GL textures.
- */
-struct _GstVaapiVideoConverterX11
-{
-  /*< private >*/
-  GObject parent_instance;
-
-  GstVaapiVideoConverterX11Private *priv;
-};
-
-/**
- * GstVaapiVideoConverterX11Class:
- *
- * Converter class to transform VA buffers into GL textures.
- */
-struct _GstVaapiVideoConverterX11Class
-{
-  /*< private >*/
-  GObjectClass parent_class;
-};
-
-G_GNUC_INTERNAL
-GType
-gst_vaapi_video_converter_x11_get_type (void) G_GNUC_CONST;
-
-G_GNUC_INTERNAL
-GstSurfaceConverter *
-gst_vaapi_video_converter_x11_new (GstBuffer * buffer, const gchar * type,
-    GValue * dest);
-
-G_END_DECLS
-
-#endif /* GST_VAAPI_VIDEO_CONVERTER_X11_H */
diff -Nru gstreamer-vaapi-0.5.10/gst/vaapi/gstvaapivideomemory.c gstreamer-vaapi-0.6.0/gst/vaapi/gstvaapivideomemory.c
--- gstreamer-vaapi-0.5.10/gst/vaapi/gstvaapivideomemory.c	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst/vaapi/gstvaapivideomemory.c	2015-07-15 12:47:43.000000000 +0000
@@ -20,7 +20,8 @@
  *  Boston, MA 02110-1301 USA
  */
 
-#include "gst/vaapi/sysdeps.h"
+#include "gstcompat.h"
+#include <unistd.h>
 #include <gst/vaapi/gstvaapisurface_drm.h>
 #include <gst/vaapi/gstvaapisurfacepool.h>
 #include <gst/vaapi/gstvaapiimagepool.h>
@@ -41,8 +42,7 @@
 /* --- GstVaapiVideoMemory                                              --- */
 /* ------------------------------------------------------------------------ */
 
-static void
-gst_vaapi_video_memory_reset_image (GstVaapiVideoMemory * mem);
+static void gst_vaapi_video_memory_reset_image (GstVaapiVideoMemory * mem);
 
 static guchar *
 get_image_data (GstVaapiImage * image)
@@ -370,7 +370,7 @@
 gboolean
 gst_vaapi_video_memory_sync (GstVaapiVideoMemory * mem)
 {
-  g_return_val_if_fail (mem, NULL);
+  g_return_val_if_fail (mem, FALSE);
 
   return ensure_surface_is_current (mem);
 }
@@ -773,6 +773,7 @@
   GstVaapiSurface *surface;
   GstVaapiSurfaceProxy *proxy;
   GstVaapiBufferProxy *dmabuf_proxy;
+  gint dmabuf_fd;
   const GstVideoInfo *vip;
   guint flags;
 
@@ -803,8 +804,11 @@
   gst_vaapi_video_meta_set_surface_proxy (meta, proxy);
   gst_vaapi_surface_proxy_unref (proxy);
 
-  mem = gst_dmabuf_allocator_alloc (allocator,
-      gst_vaapi_buffer_proxy_get_handle (dmabuf_proxy),
+  dmabuf_fd = gst_vaapi_buffer_proxy_get_handle (dmabuf_proxy);
+  if (dmabuf_fd < 0 || (dmabuf_fd = dup (dmabuf_fd)) < 0)
+    goto error_create_dmabuf_handle;
+
+  mem = gst_dmabuf_allocator_alloc (allocator, dmabuf_fd,
       gst_vaapi_buffer_proxy_get_size (dmabuf_proxy));
   if (!mem)
     goto error_create_dmabuf_memory;
@@ -834,6 +838,12 @@
     gst_vaapi_surface_proxy_unref (proxy);
     return NULL;
   }
+error_create_dmabuf_handle:
+  {
+    GST_ERROR ("failed to duplicate DMABUF handle");
+    gst_vaapi_buffer_proxy_unref (dmabuf_proxy);
+    return NULL;
+  }
 error_create_dmabuf_memory:
   {
     GST_ERROR ("failed to create DMABUF memory");
diff -Nru gstreamer-vaapi-0.5.10/gst/vaapi/gstvaapivideomemory.h gstreamer-vaapi-0.6.0/gst/vaapi/gstvaapivideomemory.h
--- gstreamer-vaapi-0.5.10/gst/vaapi/gstvaapivideomemory.h	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst/vaapi/gstvaapivideomemory.h	2015-07-15 12:47:43.000000000 +0000
@@ -28,9 +28,7 @@
 #include <gst/vaapi/gstvaapidisplay.h>
 #include <gst/vaapi/gstvaapivideopool.h>
 #include "gstvaapivideometa.h"
-#if GST_CHECK_VERSION(1,1,0)
 #include <gst/allocators/allocators.h>
-#endif
 
 G_BEGIN_DECLS
 
@@ -50,9 +48,7 @@
 
 #define GST_VAAPI_VIDEO_MEMORY_NAME             "GstVaapiVideoMemory"
 
-#if GST_CHECK_VERSION(1,1,0)
 #define GST_CAPS_FEATURE_MEMORY_VAAPI_SURFACE   "memory:VASurface"
-#endif
 
 #define GST_VAAPI_VIDEO_MEMORY_FLAG_IS_SET(mem, flag) \
   GST_MEMORY_FLAG_IS_SET (mem, flag)
diff -Nru gstreamer-vaapi-0.5.10/gst/vaapi/gstvaapivideometa.c gstreamer-vaapi-0.6.0/gst/vaapi/gstvaapivideometa.c
--- gstreamer-vaapi-0.5.10/gst/vaapi/gstvaapivideometa.c	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst/vaapi/gstvaapivideometa.c	2015-07-15 12:47:43.000000000 +0000
@@ -27,14 +27,11 @@
  * @short_description: VA video meta for GStreamer
  */
 
-#include "gst/vaapi/sysdeps.h"
+#include "gstcompat.h"
 #include <gst/vaapi/gstvaapiimagepool.h>
 #include <gst/vaapi/gstvaapisurfacepool.h>
 #include "gstvaapivideometa.h"
-
-#if GST_CHECK_VERSION(1,0,0)
-# include "gstvaapivideomemory.h"
-#endif
+#include "gstvaapivideomemory.h"
 
 #define GST_VAAPI_VIDEO_META(obj) \
   ((GstVaapiVideoMeta *) (obj))
@@ -61,14 +58,12 @@
   if (!meta->proxy)
     return FALSE;
 
-#if GST_CHECK_VERSION(1,0,0)
   if (meta->buffer) {
     GstMemory *const mem = gst_buffer_peek_memory (meta->buffer, 0);
 
     if (GST_VAAPI_IS_VIDEO_MEMORY (mem))
       return gst_vaapi_video_memory_sync (GST_VAAPI_VIDEO_MEMORY_CAST (mem));
   }
-#endif
   return TRUE;
 }
 
@@ -146,24 +141,6 @@
   gst_vaapi_surface_proxy_replace (&meta->proxy, NULL);
 }
 
-#if !GST_CHECK_VERSION(1,0,0)
-#define GST_VAAPI_TYPE_VIDEO_META gst_vaapi_video_meta_get_type ()
-static GType
-gst_vaapi_video_meta_get_type (void)
-{
-  static gsize g_type;
-
-  if (g_once_init_enter (&g_type)) {
-    GType type;
-    type = g_boxed_type_register_static ("GstVaapiVideoMeta",
-        (GBoxedCopyFunc) gst_vaapi_video_meta_ref,
-        (GBoxedFreeFunc) gst_vaapi_video_meta_unref);
-    g_once_init_leave (&g_type, type);
-  }
-  return (GType) g_type;
-}
-#endif
-
 static void
 gst_vaapi_video_meta_finalize (GstVaapiVideoMeta * meta)
 {
@@ -554,8 +531,8 @@
 {
   g_return_val_if_fail (GST_VAAPI_IS_VIDEO_META (meta), NULL);
 
-  return ensure_surface_proxy (meta) ? GST_VAAPI_SURFACE_PROXY_SURFACE (meta->
-      proxy) : NULL;
+  return ensure_surface_proxy (meta) ?
+      GST_VAAPI_SURFACE_PROXY_SURFACE (meta->proxy) : NULL;
 }
 
 /**
@@ -707,8 +684,6 @@
     meta->render_rect = *rect;
 }
 
-#if GST_CHECK_VERSION(1,0,0)
-
 #define GST_VAAPI_VIDEO_META_HOLDER(meta) \
   ((GstVaapiVideoMetaHolder *) (meta))
 
@@ -812,64 +787,3 @@
   if (m)
     GST_VAAPI_VIDEO_META_HOLDER (m)->meta = gst_vaapi_video_meta_ref (meta);
 }
-#else
-
-#define GST_VAAPI_VIDEO_META_QUARK gst_vaapi_video_meta_quark_get ()
-static GQuark
-gst_vaapi_video_meta_quark_get (void)
-{
-  static gsize g_quark;
-
-  if (g_once_init_enter (&g_quark)) {
-    gsize quark = (gsize) g_quark_from_static_string ("GstVaapiVideoMeta");
-    g_once_init_leave (&g_quark, quark);
-  }
-  return g_quark;
-}
-
-#define META_QUARK meta_quark_get ()
-static GQuark
-meta_quark_get (void)
-{
-  static gsize g_quark;
-
-  if (g_once_init_enter (&g_quark)) {
-    gsize quark = (gsize) g_quark_from_static_string ("meta");
-    g_once_init_leave (&g_quark, quark);
-  }
-  return g_quark;
-}
-
-GstVaapiVideoMeta *
-gst_buffer_get_vaapi_video_meta (GstBuffer * buffer)
-{
-  GstVaapiVideoMeta *meta;
-  const GstStructure *structure;
-  const GValue *value;
-
-  g_return_val_if_fail (GST_IS_BUFFER (buffer), NULL);
-
-  structure = gst_buffer_get_qdata (buffer, GST_VAAPI_VIDEO_META_QUARK);
-  if (!structure)
-    return NULL;
-
-  value = gst_structure_id_get_value (structure, META_QUARK);
-  if (!value)
-    return NULL;
-
-  meta = GST_VAAPI_VIDEO_META (g_value_get_boxed (value));
-  meta->buffer = buffer;
-  return meta;
-}
-
-void
-gst_buffer_set_vaapi_video_meta (GstBuffer * buffer, GstVaapiVideoMeta * meta)
-{
-  g_return_if_fail (GST_IS_BUFFER (buffer));
-  g_return_if_fail (GST_VAAPI_IS_VIDEO_META (meta));
-
-  gst_buffer_set_qdata (buffer, GST_VAAPI_VIDEO_META_QUARK,
-      gst_structure_id_new (GST_VAAPI_VIDEO_META_QUARK,
-          META_QUARK, GST_VAAPI_TYPE_VIDEO_META, meta, NULL));
-}
-#endif
diff -Nru gstreamer-vaapi-0.5.10/gst/vaapi/gstvaapivideometa.h gstreamer-vaapi-0.6.0/gst/vaapi/gstvaapivideometa.h
--- gstreamer-vaapi-0.5.10/gst/vaapi/gstvaapivideometa.h	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst/vaapi/gstvaapivideometa.h	2015-07-15 12:47:43.000000000 +0000
@@ -35,14 +35,12 @@
 
 typedef struct _GstVaapiVideoMeta GstVaapiVideoMeta;
 
-#if GST_CHECK_VERSION(1,0,0)
 #define GST_VAAPI_VIDEO_META_API_TYPE \
   gst_vaapi_video_meta_api_get_type ()
 
 G_GNUC_INTERNAL
 GType
 gst_vaapi_video_meta_api_get_type (void) G_GNUC_CONST;
-#endif
 
 G_GNUC_INTERNAL
 GstVaapiVideoMeta *
diff -Nru gstreamer-vaapi-0.5.10/gst/vaapi/gstvaapivideometa_texture.c gstreamer-vaapi-0.6.0/gst/vaapi/gstvaapivideometa_texture.c
--- gstreamer-vaapi-0.5.10/gst/vaapi/gstvaapivideometa_texture.c	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst/vaapi/gstvaapivideometa_texture.c	2015-07-15 12:47:43.000000000 +0000
@@ -24,24 +24,99 @@
  *  Boston, MA 02110-1301 USA
  */
 
-#include "gst/vaapi/sysdeps.h"
+#include "gstcompat.h"
+#include "gst/vaapi/ogl_compat.h"
 #include "gstvaapivideometa.h"
+#include "gstvaapivideometa_texture.h"
 #include "gstvaapipluginutil.h"
 
 #if USE_GLX
-#include <GL/gl.h>
 #include <gst/vaapi/gstvaapitexture_glx.h>
 #endif
 
-#if GST_CHECK_VERSION(1,1,0) && USE_GLX
-
-#include "gstvaapivideometa_texture.h"
+#define DEFAULT_FORMAT GST_VIDEO_FORMAT_RGBA
 
+#if (USE_GLX || USE_EGL)
 struct _GstVaapiVideoMetaTexture
 {
   GstVaapiTexture *texture;
+  GstVideoGLTextureType texture_type;
+  guint gl_format;
+  guint width;
+  guint height;
 };
 
+static guint
+get_texture_orientation_flags (GstVideoGLTextureOrientation orientation)
+{
+  guint flags;
+
+  switch (orientation) {
+    case GST_VIDEO_GL_TEXTURE_ORIENTATION_X_NORMAL_Y_FLIP:
+      flags = GST_VAAPI_TEXTURE_ORIENTATION_FLAG_Y_INVERTED;
+      break;
+    case GST_VIDEO_GL_TEXTURE_ORIENTATION_X_FLIP_Y_NORMAL:
+      flags = GST_VAAPI_TEXTURE_ORIENTATION_FLAG_X_INVERTED;
+      break;
+    case GST_VIDEO_GL_TEXTURE_ORIENTATION_X_FLIP_Y_FLIP:
+      flags = GST_VAAPI_TEXTURE_ORIENTATION_FLAG_X_INVERTED |
+          GST_VAAPI_TEXTURE_ORIENTATION_FLAG_Y_INVERTED;
+      break;
+    default:
+      flags = 0;
+      break;
+  }
+  return flags;
+}
+
+static gboolean
+meta_texture_ensure_format (GstVaapiVideoMetaTexture * meta,
+    GstVideoFormat format)
+{
+  switch (format) {
+    case GST_VIDEO_FORMAT_RGBA:
+      meta->gl_format = GL_RGBA;
+      meta->texture_type = GST_VIDEO_GL_TEXTURE_TYPE_RGBA;
+      break;
+    case GST_VIDEO_FORMAT_BGRA:
+      meta->gl_format = GL_BGRA_EXT;
+      /* FIXME: add GST_VIDEO_GL_TEXTURE_TYPE_BGRA extension */
+      meta->texture_type = GST_VIDEO_GL_TEXTURE_TYPE_RGBA;
+      break;
+    default:
+      goto error_unsupported_format;
+  }
+  return TRUE;
+
+  /* ERRORS */
+error_unsupported_format:
+  GST_ERROR ("unsupported texture format %s",
+      gst_video_format_to_string (format));
+  return FALSE;
+}
+
+static gboolean
+meta_texture_ensure_info_from_buffer (GstVaapiVideoMetaTexture * meta,
+    GstBuffer * buffer)
+{
+  GstVideoMeta *vmeta;
+  GstVideoFormat format;
+
+  if (!buffer || !(vmeta = gst_buffer_get_video_meta (buffer))) {
+    format = DEFAULT_FORMAT;
+    meta->width = 0;
+    meta->height = 0;
+  } else {
+    const GstVideoFormatInfo *const fmt_info =
+        gst_video_format_get_info (vmeta->format);
+    format = (fmt_info && GST_VIDEO_FORMAT_INFO_IS_RGB (fmt_info)) ?
+        vmeta->format : DEFAULT_FORMAT;
+    meta->width = vmeta->width;
+    meta->height = vmeta->height;
+  }
+  return meta_texture_ensure_format (meta, format);
+}
+
 static void
 meta_texture_free (GstVaapiVideoMetaTexture * meta)
 {
@@ -62,7 +137,13 @@
     return NULL;
 
   meta->texture = NULL;
+  if (!meta_texture_ensure_info_from_buffer (meta, NULL))
+    goto error;
   return meta;
+
+error:
+  meta_texture_free (meta);
+  return NULL;
 }
 
 static GstVaapiVideoMetaTexture *
@@ -74,6 +155,10 @@
   if (!copy)
     return NULL;
 
+  copy->texture_type = meta->texture_type;
+  copy->gl_format = meta->gl_format;
+  copy->width = meta->width;
+  copy->height = meta->height;
   gst_vaapi_texture_replace (&copy->texture, meta->texture);
   return copy;
 }
@@ -100,13 +185,18 @@
       gst_vaapi_texture_get_id (meta_texture->texture) != texture_id[0]) {
     /* FIXME: should we assume target? */
     GstVaapiTexture *const texture =
-        gst_vaapi_texture_glx_new_wrapped (dpy, texture_id[0],
-        GL_TEXTURE_2D, GL_RGBA);
+        gst_vaapi_texture_new_wrapped (dpy, texture_id[0],
+        GL_TEXTURE_2D, meta_texture->gl_format, meta_texture->width,
+        meta_texture->height);
     gst_vaapi_texture_replace (&meta_texture->texture, texture);
     if (!texture)
       return FALSE;
     gst_vaapi_texture_unref (texture);
   }
+
+  gst_vaapi_texture_set_orientation_flags (meta_texture->texture,
+      get_texture_orientation_flags (meta->texture_orientation));
+
   return gst_vaapi_texture_put_surface (meta_texture->texture, surface,
       gst_vaapi_surface_proxy_get_crop_rect (proxy),
       gst_vaapi_video_meta_get_render_flags (vmeta));
@@ -116,7 +206,6 @@
 gst_buffer_add_texture_upload_meta (GstBuffer * buffer)
 {
   GstVideoGLTextureUploadMeta *meta = NULL;
-  GstVideoGLTextureType tex_type[] = { GST_VIDEO_GL_TEXTURE_TYPE_RGBA };
   GstVaapiVideoMetaTexture *meta_texture;
 
   if (!buffer)
@@ -126,9 +215,12 @@
   if (!meta_texture)
     return FALSE;
 
+  if (!meta_texture_ensure_info_from_buffer (meta_texture, buffer))
+    goto error;
+
   meta = gst_buffer_add_video_gl_texture_upload_meta (buffer,
       GST_VIDEO_GL_TEXTURE_ORIENTATION_X_NORMAL_Y_NORMAL,
-      1, tex_type, gst_vaapi_texture_upload,
+      1, &meta_texture->texture_type, gst_vaapi_texture_upload,
       meta_texture, (GBoxedCopyFunc) meta_texture_copy,
       (GBoxedFreeFunc) meta_texture_free);
   if (!meta)
@@ -143,7 +235,11 @@
 gboolean
 gst_buffer_ensure_texture_upload_meta (GstBuffer * buffer)
 {
-  return gst_buffer_get_video_gl_texture_upload_meta (buffer) ||
+  GstVideoGLTextureUploadMeta *const meta =
+      gst_buffer_get_video_gl_texture_upload_meta (buffer);
+
+  return meta ?
+      meta_texture_ensure_info_from_buffer (meta->user_data, buffer) :
       gst_buffer_add_texture_upload_meta (buffer);
 }
 #endif
diff -Nru gstreamer-vaapi-0.5.10/gst/vaapi/Makefile.am gstreamer-vaapi-0.6.0/gst/vaapi/Makefile.am
--- gstreamer-vaapi-0.5.10/gst/vaapi/Makefile.am	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst/vaapi/Makefile.am	2015-07-15 12:47:43.000000000 +0000
@@ -26,6 +26,11 @@
 	$(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-glx-$(GST_API_VERSION).la
 endif
 
+if USE_EGL
+libgstvaapi_LIBS += \
+	$(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-egl-$(GST_API_VERSION).la
+endif
+
 if USE_WAYLAND
 libgstvaapi_CFLAGS += \
 	$(WAYLAND_CFLAGS)	\
@@ -35,6 +40,11 @@
 	$(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-wayland-$(GST_API_VERSION).la
 endif
 
+if USE_GST_GL_HELPERS
+libgstvaapi_CFLAGS	+= $(GST_GL_CFLAGS)
+libgstvaapi_LIBS	+= $(GST_GL_LIBS)
+endif
+
 libgstvaapi_source_c = \
 	gstvaapi.c		\
 	gstvaapidecode.c	\
@@ -46,9 +56,13 @@
 	gstvaapivideobuffer.c	\
 	gstvaapivideocontext.c	\
 	gstvaapivideometa.c	\
+	gstvaapidecodebin.c	\
+	gstvaapivideobufferpool.c \
+	gstvaapivideomemory.c	\
 	$(NULL)
 
 libgstvaapi_source_h = \
+	gstcompat.h		\
 	gstvaapidecode.h	\
 	gstvaapipluginbase.h	\
 	gstvaapipluginutil.h	\
@@ -58,6 +72,9 @@
 	gstvaapivideobuffer.h	\
 	gstvaapivideocontext.h	\
 	gstvaapivideometa.h	\
+	gstvaapidecodebin.h	\
+	gstvaapivideobufferpool.h \
+	gstvaapivideomemory.h	\
 	$(NULL)
 
 libgstvaapi_enc_source_c =	\
@@ -77,24 +94,36 @@
 libgstvaapi_source_h += $(libgstvaapi_enc_source_h)
 endif
 
-libgstvaapi_x11_source_c = gstvaapivideoconverter_x11.c
-libgstvaapi_x11_source_h = gstvaapivideoconverter_x11.h
-
-if USE_X11
-if !USE_GST_API_1_2p
-libgstvaapi_source_c += $(libgstvaapi_x11_source_c)
-libgstvaapi_source_h += $(libgstvaapi_x11_source_h)
+libgstvaapi_jpegenc_source_c = gstvaapiencode_jpeg.c
+libgstvaapi_jpegenc_source_h = gstvaapiencode_jpeg.h
+if USE_JPEG_ENCODER
+libgstvaapi_source_c += $(libgstvaapi_jpegenc_source_c)
+libgstvaapi_source_h += $(libgstvaapi_jpegenc_source_h)
 endif
+
+libgstvaapi_vp8enc_source_c = gstvaapiencode_vp8.c
+libgstvaapi_vp8enc_source_h = gstvaapiencode_vp8.h
+if USE_VP8_ENCODER
+libgstvaapi_source_c += $(libgstvaapi_vp8enc_source_c)
+libgstvaapi_source_h += $(libgstvaapi_vp8enc_source_h)
 endif
 
-libgstvaapi_glx_source_c = gstvaapivideoconverter_glx.c
-libgstvaapi_glx_source_h = gstvaapivideoconverter_glx.h
 
-if USE_GLX
-if !USE_GST_API_1_2p
-libgstvaapi_source_c += $(libgstvaapi_glx_source_c)
-libgstvaapi_source_h += $(libgstvaapi_glx_source_h)
+libgstvaapi_h265enc_source_c = gstvaapiencode_h265.c
+libgstvaapi_h265enc_source_h = gstvaapiencode_h265.h
+if USE_H265_ENCODER
+libgstvaapi_source_c += $(libgstvaapi_h265enc_source_c)
+libgstvaapi_source_h += $(libgstvaapi_h265enc_source_h)
 endif
+
+
+
+libgstvaapi_egl_source_c =
+libgstvaapi_egl_source_h =
+
+if USE_EGL
+libgstvaapi_source_c += $(libgstvaapi_egl_source_c)
+libgstvaapi_source_h += $(libgstvaapi_egl_source_h)
 endif
 
 libgstvaapi_1_2p_source_c = \
@@ -110,36 +139,6 @@
 libgstvaapi_source_h += $(libgstvaapi_1_2p_source_h)
 endif
 
-libgstvaapi_1_0p_source_c = \
-	gstvaapivideobufferpool.c \
-	gstvaapivideomemory.c	\
-	$(NULL)
-
-libgstvaapi_1_0p_source_h = \
-	gstvaapivideobufferpool.h \
-	gstvaapivideomemory.h	\
-	$(NULL)
-
-if USE_GST_API_1_0p
-libgstvaapi_source_c += $(libgstvaapi_1_0p_source_c)
-libgstvaapi_source_h += $(libgstvaapi_1_0p_source_h)
-endif
-
-libgstvaapi_0_10_source_c = \
-	gstvaapidownload.c	\
-	gstvaapiupload.c	\
-	$(NULL)
-
-libgstvaapi_0_10_source_h = \
-	gstvaapidownload.h	\
-	gstvaapiupload.h	\
-	$(NULL)
-
-if USE_GST_API_0_10
-libgstvaapi_source_c += $(libgstvaapi_0_10_source_c)
-libgstvaapi_source_h += $(libgstvaapi_0_10_source_h)
-endif
-
 libgstvaapi_la_SOURCES		= $(libgstvaapi_source_c)
 noinst_HEADERS			= $(libgstvaapi_source_h)
 
@@ -157,12 +156,11 @@
 	$(libgstvaapi_LIBS)	\
 	$(GST_LIBS)		\
 	$(GST_BASE_LIBS)	\
-	$(GST_VIDEO_LIBS)	\
+	$(GST_VIDEO_LIBS) -lgstpbutils-$(GST_PKG_VERSION) \
 	$(GST_INTERFACES_LIBS)	\
 	$(GST_BASEVIDEO_LIBS)	\
 	$(GST_PLUGINS_BASE_LIBS) \
-	$(GST_ALLOCATORS_LIBS) \
-	$(top_builddir)/gst-libs/gst/video/libgstvaapi-videoutils.la
+	$(GST_ALLOCATORS_LIBS)
 
 libgstvaapi_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstvaapi_la_LIBTOOLFLAGS = --tag=disable-static
@@ -180,14 +178,30 @@
 	gsth264parse.h		\
 	$(NULL)
 
+libgstvaapi_1_4p_parse_gen_source_c = \
+	gsth265parse.c \
+	$(NULL)
+
+libgstvaapi_1_4p_parse_gen_source_h = \
+	gsth265parse.h \
+	$(NULL)
+
 libgstvaapi_parse_gen_sources = \
 	$(libgstvaapi_parse_gen_source_c) \
 	$(libgstvaapi_parse_gen_source_h) \
 	$(NUL)
 
+libgstvaapi_parse_gen_sources += $(libgstvaapi_1_4p_parse_gen_source_c)
+libgstvaapi_parse_gen_sources += $(libgstvaapi_1_4p_parse_gen_source_h)
+
 libgstvaapi_parse_source_c = gstvaapiparse.c $(libgstvaapi_parse_gen_source_c)
 libgstvaapi_parse_source_h = gstvaapiparse.h $(libgstvaapi_parse_gen_source_h)
 
+if USE_GST_API_1_4p
+libgstvaapi_parse_source_c += $(libgstvaapi_1_4p_parse_gen_source_c)
+libgstvaapi_parse_source_h += $(libgstvaapi_1_4p_parse_gen_source_h)
+endif
+
 libgstvaapi_parse_la_SOURCES		= $(libgstvaapi_parse_source_c)
 noinst_HEADERS			       += $(libgstvaapi_parse_source_h)
 
@@ -235,21 +249,22 @@
 	$(libgstvaapi_parse_gen_sources)
 
 EXTRA_DIST = \
-	$(libgstvaapi_enc_source_c)	\
-	$(libgstvaapi_enc_source_h)	\
-	$(libgstvaapi_x11_source_c)	\
-	$(libgstvaapi_x11_source_h)	\
-	$(libgstvaapi_glx_source_c)	\
-	$(libgstvaapi_glx_source_h)	\
-	$(libgstvaapi_1_2p_source_c)	\
-	$(libgstvaapi_1_2p_source_h)	\
-	$(libgstvaapi_1_0p_source_c)	\
-	$(libgstvaapi_1_0p_source_h)	\
-	$(libgstvaapi_0_10_source_c)	\
-	$(libgstvaapi_0_10_source_h)	\
-	$(libgstvaapi_parse_source_c)	\
-	$(libgstvaapi_parse_source_h)	\
+	$(libgstvaapi_enc_source_c)	 \
+	$(libgstvaapi_enc_source_h)	 \
+	$(libgstvaapi_jpegenc_source_c)	 \
+	$(libgstvaapi_jpegenc_source_h)  \
+	$(libgstvaapi_vp8enc_source_c)   \
+	$(libgstvaapi_vp8enc_source_h)   \
+	$(libgstvaapi_h265enc_source_c)  \
+	$(libgstvaapi_h265enc_source_h)  \
+	$(libgstvaapi_egl_source_c)	\
+	$(libgstvaapi_egl_source_h)	\
+	$(libgstvaapi_1_2p_source_c)	 \
+	$(libgstvaapi_1_2p_source_h)	 \
+	$(libgstvaapi_parse_source_c)	 \
+	$(libgstvaapi_parse_source_h)	 \
+        $(libgstvaapi_1_4p_parse_gen_source_c) \
+        $(libgstvaapi_1_4p_parse_gen_source_h) \
 	$(NULL)
 
-# Extra clean files so that maintainer-clean removes *everything*
-MAINTAINERCLEANFILES = Makefile.in
+-include $(top_srcdir)/git.mk
diff -Nru gstreamer-vaapi-0.5.10/gst/vaapi/Makefile.in gstreamer-vaapi-0.6.0/gst/vaapi/Makefile.in
--- gstreamer-vaapi-0.5.10/gst/vaapi/Makefile.in	2015-02-03 08:39:54.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst/vaapi/Makefile.in	2015-07-15 12:50:34.000000000 +0000
@@ -90,28 +90,35 @@
 @USE_GLX_TRUE@am__append_3 = \
 @USE_GLX_TRUE@	$(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-glx-$(GST_API_VERSION).la
 
-@USE_WAYLAND_TRUE@am__append_4 = \
+@USE_EGL_TRUE@am__append_4 = \
+@USE_EGL_TRUE@	$(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-egl-$(GST_API_VERSION).la
+
+@USE_WAYLAND_TRUE@am__append_5 = \
 @USE_WAYLAND_TRUE@	$(WAYLAND_CFLAGS)	\
 @USE_WAYLAND_TRUE@	$(NULL)
 
-@USE_WAYLAND_TRUE@am__append_5 = \
+@USE_WAYLAND_TRUE@am__append_6 = \
 @USE_WAYLAND_TRUE@	$(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-wayland-$(GST_API_VERSION).la
 
-@USE_ENCODERS_TRUE@am__append_6 = $(libgstvaapi_enc_source_c)
-@USE_ENCODERS_TRUE@am__append_7 = $(libgstvaapi_enc_source_h)
-@USE_GST_API_1_2p_FALSE@@USE_X11_TRUE@am__append_8 = $(libgstvaapi_x11_source_c)
-@USE_GST_API_1_2p_FALSE@@USE_X11_TRUE@am__append_9 = $(libgstvaapi_x11_source_h)
-@USE_GLX_TRUE@@USE_GST_API_1_2p_FALSE@am__append_10 = $(libgstvaapi_glx_source_c)
-@USE_GLX_TRUE@@USE_GST_API_1_2p_FALSE@am__append_11 = $(libgstvaapi_glx_source_h)
-@USE_GST_API_1_2p_TRUE@am__append_12 = $(libgstvaapi_1_2p_source_c)
-@USE_GST_API_1_2p_TRUE@am__append_13 = $(libgstvaapi_1_2p_source_h)
-@USE_GST_API_1_0p_TRUE@am__append_14 = $(libgstvaapi_1_0p_source_c)
-@USE_GST_API_1_0p_TRUE@am__append_15 = $(libgstvaapi_1_0p_source_h)
-@USE_GST_API_0_10_TRUE@am__append_16 = $(libgstvaapi_0_10_source_c)
-@USE_GST_API_0_10_TRUE@am__append_17 = $(libgstvaapi_0_10_source_h)
-@USE_LOCAL_VIDEO_PARSERS_TRUE@am__append_18 = libgstvaapi_parse.la
-@USE_LOCAL_VIDEO_PARSERS_TRUE@am__append_19 = $(libgstvaapi_parse_source_h)
-@USE_LOCAL_VIDEO_PARSERS_TRUE@am__append_20 = videoparsers.prepare.stamp
+@USE_GST_GL_HELPERS_TRUE@am__append_7 = $(GST_GL_CFLAGS)
+@USE_GST_GL_HELPERS_TRUE@am__append_8 = $(GST_GL_LIBS)
+@USE_ENCODERS_TRUE@am__append_9 = $(libgstvaapi_enc_source_c)
+@USE_ENCODERS_TRUE@am__append_10 = $(libgstvaapi_enc_source_h)
+@USE_JPEG_ENCODER_TRUE@am__append_11 = $(libgstvaapi_jpegenc_source_c)
+@USE_JPEG_ENCODER_TRUE@am__append_12 = $(libgstvaapi_jpegenc_source_h)
+@USE_VP8_ENCODER_TRUE@am__append_13 = $(libgstvaapi_vp8enc_source_c)
+@USE_VP8_ENCODER_TRUE@am__append_14 = $(libgstvaapi_vp8enc_source_h)
+@USE_H265_ENCODER_TRUE@am__append_15 = $(libgstvaapi_h265enc_source_c)
+@USE_H265_ENCODER_TRUE@am__append_16 = $(libgstvaapi_h265enc_source_h)
+@USE_EGL_TRUE@am__append_17 = $(libgstvaapi_egl_source_c)
+@USE_EGL_TRUE@am__append_18 = $(libgstvaapi_egl_source_h)
+@USE_GST_API_1_2p_TRUE@am__append_19 = $(libgstvaapi_1_2p_source_c)
+@USE_GST_API_1_2p_TRUE@am__append_20 = $(libgstvaapi_1_2p_source_h)
+@USE_LOCAL_VIDEO_PARSERS_TRUE@am__append_21 = libgstvaapi_parse.la
+@USE_GST_API_1_4p_TRUE@@USE_LOCAL_VIDEO_PARSERS_TRUE@am__append_22 = $(libgstvaapi_1_4p_parse_gen_source_c)
+@USE_GST_API_1_4p_TRUE@@USE_LOCAL_VIDEO_PARSERS_TRUE@am__append_23 = $(libgstvaapi_1_4p_parse_gen_source_h)
+@USE_LOCAL_VIDEO_PARSERS_TRUE@am__append_24 = $(libgstvaapi_parse_source_h)
+@USE_LOCAL_VIDEO_PARSERS_TRUE@am__append_25 = videoparsers.prepare.stamp
 subdir = gst/vaapi
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(top_srcdir)/build-aux/depcomp $(am__noinst_HEADERS_DIST)
@@ -158,41 +165,37 @@
 am__DEPENDENCIES_1 =
 @USE_X11_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) \
 @USE_X11_TRUE@	$(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-x11-$(GST_API_VERSION).la
-am__DEPENDENCIES_3 = $(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-$(GST_API_VERSION).la \
+@USE_GST_GL_HELPERS_TRUE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_4 = $(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-$(GST_API_VERSION).la \
 	$(am__append_1) $(am__DEPENDENCIES_2) $(am__append_3) \
-	$(am__append_5)
-libgstvaapi_la_DEPENDENCIES = $(am__DEPENDENCIES_3) \
+	$(am__append_4) $(am__append_6) $(am__DEPENDENCIES_3)
+libgstvaapi_la_DEPENDENCIES = $(am__DEPENDENCIES_4) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) \
-	$(top_builddir)/gst-libs/gst/video/libgstvaapi-videoutils.la
+	$(am__DEPENDENCIES_1)
 am__libgstvaapi_la_SOURCES_DIST = gstvaapi.c gstvaapidecode.c \
 	gstvaapipluginbase.c gstvaapipluginutil.c gstvaapipostproc.c \
 	gstvaapisink.c gstvaapiuploader.c gstvaapivideobuffer.c \
-	gstvaapivideocontext.c gstvaapivideometa.c gstvaapiencode.c \
-	gstvaapiencode_h264.c gstvaapiencode_mpeg2.c \
-	gstvaapivideoconverter_x11.c gstvaapivideoconverter_glx.c \
-	gstvaapivideometa_texture.c gstvaapivideobufferpool.c \
-	gstvaapivideomemory.c gstvaapidownload.c gstvaapiupload.c
+	gstvaapivideocontext.c gstvaapivideometa.c gstvaapidecodebin.c \
+	gstvaapivideobufferpool.c gstvaapivideomemory.c \
+	gstvaapiencode.c gstvaapiencode_h264.c gstvaapiencode_mpeg2.c \
+	gstvaapiencode_jpeg.c gstvaapiencode_vp8.c \
+	gstvaapiencode_h265.c gstvaapivideometa_texture.c
 am__objects_1 = libgstvaapi_la-gstvaapiencode.lo \
 	libgstvaapi_la-gstvaapiencode_h264.lo \
 	libgstvaapi_la-gstvaapiencode_mpeg2.lo
 @USE_ENCODERS_TRUE@am__objects_2 = $(am__objects_1)
-am__objects_3 = libgstvaapi_la-gstvaapivideoconverter_x11.lo
-@USE_GST_API_1_2p_FALSE@@USE_X11_TRUE@am__objects_4 =  \
-@USE_GST_API_1_2p_FALSE@@USE_X11_TRUE@	$(am__objects_3)
-am__objects_5 = libgstvaapi_la-gstvaapivideoconverter_glx.lo
-@USE_GLX_TRUE@@USE_GST_API_1_2p_FALSE@am__objects_6 =  \
-@USE_GLX_TRUE@@USE_GST_API_1_2p_FALSE@	$(am__objects_5)
-am__objects_7 = libgstvaapi_la-gstvaapivideometa_texture.lo
-@USE_GST_API_1_2p_TRUE@am__objects_8 = $(am__objects_7)
-am__objects_9 = libgstvaapi_la-gstvaapivideobufferpool.lo \
-	libgstvaapi_la-gstvaapivideomemory.lo
-@USE_GST_API_1_0p_TRUE@am__objects_10 = $(am__objects_9)
-am__objects_11 = libgstvaapi_la-gstvaapidownload.lo \
-	libgstvaapi_la-gstvaapiupload.lo
-@USE_GST_API_0_10_TRUE@am__objects_12 = $(am__objects_11)
+am__objects_3 = libgstvaapi_la-gstvaapiencode_jpeg.lo
+@USE_JPEG_ENCODER_TRUE@am__objects_4 = $(am__objects_3)
+am__objects_5 = libgstvaapi_la-gstvaapiencode_vp8.lo
+@USE_VP8_ENCODER_TRUE@am__objects_6 = $(am__objects_5)
+am__objects_7 = libgstvaapi_la-gstvaapiencode_h265.lo
+@USE_H265_ENCODER_TRUE@am__objects_8 = $(am__objects_7)
+am__objects_9 =
+@USE_EGL_TRUE@am__objects_10 = $(am__objects_9)
+am__objects_11 = libgstvaapi_la-gstvaapivideometa_texture.lo
+@USE_GST_API_1_2p_TRUE@am__objects_12 = $(am__objects_11)
 am__objects_13 = libgstvaapi_la-gstvaapi.lo \
 	libgstvaapi_la-gstvaapidecode.lo \
 	libgstvaapi_la-gstvaapipluginbase.lo \
@@ -202,7 +205,10 @@
 	libgstvaapi_la-gstvaapiuploader.lo \
 	libgstvaapi_la-gstvaapivideobuffer.lo \
 	libgstvaapi_la-gstvaapivideocontext.lo \
-	libgstvaapi_la-gstvaapivideometa.lo $(am__objects_2) \
+	libgstvaapi_la-gstvaapivideometa.lo \
+	libgstvaapi_la-gstvaapidecodebin.lo \
+	libgstvaapi_la-gstvaapivideobufferpool.lo \
+	libgstvaapi_la-gstvaapivideomemory.lo $(am__objects_2) \
 	$(am__objects_4) $(am__objects_6) $(am__objects_8) \
 	$(am__objects_10) $(am__objects_12)
 am_libgstvaapi_la_OBJECTS = $(am__objects_13)
@@ -220,12 +226,16 @@
 @USE_LOCAL_VIDEO_PARSERS_TRUE@	$(am__DEPENDENCIES_1) \
 @USE_LOCAL_VIDEO_PARSERS_TRUE@	$(am__DEPENDENCIES_1) \
 @USE_LOCAL_VIDEO_PARSERS_TRUE@	$(am__DEPENDENCIES_1)
-am__libgstvaapi_parse_la_SOURCES_DIST = gstvaapiparse.c gsth264parse.c
+am__libgstvaapi_parse_la_SOURCES_DIST = gstvaapiparse.c gsth264parse.c \
+	gsth265parse.c
 @USE_LOCAL_VIDEO_PARSERS_TRUE@am__objects_14 = libgstvaapi_parse_la-gsth264parse.lo
-@USE_LOCAL_VIDEO_PARSERS_TRUE@am__objects_15 = libgstvaapi_parse_la-gstvaapiparse.lo \
-@USE_LOCAL_VIDEO_PARSERS_TRUE@	$(am__objects_14)
+@USE_LOCAL_VIDEO_PARSERS_TRUE@am__objects_15 = libgstvaapi_parse_la-gsth265parse.lo
+@USE_GST_API_1_4p_TRUE@@USE_LOCAL_VIDEO_PARSERS_TRUE@am__objects_16 = $(am__objects_15)
+@USE_LOCAL_VIDEO_PARSERS_TRUE@am__objects_17 = libgstvaapi_parse_la-gstvaapiparse.lo \
+@USE_LOCAL_VIDEO_PARSERS_TRUE@	$(am__objects_14) \
+@USE_LOCAL_VIDEO_PARSERS_TRUE@	$(am__objects_16)
 @USE_LOCAL_VIDEO_PARSERS_TRUE@am_libgstvaapi_parse_la_OBJECTS =  \
-@USE_LOCAL_VIDEO_PARSERS_TRUE@	$(am__objects_15)
+@USE_LOCAL_VIDEO_PARSERS_TRUE@	$(am__objects_17)
 libgstvaapi_parse_la_OBJECTS = $(am_libgstvaapi_parse_la_OBJECTS)
 libgstvaapi_parse_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(libgstvaapi_parse_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -275,15 +285,15 @@
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
-am__noinst_HEADERS_DIST = gstvaapidecode.h gstvaapipluginbase.h \
-	gstvaapipluginutil.h gstvaapipostproc.h gstvaapisink.h \
-	gstvaapiuploader.h gstvaapivideobuffer.h \
-	gstvaapivideocontext.h gstvaapivideometa.h gstvaapiencode.h \
-	gstvaapiencode_h264.h gstvaapiencode_mpeg2.h \
-	gstvaapivideoconverter_x11.h gstvaapivideoconverter_glx.h \
-	gstvaapivideometa_texture.h gstvaapivideobufferpool.h \
-	gstvaapivideomemory.h gstvaapidownload.h gstvaapiupload.h \
-	gstvaapiparse.h gsth264parse.h
+am__noinst_HEADERS_DIST = gstcompat.h gstvaapidecode.h \
+	gstvaapipluginbase.h gstvaapipluginutil.h gstvaapipostproc.h \
+	gstvaapisink.h gstvaapiuploader.h gstvaapivideobuffer.h \
+	gstvaapivideocontext.h gstvaapivideometa.h gstvaapidecodebin.h \
+	gstvaapivideobufferpool.h gstvaapivideomemory.h \
+	gstvaapiencode.h gstvaapiencode_h264.h gstvaapiencode_mpeg2.h \
+	gstvaapiencode_jpeg.h gstvaapiencode_vp8.h \
+	gstvaapiencode_h265.h gstvaapivideometa_texture.h \
+	gstvaapiparse.h gsth264parse.h gsth265parse.h
 HEADERS = $(noinst_HEADERS)
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 # Read a list of newline-separated strings from the standard input,
@@ -330,10 +340,16 @@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
+EGL_CFLAGS = @EGL_CFLAGS@
+EGL_LIBS = @EGL_LIBS@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GIT = @GIT@
+GLES2_CFLAGS = @GLES2_CFLAGS@
+GLES2_LIBS = @GLES2_LIBS@
+GLES3_CFLAGS = @GLES3_CFLAGS@
+GLES3_LIBS = @GLES3_LIBS@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_VERSION_REQUIRED = @GLIB_VERSION_REQUIRED@
@@ -351,6 +367,8 @@
 GST_CFLAGS = @GST_CFLAGS@
 GST_CODEC_PARSERS_CFLAGS = @GST_CODEC_PARSERS_CFLAGS@
 GST_CODEC_PARSERS_LIBS = @GST_CODEC_PARSERS_LIBS@
+GST_GL_CFLAGS = @GST_GL_CFLAGS@
+GST_GL_LIBS = @GST_GL_LIBS@
 GST_INTERFACES_CFLAGS = @GST_INTERFACES_CFLAGS@
 GST_INTERFACES_LIBS = @GST_INTERFACES_LIBS@
 GST_LIBS = @GST_LIBS@
@@ -360,7 +378,6 @@
 GST_PLUGINS_BASE_LIBS = @GST_PLUGINS_BASE_LIBS@
 GST_PLUGINS_BASE_VERSION_REQUIRED = @GST_PLUGINS_BASE_VERSION_REQUIRED@
 GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
-GST_PLUGIN_PATH = @GST_PLUGIN_PATH@
 GST_PLUGIN_PATH_1_0 = @GST_PLUGIN_PATH_1_0@
 GST_VAAPI_LT_LDFLAGS = @GST_VAAPI_LT_LDFLAGS@
 GST_VAAPI_LT_VERSION = @GST_VAAPI_LT_VERSION@
@@ -497,25 +514,27 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-plugin_LTLIBRARIES = libgstvaapi.la $(am__append_18)
+plugin_LTLIBRARIES = libgstvaapi.la $(am__append_21)
 libgstvaapi_CFLAGS = $(LIBVA_CFLAGS) -DGST_USE_UNSTABLE_API \
 	-I$(top_srcdir)/gst-libs -I$(top_builddir)/gst-libs $(NULL) \
-	$(am__append_4)
+	$(am__append_5) $(am__append_7)
 libgstvaapi_LIBS = $(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-$(GST_API_VERSION).la \
 	$(am__append_1) $(am__append_2) $(am__append_3) \
-	$(am__append_5)
+	$(am__append_4) $(am__append_6) $(am__append_8)
 libgstvaapi_source_c = gstvaapi.c gstvaapidecode.c \
 	gstvaapipluginbase.c gstvaapipluginutil.c gstvaapipostproc.c \
 	gstvaapisink.c gstvaapiuploader.c gstvaapivideobuffer.c \
-	gstvaapivideocontext.c gstvaapivideometa.c $(NULL) \
-	$(am__append_6) $(am__append_8) $(am__append_10) \
-	$(am__append_12) $(am__append_14) $(am__append_16)
-libgstvaapi_source_h = gstvaapidecode.h gstvaapipluginbase.h \
-	gstvaapipluginutil.h gstvaapipostproc.h gstvaapisink.h \
-	gstvaapiuploader.h gstvaapivideobuffer.h \
-	gstvaapivideocontext.h gstvaapivideometa.h $(NULL) \
-	$(am__append_7) $(am__append_9) $(am__append_11) \
-	$(am__append_13) $(am__append_15) $(am__append_17)
+	gstvaapivideocontext.c gstvaapivideometa.c gstvaapidecodebin.c \
+	gstvaapivideobufferpool.c gstvaapivideomemory.c $(NULL) \
+	$(am__append_9) $(am__append_11) $(am__append_13) \
+	$(am__append_15) $(am__append_17) $(am__append_19)
+libgstvaapi_source_h = gstcompat.h gstvaapidecode.h \
+	gstvaapipluginbase.h gstvaapipluginutil.h gstvaapipostproc.h \
+	gstvaapisink.h gstvaapiuploader.h gstvaapivideobuffer.h \
+	gstvaapivideocontext.h gstvaapivideometa.h gstvaapidecodebin.h \
+	gstvaapivideobufferpool.h gstvaapivideomemory.h $(NULL) \
+	$(am__append_10) $(am__append_12) $(am__append_14) \
+	$(am__append_16) $(am__append_18) $(am__append_20)
 libgstvaapi_enc_source_c = \
 	gstvaapiencode.c	\
 	gstvaapiencode_h264.c	\
@@ -528,10 +547,14 @@
 	gstvaapiencode_mpeg2.h	\
 	$(NULL)
 
-libgstvaapi_x11_source_c = gstvaapivideoconverter_x11.c
-libgstvaapi_x11_source_h = gstvaapivideoconverter_x11.h
-libgstvaapi_glx_source_c = gstvaapivideoconverter_glx.c
-libgstvaapi_glx_source_h = gstvaapivideoconverter_glx.h
+libgstvaapi_jpegenc_source_c = gstvaapiencode_jpeg.c
+libgstvaapi_jpegenc_source_h = gstvaapiencode_jpeg.h
+libgstvaapi_vp8enc_source_c = gstvaapiencode_vp8.c
+libgstvaapi_vp8enc_source_h = gstvaapiencode_vp8.h
+libgstvaapi_h265enc_source_c = gstvaapiencode_h265.c
+libgstvaapi_h265enc_source_h = gstvaapiencode_h265.h
+libgstvaapi_egl_source_c = 
+libgstvaapi_egl_source_h = 
 libgstvaapi_1_2p_source_c = \
 	gstvaapivideometa_texture.c \
 	$(NULL)
@@ -540,28 +563,8 @@
 	gstvaapivideometa_texture.h \
 	$(NULL)
 
-libgstvaapi_1_0p_source_c = \
-	gstvaapivideobufferpool.c \
-	gstvaapivideomemory.c	\
-	$(NULL)
-
-libgstvaapi_1_0p_source_h = \
-	gstvaapivideobufferpool.h \
-	gstvaapivideomemory.h	\
-	$(NULL)
-
-libgstvaapi_0_10_source_c = \
-	gstvaapidownload.c	\
-	gstvaapiupload.c	\
-	$(NULL)
-
-libgstvaapi_0_10_source_h = \
-	gstvaapidownload.h	\
-	gstvaapiupload.h	\
-	$(NULL)
-
 libgstvaapi_la_SOURCES = $(libgstvaapi_source_c)
-noinst_HEADERS = $(libgstvaapi_source_h) $(am__append_19)
+noinst_HEADERS = $(libgstvaapi_source_h) $(am__append_24)
 libgstvaapi_la_CFLAGS = \
 	$(libgstvaapi_CFLAGS)	\
 	$(GST_CFLAGS)		\
@@ -576,16 +579,15 @@
 	$(libgstvaapi_LIBS)	\
 	$(GST_LIBS)		\
 	$(GST_BASE_LIBS)	\
-	$(GST_VIDEO_LIBS)	\
+	$(GST_VIDEO_LIBS) -lgstpbutils-$(GST_PKG_VERSION) \
 	$(GST_INTERFACES_LIBS)	\
 	$(GST_BASEVIDEO_LIBS)	\
 	$(GST_PLUGINS_BASE_LIBS) \
-	$(GST_ALLOCATORS_LIBS) \
-	$(top_builddir)/gst-libs/gst/video/libgstvaapi-videoutils.la
+	$(GST_ALLOCATORS_LIBS)
 
 libgstvaapi_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstvaapi_la_LIBTOOLFLAGS = --tag=disable-static
-BUILT_SOURCES = $(am__append_20)
+BUILT_SOURCES = $(am__append_25)
 @USE_LOCAL_VIDEO_PARSERS_TRUE@libgstvaapi_parse_gen_source_c = \
 @USE_LOCAL_VIDEO_PARSERS_TRUE@	gsth264parse.c		\
 @USE_LOCAL_VIDEO_PARSERS_TRUE@	$(NULL)
@@ -594,13 +596,27 @@
 @USE_LOCAL_VIDEO_PARSERS_TRUE@	gsth264parse.h		\
 @USE_LOCAL_VIDEO_PARSERS_TRUE@	$(NULL)
 
-@USE_LOCAL_VIDEO_PARSERS_TRUE@libgstvaapi_parse_gen_sources = \
+@USE_LOCAL_VIDEO_PARSERS_TRUE@libgstvaapi_1_4p_parse_gen_source_c = \
+@USE_LOCAL_VIDEO_PARSERS_TRUE@	gsth265parse.c \
+@USE_LOCAL_VIDEO_PARSERS_TRUE@	$(NULL)
+
+@USE_LOCAL_VIDEO_PARSERS_TRUE@libgstvaapi_1_4p_parse_gen_source_h = \
+@USE_LOCAL_VIDEO_PARSERS_TRUE@	gsth265parse.h \
+@USE_LOCAL_VIDEO_PARSERS_TRUE@	$(NULL)
+
+@USE_LOCAL_VIDEO_PARSERS_TRUE@libgstvaapi_parse_gen_sources = $(libgstvaapi_parse_gen_source_c) \
+@USE_LOCAL_VIDEO_PARSERS_TRUE@	$(libgstvaapi_parse_gen_source_h) \
+@USE_LOCAL_VIDEO_PARSERS_TRUE@	$(NUL) \
+@USE_LOCAL_VIDEO_PARSERS_TRUE@	$(libgstvaapi_1_4p_parse_gen_source_c) \
+@USE_LOCAL_VIDEO_PARSERS_TRUE@	$(libgstvaapi_1_4p_parse_gen_source_h)
+@USE_LOCAL_VIDEO_PARSERS_TRUE@libgstvaapi_parse_source_c =  \
+@USE_LOCAL_VIDEO_PARSERS_TRUE@	gstvaapiparse.c \
 @USE_LOCAL_VIDEO_PARSERS_TRUE@	$(libgstvaapi_parse_gen_source_c) \
+@USE_LOCAL_VIDEO_PARSERS_TRUE@	$(am__append_22)
+@USE_LOCAL_VIDEO_PARSERS_TRUE@libgstvaapi_parse_source_h =  \
+@USE_LOCAL_VIDEO_PARSERS_TRUE@	gstvaapiparse.h \
 @USE_LOCAL_VIDEO_PARSERS_TRUE@	$(libgstvaapi_parse_gen_source_h) \
-@USE_LOCAL_VIDEO_PARSERS_TRUE@	$(NUL)
-
-@USE_LOCAL_VIDEO_PARSERS_TRUE@libgstvaapi_parse_source_c = gstvaapiparse.c $(libgstvaapi_parse_gen_source_c)
-@USE_LOCAL_VIDEO_PARSERS_TRUE@libgstvaapi_parse_source_h = gstvaapiparse.h $(libgstvaapi_parse_gen_source_h)
+@USE_LOCAL_VIDEO_PARSERS_TRUE@	$(am__append_23)
 @USE_LOCAL_VIDEO_PARSERS_TRUE@libgstvaapi_parse_la_SOURCES = $(libgstvaapi_parse_source_c)
 @USE_LOCAL_VIDEO_PARSERS_TRUE@libgstvaapi_parse_la_CFLAGS = \
 @USE_LOCAL_VIDEO_PARSERS_TRUE@	-DGST_USE_UNSTABLE_API			\
@@ -634,25 +650,24 @@
 	$(libgstvaapi_parse_gen_sources)
 
 EXTRA_DIST = \
-	$(libgstvaapi_enc_source_c)	\
-	$(libgstvaapi_enc_source_h)	\
-	$(libgstvaapi_x11_source_c)	\
-	$(libgstvaapi_x11_source_h)	\
-	$(libgstvaapi_glx_source_c)	\
-	$(libgstvaapi_glx_source_h)	\
-	$(libgstvaapi_1_2p_source_c)	\
-	$(libgstvaapi_1_2p_source_h)	\
-	$(libgstvaapi_1_0p_source_c)	\
-	$(libgstvaapi_1_0p_source_h)	\
-	$(libgstvaapi_0_10_source_c)	\
-	$(libgstvaapi_0_10_source_h)	\
-	$(libgstvaapi_parse_source_c)	\
-	$(libgstvaapi_parse_source_h)	\
+	$(libgstvaapi_enc_source_c)	 \
+	$(libgstvaapi_enc_source_h)	 \
+	$(libgstvaapi_jpegenc_source_c)	 \
+	$(libgstvaapi_jpegenc_source_h)  \
+	$(libgstvaapi_vp8enc_source_c)   \
+	$(libgstvaapi_vp8enc_source_h)   \
+	$(libgstvaapi_h265enc_source_c)  \
+	$(libgstvaapi_h265enc_source_h)  \
+	$(libgstvaapi_egl_source_c)	\
+	$(libgstvaapi_egl_source_h)	\
+	$(libgstvaapi_1_2p_source_c)	 \
+	$(libgstvaapi_1_2p_source_h)	 \
+	$(libgstvaapi_parse_source_c)	 \
+	$(libgstvaapi_parse_source_h)	 \
+        $(libgstvaapi_1_4p_parse_gen_source_c) \
+        $(libgstvaapi_1_4p_parse_gen_source_h) \
 	$(NULL)
 
-
-# Extra clean files so that maintainer-clean removes *everything*
-MAINTAINERCLEANFILES = Makefile.in
 all: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) all-am
 
@@ -738,25 +753,26 @@
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstvaapi_la-gstvaapi.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstvaapi_la-gstvaapidecode.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstvaapi_la-gstvaapidownload.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstvaapi_la-gstvaapidecodebin.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstvaapi_la-gstvaapiencode.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstvaapi_la-gstvaapiencode_h264.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstvaapi_la-gstvaapiencode_h265.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstvaapi_la-gstvaapiencode_jpeg.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstvaapi_la-gstvaapiencode_mpeg2.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstvaapi_la-gstvaapiencode_vp8.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstvaapi_la-gstvaapipluginbase.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstvaapi_la-gstvaapipluginutil.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstvaapi_la-gstvaapipostproc.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstvaapi_la-gstvaapisink.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstvaapi_la-gstvaapiupload.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstvaapi_la-gstvaapiuploader.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstvaapi_la-gstvaapivideobuffer.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstvaapi_la-gstvaapivideobufferpool.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstvaapi_la-gstvaapivideocontext.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstvaapi_la-gstvaapivideoconverter_glx.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstvaapi_la-gstvaapivideoconverter_x11.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstvaapi_la-gstvaapivideomemory.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstvaapi_la-gstvaapivideometa.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstvaapi_la-gstvaapivideometa_texture.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstvaapi_parse_la-gsth264parse.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstvaapi_parse_la-gsth265parse.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstvaapi_parse_la-gstvaapiparse.Plo@am__quote@
 
 .c.o:
@@ -850,6 +866,27 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstvaapi_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstvaapi_la_CFLAGS) $(CFLAGS) -c -o libgstvaapi_la-gstvaapivideometa.lo `test -f 'gstvaapivideometa.c' || echo '$(srcdir)/'`gstvaapivideometa.c
 
+libgstvaapi_la-gstvaapidecodebin.lo: gstvaapidecodebin.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstvaapi_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstvaapi_la_CFLAGS) $(CFLAGS) -MT libgstvaapi_la-gstvaapidecodebin.lo -MD -MP -MF $(DEPDIR)/libgstvaapi_la-gstvaapidecodebin.Tpo -c -o libgstvaapi_la-gstvaapidecodebin.lo `test -f 'gstvaapidecodebin.c' || echo '$(srcdir)/'`gstvaapidecodebin.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgstvaapi_la-gstvaapidecodebin.Tpo $(DEPDIR)/libgstvaapi_la-gstvaapidecodebin.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gstvaapidecodebin.c' object='libgstvaapi_la-gstvaapidecodebin.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstvaapi_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstvaapi_la_CFLAGS) $(CFLAGS) -c -o libgstvaapi_la-gstvaapidecodebin.lo `test -f 'gstvaapidecodebin.c' || echo '$(srcdir)/'`gstvaapidecodebin.c
+
+libgstvaapi_la-gstvaapivideobufferpool.lo: gstvaapivideobufferpool.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstvaapi_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstvaapi_la_CFLAGS) $(CFLAGS) -MT libgstvaapi_la-gstvaapivideobufferpool.lo -MD -MP -MF $(DEPDIR)/libgstvaapi_la-gstvaapivideobufferpool.Tpo -c -o libgstvaapi_la-gstvaapivideobufferpool.lo `test -f 'gstvaapivideobufferpool.c' || echo '$(srcdir)/'`gstvaapivideobufferpool.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgstvaapi_la-gstvaapivideobufferpool.Tpo $(DEPDIR)/libgstvaapi_la-gstvaapivideobufferpool.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gstvaapivideobufferpool.c' object='libgstvaapi_la-gstvaapivideobufferpool.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstvaapi_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstvaapi_la_CFLAGS) $(CFLAGS) -c -o libgstvaapi_la-gstvaapivideobufferpool.lo `test -f 'gstvaapivideobufferpool.c' || echo '$(srcdir)/'`gstvaapivideobufferpool.c
+
+libgstvaapi_la-gstvaapivideomemory.lo: gstvaapivideomemory.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstvaapi_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstvaapi_la_CFLAGS) $(CFLAGS) -MT libgstvaapi_la-gstvaapivideomemory.lo -MD -MP -MF $(DEPDIR)/libgstvaapi_la-gstvaapivideomemory.Tpo -c -o libgstvaapi_la-gstvaapivideomemory.lo `test -f 'gstvaapivideomemory.c' || echo '$(srcdir)/'`gstvaapivideomemory.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgstvaapi_la-gstvaapivideomemory.Tpo $(DEPDIR)/libgstvaapi_la-gstvaapivideomemory.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gstvaapivideomemory.c' object='libgstvaapi_la-gstvaapivideomemory.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstvaapi_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstvaapi_la_CFLAGS) $(CFLAGS) -c -o libgstvaapi_la-gstvaapivideomemory.lo `test -f 'gstvaapivideomemory.c' || echo '$(srcdir)/'`gstvaapivideomemory.c
+
 libgstvaapi_la-gstvaapiencode.lo: gstvaapiencode.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstvaapi_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstvaapi_la_CFLAGS) $(CFLAGS) -MT libgstvaapi_la-gstvaapiencode.lo -MD -MP -MF $(DEPDIR)/libgstvaapi_la-gstvaapiencode.Tpo -c -o libgstvaapi_la-gstvaapiencode.lo `test -f 'gstvaapiencode.c' || echo '$(srcdir)/'`gstvaapiencode.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgstvaapi_la-gstvaapiencode.Tpo $(DEPDIR)/libgstvaapi_la-gstvaapiencode.Plo
@@ -871,19 +908,26 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstvaapi_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstvaapi_la_CFLAGS) $(CFLAGS) -c -o libgstvaapi_la-gstvaapiencode_mpeg2.lo `test -f 'gstvaapiencode_mpeg2.c' || echo '$(srcdir)/'`gstvaapiencode_mpeg2.c
 
-libgstvaapi_la-gstvaapivideoconverter_x11.lo: gstvaapivideoconverter_x11.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstvaapi_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstvaapi_la_CFLAGS) $(CFLAGS) -MT libgstvaapi_la-gstvaapivideoconverter_x11.lo -MD -MP -MF $(DEPDIR)/libgstvaapi_la-gstvaapivideoconverter_x11.Tpo -c -o libgstvaapi_la-gstvaapivideoconverter_x11.lo `test -f 'gstvaapivideoconverter_x11.c' || echo '$(srcdir)/'`gstvaapivideoconverter_x11.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgstvaapi_la-gstvaapivideoconverter_x11.Tpo $(DEPDIR)/libgstvaapi_la-gstvaapivideoconverter_x11.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gstvaapivideoconverter_x11.c' object='libgstvaapi_la-gstvaapivideoconverter_x11.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstvaapi_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstvaapi_la_CFLAGS) $(CFLAGS) -c -o libgstvaapi_la-gstvaapivideoconverter_x11.lo `test -f 'gstvaapivideoconverter_x11.c' || echo '$(srcdir)/'`gstvaapivideoconverter_x11.c
-
-libgstvaapi_la-gstvaapivideoconverter_glx.lo: gstvaapivideoconverter_glx.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstvaapi_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstvaapi_la_CFLAGS) $(CFLAGS) -MT libgstvaapi_la-gstvaapivideoconverter_glx.lo -MD -MP -MF $(DEPDIR)/libgstvaapi_la-gstvaapivideoconverter_glx.Tpo -c -o libgstvaapi_la-gstvaapivideoconverter_glx.lo `test -f 'gstvaapivideoconverter_glx.c' || echo '$(srcdir)/'`gstvaapivideoconverter_glx.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgstvaapi_la-gstvaapivideoconverter_glx.Tpo $(DEPDIR)/libgstvaapi_la-gstvaapivideoconverter_glx.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gstvaapivideoconverter_glx.c' object='libgstvaapi_la-gstvaapivideoconverter_glx.lo' libtool=yes @AMDEPBACKSLASH@
+libgstvaapi_la-gstvaapiencode_jpeg.lo: gstvaapiencode_jpeg.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstvaapi_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstvaapi_la_CFLAGS) $(CFLAGS) -MT libgstvaapi_la-gstvaapiencode_jpeg.lo -MD -MP -MF $(DEPDIR)/libgstvaapi_la-gstvaapiencode_jpeg.Tpo -c -o libgstvaapi_la-gstvaapiencode_jpeg.lo `test -f 'gstvaapiencode_jpeg.c' || echo '$(srcdir)/'`gstvaapiencode_jpeg.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgstvaapi_la-gstvaapiencode_jpeg.Tpo $(DEPDIR)/libgstvaapi_la-gstvaapiencode_jpeg.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gstvaapiencode_jpeg.c' object='libgstvaapi_la-gstvaapiencode_jpeg.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstvaapi_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstvaapi_la_CFLAGS) $(CFLAGS) -c -o libgstvaapi_la-gstvaapiencode_jpeg.lo `test -f 'gstvaapiencode_jpeg.c' || echo '$(srcdir)/'`gstvaapiencode_jpeg.c
+
+libgstvaapi_la-gstvaapiencode_vp8.lo: gstvaapiencode_vp8.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstvaapi_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstvaapi_la_CFLAGS) $(CFLAGS) -MT libgstvaapi_la-gstvaapiencode_vp8.lo -MD -MP -MF $(DEPDIR)/libgstvaapi_la-gstvaapiencode_vp8.Tpo -c -o libgstvaapi_la-gstvaapiencode_vp8.lo `test -f 'gstvaapiencode_vp8.c' || echo '$(srcdir)/'`gstvaapiencode_vp8.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgstvaapi_la-gstvaapiencode_vp8.Tpo $(DEPDIR)/libgstvaapi_la-gstvaapiencode_vp8.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gstvaapiencode_vp8.c' object='libgstvaapi_la-gstvaapiencode_vp8.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstvaapi_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstvaapi_la_CFLAGS) $(CFLAGS) -c -o libgstvaapi_la-gstvaapiencode_vp8.lo `test -f 'gstvaapiencode_vp8.c' || echo '$(srcdir)/'`gstvaapiencode_vp8.c
+
+libgstvaapi_la-gstvaapiencode_h265.lo: gstvaapiencode_h265.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstvaapi_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstvaapi_la_CFLAGS) $(CFLAGS) -MT libgstvaapi_la-gstvaapiencode_h265.lo -MD -MP -MF $(DEPDIR)/libgstvaapi_la-gstvaapiencode_h265.Tpo -c -o libgstvaapi_la-gstvaapiencode_h265.lo `test -f 'gstvaapiencode_h265.c' || echo '$(srcdir)/'`gstvaapiencode_h265.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgstvaapi_la-gstvaapiencode_h265.Tpo $(DEPDIR)/libgstvaapi_la-gstvaapiencode_h265.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gstvaapiencode_h265.c' object='libgstvaapi_la-gstvaapiencode_h265.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstvaapi_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstvaapi_la_CFLAGS) $(CFLAGS) -c -o libgstvaapi_la-gstvaapivideoconverter_glx.lo `test -f 'gstvaapivideoconverter_glx.c' || echo '$(srcdir)/'`gstvaapivideoconverter_glx.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstvaapi_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstvaapi_la_CFLAGS) $(CFLAGS) -c -o libgstvaapi_la-gstvaapiencode_h265.lo `test -f 'gstvaapiencode_h265.c' || echo '$(srcdir)/'`gstvaapiencode_h265.c
 
 libgstvaapi_la-gstvaapivideometa_texture.lo: gstvaapivideometa_texture.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstvaapi_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstvaapi_la_CFLAGS) $(CFLAGS) -MT libgstvaapi_la-gstvaapivideometa_texture.lo -MD -MP -MF $(DEPDIR)/libgstvaapi_la-gstvaapivideometa_texture.Tpo -c -o libgstvaapi_la-gstvaapivideometa_texture.lo `test -f 'gstvaapivideometa_texture.c' || echo '$(srcdir)/'`gstvaapivideometa_texture.c
@@ -892,34 +936,6 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstvaapi_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstvaapi_la_CFLAGS) $(CFLAGS) -c -o libgstvaapi_la-gstvaapivideometa_texture.lo `test -f 'gstvaapivideometa_texture.c' || echo '$(srcdir)/'`gstvaapivideometa_texture.c
 
-libgstvaapi_la-gstvaapivideobufferpool.lo: gstvaapivideobufferpool.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstvaapi_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstvaapi_la_CFLAGS) $(CFLAGS) -MT libgstvaapi_la-gstvaapivideobufferpool.lo -MD -MP -MF $(DEPDIR)/libgstvaapi_la-gstvaapivideobufferpool.Tpo -c -o libgstvaapi_la-gstvaapivideobufferpool.lo `test -f 'gstvaapivideobufferpool.c' || echo '$(srcdir)/'`gstvaapivideobufferpool.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgstvaapi_la-gstvaapivideobufferpool.Tpo $(DEPDIR)/libgstvaapi_la-gstvaapivideobufferpool.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gstvaapivideobufferpool.c' object='libgstvaapi_la-gstvaapivideobufferpool.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstvaapi_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstvaapi_la_CFLAGS) $(CFLAGS) -c -o libgstvaapi_la-gstvaapivideobufferpool.lo `test -f 'gstvaapivideobufferpool.c' || echo '$(srcdir)/'`gstvaapivideobufferpool.c
-
-libgstvaapi_la-gstvaapivideomemory.lo: gstvaapivideomemory.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstvaapi_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstvaapi_la_CFLAGS) $(CFLAGS) -MT libgstvaapi_la-gstvaapivideomemory.lo -MD -MP -MF $(DEPDIR)/libgstvaapi_la-gstvaapivideomemory.Tpo -c -o libgstvaapi_la-gstvaapivideomemory.lo `test -f 'gstvaapivideomemory.c' || echo '$(srcdir)/'`gstvaapivideomemory.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgstvaapi_la-gstvaapivideomemory.Tpo $(DEPDIR)/libgstvaapi_la-gstvaapivideomemory.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gstvaapivideomemory.c' object='libgstvaapi_la-gstvaapivideomemory.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstvaapi_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstvaapi_la_CFLAGS) $(CFLAGS) -c -o libgstvaapi_la-gstvaapivideomemory.lo `test -f 'gstvaapivideomemory.c' || echo '$(srcdir)/'`gstvaapivideomemory.c
-
-libgstvaapi_la-gstvaapidownload.lo: gstvaapidownload.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstvaapi_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstvaapi_la_CFLAGS) $(CFLAGS) -MT libgstvaapi_la-gstvaapidownload.lo -MD -MP -MF $(DEPDIR)/libgstvaapi_la-gstvaapidownload.Tpo -c -o libgstvaapi_la-gstvaapidownload.lo `test -f 'gstvaapidownload.c' || echo '$(srcdir)/'`gstvaapidownload.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgstvaapi_la-gstvaapidownload.Tpo $(DEPDIR)/libgstvaapi_la-gstvaapidownload.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gstvaapidownload.c' object='libgstvaapi_la-gstvaapidownload.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstvaapi_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstvaapi_la_CFLAGS) $(CFLAGS) -c -o libgstvaapi_la-gstvaapidownload.lo `test -f 'gstvaapidownload.c' || echo '$(srcdir)/'`gstvaapidownload.c
-
-libgstvaapi_la-gstvaapiupload.lo: gstvaapiupload.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstvaapi_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstvaapi_la_CFLAGS) $(CFLAGS) -MT libgstvaapi_la-gstvaapiupload.lo -MD -MP -MF $(DEPDIR)/libgstvaapi_la-gstvaapiupload.Tpo -c -o libgstvaapi_la-gstvaapiupload.lo `test -f 'gstvaapiupload.c' || echo '$(srcdir)/'`gstvaapiupload.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgstvaapi_la-gstvaapiupload.Tpo $(DEPDIR)/libgstvaapi_la-gstvaapiupload.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gstvaapiupload.c' object='libgstvaapi_la-gstvaapiupload.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstvaapi_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstvaapi_la_CFLAGS) $(CFLAGS) -c -o libgstvaapi_la-gstvaapiupload.lo `test -f 'gstvaapiupload.c' || echo '$(srcdir)/'`gstvaapiupload.c
-
 libgstvaapi_parse_la-gstvaapiparse.lo: gstvaapiparse.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstvaapi_parse_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstvaapi_parse_la_CFLAGS) $(CFLAGS) -MT libgstvaapi_parse_la-gstvaapiparse.lo -MD -MP -MF $(DEPDIR)/libgstvaapi_parse_la-gstvaapiparse.Tpo -c -o libgstvaapi_parse_la-gstvaapiparse.lo `test -f 'gstvaapiparse.c' || echo '$(srcdir)/'`gstvaapiparse.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgstvaapi_parse_la-gstvaapiparse.Tpo $(DEPDIR)/libgstvaapi_parse_la-gstvaapiparse.Plo
@@ -934,6 +950,13 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstvaapi_parse_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstvaapi_parse_la_CFLAGS) $(CFLAGS) -c -o libgstvaapi_parse_la-gsth264parse.lo `test -f 'gsth264parse.c' || echo '$(srcdir)/'`gsth264parse.c
 
+libgstvaapi_parse_la-gsth265parse.lo: gsth265parse.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstvaapi_parse_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstvaapi_parse_la_CFLAGS) $(CFLAGS) -MT libgstvaapi_parse_la-gsth265parse.lo -MD -MP -MF $(DEPDIR)/libgstvaapi_parse_la-gsth265parse.Tpo -c -o libgstvaapi_parse_la-gsth265parse.lo `test -f 'gsth265parse.c' || echo '$(srcdir)/'`gsth265parse.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgstvaapi_parse_la-gsth265parse.Tpo $(DEPDIR)/libgstvaapi_parse_la-gsth265parse.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gsth265parse.c' object='libgstvaapi_parse_la-gsth265parse.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstvaapi_parse_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstvaapi_parse_la_CFLAGS) $(CFLAGS) -c -o libgstvaapi_parse_la-gsth265parse.lo `test -f 'gsth265parse.c' || echo '$(srcdir)/'`gsth265parse.c
+
 mostlyclean-libtool:
 	-rm -f *.lo
 
@@ -1063,7 +1086,6 @@
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
 	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
-	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
 clean: clean-am
 
 clean-am: clean-generic clean-libtool clean-pluginLTLIBRARIES \
@@ -1163,6 +1185,8 @@
 @USE_LOCAL_VIDEO_PARSERS_TRUE@	done
 @USE_LOCAL_VIDEO_PARSERS_TRUE@	@touch $@
 
+-include $(top_srcdir)/git.mk
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -Nru gstreamer-vaapi-0.5.10/gst-libs/gst/base/Makefile.am gstreamer-vaapi-0.6.0/gst-libs/gst/base/Makefile.am
--- gstreamer-vaapi-0.5.10/gst-libs/gst/base/Makefile.am	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst-libs/gst/base/Makefile.am	2015-07-15 12:47:43.000000000 +0000
@@ -44,5 +44,4 @@
 	$(source_h)				\
 	$(NULL)
 
-# Extra clean files so that maintainer-clean removes *everything*
-MAINTAINERCLEANFILES = Makefile.in
+-include $(top_srcdir)/git.mk
diff -Nru gstreamer-vaapi-0.5.10/gst-libs/gst/base/Makefile.in gstreamer-vaapi-0.6.0/gst-libs/gst/base/Makefile.in
--- gstreamer-vaapi-0.5.10/gst-libs/gst/base/Makefile.in	2015-02-03 08:39:54.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst-libs/gst/base/Makefile.in	2015-07-15 12:50:34.000000000 +0000
@@ -195,10 +195,16 @@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
+EGL_CFLAGS = @EGL_CFLAGS@
+EGL_LIBS = @EGL_LIBS@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GIT = @GIT@
+GLES2_CFLAGS = @GLES2_CFLAGS@
+GLES2_LIBS = @GLES2_LIBS@
+GLES3_CFLAGS = @GLES3_CFLAGS@
+GLES3_LIBS = @GLES3_LIBS@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_VERSION_REQUIRED = @GLIB_VERSION_REQUIRED@
@@ -216,6 +222,8 @@
 GST_CFLAGS = @GST_CFLAGS@
 GST_CODEC_PARSERS_CFLAGS = @GST_CODEC_PARSERS_CFLAGS@
 GST_CODEC_PARSERS_LIBS = @GST_CODEC_PARSERS_LIBS@
+GST_GL_CFLAGS = @GST_GL_CFLAGS@
+GST_GL_LIBS = @GST_GL_LIBS@
 GST_INTERFACES_CFLAGS = @GST_INTERFACES_CFLAGS@
 GST_INTERFACES_LIBS = @GST_INTERFACES_LIBS@
 GST_LIBS = @GST_LIBS@
@@ -225,7 +233,6 @@
 GST_PLUGINS_BASE_LIBS = @GST_PLUGINS_BASE_LIBS@
 GST_PLUGINS_BASE_VERSION_REQUIRED = @GST_PLUGINS_BASE_VERSION_REQUIRED@
 GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
-GST_PLUGIN_PATH = @GST_PLUGIN_PATH@
 GST_PLUGIN_PATH_1_0 = @GST_PLUGIN_PATH_1_0@
 GST_VAAPI_LT_LDFLAGS = @GST_VAAPI_LT_LDFLAGS@
 GST_VAAPI_LT_VERSION = @GST_VAAPI_LT_VERSION@
@@ -408,9 +415,6 @@
 	$(source_h)				\
 	$(NULL)
 
-
-# Extra clean files so that maintainer-clean removes *everything*
-MAINTAINERCLEANFILES = Makefile.in
 all: all-am
 
 .SUFFIXES:
@@ -618,7 +622,6 @@
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
 clean: clean-am
 
 clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
@@ -707,6 +710,8 @@
 	tags tags-am uninstall uninstall-am
 
 
+-include $(top_srcdir)/git.mk
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -Nru gstreamer-vaapi-0.5.10/gst-libs/gst/codecparsers/Makefile.am gstreamer-vaapi-0.6.0/gst-libs/gst/codecparsers/Makefile.am
--- gstreamer-vaapi-0.5.10/gst-libs/gst/codecparsers/Makefile.am	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst-libs/gst/codecparsers/Makefile.am	2015-07-15 12:47:43.000000000 +0000
@@ -62,6 +62,11 @@
 endif
 endif
 
+if USE_LOCAL_CODEC_PARSERS_H265
+gen_source_c += gsth265parser.c
+gen_source_h += gsth265parser.h
+endif
+
 GENFILES = \
 	$(gen_source_c)				\
 	$(gen_source_h)				\
@@ -102,5 +107,4 @@
 
 DISTCLEANFILES = $(GENFILES) .timestamp.symlinks
 
-# Extra clean files so that maintainer-clean removes *everything*
-MAINTAINERCLEANFILES = Makefile.in
+-include $(top_srcdir)/git.mk
diff -Nru gstreamer-vaapi-0.5.10/gst-libs/gst/codecparsers/Makefile.in gstreamer-vaapi-0.6.0/gst-libs/gst/codecparsers/Makefile.in
--- gstreamer-vaapi-0.5.10/gst-libs/gst/codecparsers/Makefile.in	2015-02-03 08:39:54.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst-libs/gst/codecparsers/Makefile.in	2015-07-15 12:50:34.000000000 +0000
@@ -98,6 +98,8 @@
 
 @USE_BUILTIN_LIBVPX_FALSE@@USE_LOCAL_CODEC_PARSERS_VP8_TRUE@am__append_12 = dboolhuff.c gstvp8rangedecoder.c vp8utils.c
 @USE_BUILTIN_LIBVPX_FALSE@@USE_LOCAL_CODEC_PARSERS_VP8_TRUE@am__append_13 = dboolhuff.h
+@USE_LOCAL_CODEC_PARSERS_H265_TRUE@am__append_14 = gsth265parser.c
+@USE_LOCAL_CODEC_PARSERS_H265_TRUE@am__append_15 = gsth265parser.h
 subdir = gst-libs/gst/codecparsers
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(top_srcdir)/build-aux/depcomp
@@ -124,16 +126,17 @@
 @USE_BUILTIN_LIBVPX_FALSE@@USE_LOCAL_CODEC_PARSERS_VP8_TRUE@am__objects_5 = libgstvaapi_codecparsers_la-dboolhuff.lo \
 @USE_BUILTIN_LIBVPX_FALSE@@USE_LOCAL_CODEC_PARSERS_VP8_TRUE@	libgstvaapi_codecparsers_la-gstvp8rangedecoder.lo \
 @USE_BUILTIN_LIBVPX_FALSE@@USE_LOCAL_CODEC_PARSERS_VP8_TRUE@	libgstvaapi_codecparsers_la-vp8utils.lo
-am__objects_6 = libgstvaapi_codecparsers_la-parserutils.lo \
+@USE_LOCAL_CODEC_PARSERS_H265_TRUE@am__objects_6 = libgstvaapi_codecparsers_la-gsth265parser.lo
+am__objects_7 = libgstvaapi_codecparsers_la-parserutils.lo \
 	libgstvaapi_codecparsers_la-nalutils.lo \
 	libgstvaapi_codecparsers_la-gstvc1parser.lo \
 	libgstvaapi_codecparsers_la-gstmpeg4parser.lo $(am__objects_1) \
 	$(am__objects_2) $(am__objects_3) $(am__objects_4) \
-	$(am__objects_5)
-@USE_BUILTIN_LIBVPX_TRUE@@USE_LOCAL_CODEC_PARSERS_VP8_TRUE@am__objects_7 = libgstvaapi_codecparsers_la-gstvaapilibvpx.lo
-am__objects_8 = $(am__objects_7)
-nodist_libgstvaapi_codecparsers_la_OBJECTS = $(am__objects_6) \
-	$(am__objects_8)
+	$(am__objects_5) $(am__objects_6)
+@USE_BUILTIN_LIBVPX_TRUE@@USE_LOCAL_CODEC_PARSERS_VP8_TRUE@am__objects_8 = libgstvaapi_codecparsers_la-gstvaapilibvpx.lo
+am__objects_9 = $(am__objects_8)
+nodist_libgstvaapi_codecparsers_la_OBJECTS = $(am__objects_7) \
+	$(am__objects_9)
 libgstvaapi_codecparsers_la_OBJECTS =  \
 	$(nodist_libgstvaapi_codecparsers_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
@@ -231,10 +234,16 @@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
+EGL_CFLAGS = @EGL_CFLAGS@
+EGL_LIBS = @EGL_LIBS@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GIT = @GIT@
+GLES2_CFLAGS = @GLES2_CFLAGS@
+GLES2_LIBS = @GLES2_LIBS@
+GLES3_CFLAGS = @GLES3_CFLAGS@
+GLES3_LIBS = @GLES3_LIBS@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_VERSION_REQUIRED = @GLIB_VERSION_REQUIRED@
@@ -252,6 +261,8 @@
 GST_CFLAGS = @GST_CFLAGS@
 GST_CODEC_PARSERS_CFLAGS = @GST_CODEC_PARSERS_CFLAGS@
 GST_CODEC_PARSERS_LIBS = @GST_CODEC_PARSERS_LIBS@
+GST_GL_CFLAGS = @GST_GL_CFLAGS@
+GST_GL_LIBS = @GST_GL_LIBS@
 GST_INTERFACES_CFLAGS = @GST_INTERFACES_CFLAGS@
 GST_INTERFACES_LIBS = @GST_INTERFACES_LIBS@
 GST_LIBS = @GST_LIBS@
@@ -261,7 +272,6 @@
 GST_PLUGINS_BASE_LIBS = @GST_PLUGINS_BASE_LIBS@
 GST_PLUGINS_BASE_VERSION_REQUIRED = @GST_PLUGINS_BASE_VERSION_REQUIRED@
 GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
-GST_PLUGIN_PATH = @GST_PLUGIN_PATH@
 GST_PLUGIN_PATH_1_0 = @GST_PLUGIN_PATH_1_0@
 GST_VAAPI_LT_LDFLAGS = @GST_VAAPI_LT_LDFLAGS@
 GST_VAAPI_LT_VERSION = @GST_VAAPI_LT_VERSION@
@@ -416,10 +426,12 @@
 # Always build VC-1 and MPEG-4 parsers for now
 gen_source_c = parserutils.c nalutils.c gstvc1parser.c \
 	gstmpeg4parser.c $(am__append_1) $(am__append_3) \
-	$(am__append_5) $(am__append_7) $(am__append_12)
+	$(am__append_5) $(am__append_7) $(am__append_12) \
+	$(am__append_14)
 gen_source_h = parserutils.h nalutils.h gstvc1parser.h \
 	gstmpeg4parser.h $(am__append_2) $(am__append_4) \
-	$(am__append_6) $(am__append_8) $(am__append_13)
+	$(am__append_6) $(am__append_8) $(am__append_13) \
+	$(am__append_15)
 GENFILES = \
 	$(gen_source_c)				\
 	$(gen_source_h)				\
@@ -445,9 +457,6 @@
 
 EXTRA_DIST = gstvaapilibvpx.c
 DISTCLEANFILES = $(GENFILES) .timestamp.symlinks
-
-# Extra clean files so that maintainer-clean removes *everything*
-MAINTAINERCLEANFILES = Makefile.in
 all: all-am
 
 .SUFFIXES:
@@ -506,6 +515,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstvaapi_codecparsers_la-dboolhuff.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstvaapi_codecparsers_la-dummy.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstvaapi_codecparsers_la-gsth264parser.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstvaapi_codecparsers_la-gsth265parser.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstvaapi_codecparsers_la-gstjpegparser.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstvaapi_codecparsers_la-gstmpeg4parser.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstvaapi_codecparsers_la-gstmpegvideoparser.Plo@am__quote@
@@ -615,6 +625,13 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstvaapi_codecparsers_la_CFLAGS) $(CFLAGS) -c -o libgstvaapi_codecparsers_la-vp8utils.lo `test -f 'vp8utils.c' || echo '$(srcdir)/'`vp8utils.c
 
+libgstvaapi_codecparsers_la-gsth265parser.lo: gsth265parser.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstvaapi_codecparsers_la_CFLAGS) $(CFLAGS) -MT libgstvaapi_codecparsers_la-gsth265parser.lo -MD -MP -MF $(DEPDIR)/libgstvaapi_codecparsers_la-gsth265parser.Tpo -c -o libgstvaapi_codecparsers_la-gsth265parser.lo `test -f 'gsth265parser.c' || echo '$(srcdir)/'`gsth265parser.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgstvaapi_codecparsers_la-gsth265parser.Tpo $(DEPDIR)/libgstvaapi_codecparsers_la-gsth265parser.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gsth265parser.c' object='libgstvaapi_codecparsers_la-gsth265parser.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstvaapi_codecparsers_la_CFLAGS) $(CFLAGS) -c -o libgstvaapi_codecparsers_la-gsth265parser.lo `test -f 'gsth265parser.c' || echo '$(srcdir)/'`gsth265parser.c
+
 libgstvaapi_codecparsers_la-gstvaapilibvpx.lo: gstvaapilibvpx.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstvaapi_codecparsers_la_CFLAGS) $(CFLAGS) -MT libgstvaapi_codecparsers_la-gstvaapilibvpx.lo -MD -MP -MF $(DEPDIR)/libgstvaapi_codecparsers_la-gstvaapilibvpx.Tpo -c -o libgstvaapi_codecparsers_la-gstvaapilibvpx.lo `test -f 'gstvaapilibvpx.c' || echo '$(srcdir)/'`gstvaapilibvpx.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgstvaapi_codecparsers_la-gstvaapilibvpx.Tpo $(DEPDIR)/libgstvaapi_codecparsers_la-gstvaapilibvpx.Plo
@@ -752,7 +769,6 @@
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
 clean: clean-am
 
 clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
@@ -853,6 +869,8 @@
 $(top_builddir)/ext/libvpx/libgstcodecparsers_vpx.la:
 	$(MAKE) -C $(top_builddir)/ext/libvpx
 
+-include $(top_srcdir)/git.mk
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -Nru gstreamer-vaapi-0.5.10/gst-libs/gst/Makefile.am gstreamer-vaapi-0.6.0/gst-libs/gst/Makefile.am
--- gstreamer-vaapi-0.5.10/gst-libs/gst/Makefile.am	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst-libs/gst/Makefile.am	2015-07-15 12:47:43.000000000 +0000
@@ -1,4 +1,3 @@
-SUBDIRS = base codecparsers video vaapi
+SUBDIRS = base codecparsers vaapi
 
-# Extra clean files so that maintainer-clean removes *everything*
-MAINTAINERCLEANFILES = Makefile.in $(gen_headers)
+-include $(top_srcdir)/git.mk
diff -Nru gstreamer-vaapi-0.5.10/gst-libs/gst/Makefile.in gstreamer-vaapi-0.6.0/gst-libs/gst/Makefile.in
--- gstreamer-vaapi-0.5.10/gst-libs/gst/Makefile.in	2015-02-03 08:39:54.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst-libs/gst/Makefile.in	2015-07-15 12:50:34.000000000 +0000
@@ -197,10 +197,16 @@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
+EGL_CFLAGS = @EGL_CFLAGS@
+EGL_LIBS = @EGL_LIBS@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GIT = @GIT@
+GLES2_CFLAGS = @GLES2_CFLAGS@
+GLES2_LIBS = @GLES2_LIBS@
+GLES3_CFLAGS = @GLES3_CFLAGS@
+GLES3_LIBS = @GLES3_LIBS@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_VERSION_REQUIRED = @GLIB_VERSION_REQUIRED@
@@ -218,6 +224,8 @@
 GST_CFLAGS = @GST_CFLAGS@
 GST_CODEC_PARSERS_CFLAGS = @GST_CODEC_PARSERS_CFLAGS@
 GST_CODEC_PARSERS_LIBS = @GST_CODEC_PARSERS_LIBS@
+GST_GL_CFLAGS = @GST_GL_CFLAGS@
+GST_GL_LIBS = @GST_GL_LIBS@
 GST_INTERFACES_CFLAGS = @GST_INTERFACES_CFLAGS@
 GST_INTERFACES_LIBS = @GST_INTERFACES_LIBS@
 GST_LIBS = @GST_LIBS@
@@ -227,7 +235,6 @@
 GST_PLUGINS_BASE_LIBS = @GST_PLUGINS_BASE_LIBS@
 GST_PLUGINS_BASE_VERSION_REQUIRED = @GST_PLUGINS_BASE_VERSION_REQUIRED@
 GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
-GST_PLUGIN_PATH = @GST_PLUGIN_PATH@
 GST_PLUGIN_PATH_1_0 = @GST_PLUGIN_PATH_1_0@
 GST_VAAPI_LT_LDFLAGS = @GST_VAAPI_LT_LDFLAGS@
 GST_VAAPI_LT_VERSION = @GST_VAAPI_LT_VERSION@
@@ -364,10 +371,7 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SUBDIRS = base codecparsers video vaapi
-
-# Extra clean files so that maintainer-clean removes *everything*
-MAINTAINERCLEANFILES = Makefile.in $(gen_headers)
+SUBDIRS = base codecparsers vaapi
 all: all-recursive
 
 .SUFFIXES:
@@ -597,7 +601,6 @@
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
 clean: clean-recursive
 
 clean-am: clean-generic clean-libtool mostlyclean-am
@@ -680,6 +683,8 @@
 	ps ps-am tags tags-am uninstall uninstall-am
 
 
+-include $(top_srcdir)/git.mk
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -Nru gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/egl_compat.h gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/egl_compat.h
--- gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/egl_compat.h	1970-01-01 00:00:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/egl_compat.h	2015-07-15 12:47:43.000000000 +0000
@@ -0,0 +1,39 @@
+/*
+ * egl_compat.h - EGL compatiliby layer
+ *
+ * Copyright (C) 2014 Intel Corporation
+ *   Author: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1
+ * of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301
+ */
+
+#ifndef EGL_COMPAT_H
+#define EGL_COMPAT_H
+
+#include <EGL/egl.h>
+#include <EGL/eglext.h>
+#include "ogl_compat.h"
+
+#ifndef GL_OES_EGL_image
+#define GL_OES_EGL_image 1
+typedef void *GLeglImageOES;
+typedef void (*PFNGLEGLIMAGETARGETTEXTURE2DOESPROC)(GLenum target,
+    GLeglImageOES image);
+typedef void (*PFNGLEGLIMAGETARGETRENDERBUFFERSTORAGEOESPROC)(GLenum target,
+    GLeglImageOES image);
+#endif /* GL_OES_EGL_image */
+
+#endif /* EGL_COMPAT_H */
diff -Nru gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/egl_vtable.h gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/egl_vtable.h
--- gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/egl_vtable.h	1970-01-01 00:00:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/egl_vtable.h	2015-07-15 12:47:43.000000000 +0000
@@ -0,0 +1,785 @@
+/*
+ * egl_vtable.h - EGL function definitions
+ *
+ * Copyright (C) 2014 Intel Corporation
+ *   Author: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1
+ * of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301
+ */
+
+/* ------------------------------------------------------------------------- */
+// Generate strings
+
+#define GL_PROTO_GEN_STRING(x) \
+  GL_PROTO_GEN_STRING_I(x)
+#define GL_PROTO_GEN_STRING_I(x) \
+  #x
+
+/* ------------------------------------------------------------------------- */
+// Concatenate arguments
+
+#define GL_PROTO_GEN_CONCAT(a1, a2) \
+  GL_PROTO_GEN_CONCAT2_I(a1, a2)
+#define GL_PROTO_GEN_CONCAT2(a1, a2) \
+  GL_PROTO_GEN_CONCAT2_I(a1, a2)
+#define GL_PROTO_GEN_CONCAT2_I(a1, a2) \
+  a1 ## a2
+
+#define GL_PROTO_GEN_CONCAT3(a1, a2, a3) \
+  GL_PROTO_GEN_CONCAT3_I(a1, a2, a3)
+#define GL_PROTO_GEN_CONCAT3_I(a1, a2, a3) \
+  a1 ## a2 ## a3
+
+#define GL_PROTO_GEN_CONCAT4(a1, a2, a3, a4) \
+  GL_PROTO_GEN_CONCAT4_I(a1, a2, a3, a4)
+#define GL_PROTO_GEN_CONCAT4_I(a1, a2, a3, a4) \
+  a1 ## a2 ## a3 ## a4
+
+#define GL_PROTO_GEN_CONCAT5(a1, a2, a3, a4, a5) \
+  GL_PROTO_GEN_CONCAT5_I(a1, a2, a3, a4, a5)
+#define GL_PROTO_GEN_CONCAT5_I(a1, a2, a3, a4, a5) \
+  a1 ## a2 ## a3 ## a4 ## a5
+
+/* ------------------------------------------------------------------------- */
+// Default macros
+
+#ifndef EGL_PROTO_BEGIN
+#define EGL_PROTO_BEGIN(NAME, TYPE, EXTENSION)
+#endif
+#ifndef EGL_PROTO_ARG_LIST
+#define EGL_PROTO_ARG_LIST(...) GL_PROTO_ARG_LIST(__VA_ARGS__)
+#endif
+#ifndef EGL_PROTO_ARG
+#define EGL_PROTO_ARG(NAME, TYPE) GL_PROTO_ARG(NAME, TYPE)
+#endif
+#ifndef EGL_PROTO_INVOKE
+#define EGL_PROTO_INVOKE(NAME, TYPE, ARGS)
+#endif
+#ifndef EGL_PROTO_END
+#define EGL_PROTO_END()
+#endif
+#ifndef EGL_DEFINE_EXTENSION
+#define EGL_DEFINE_EXTENSION(EXTENSION)
+#endif
+
+#ifndef GL_PROTO_BEGIN
+#define GL_PROTO_BEGIN(NAME, TYPE, EXTENSION)
+#endif
+#ifndef GL_PROTO_ARG_LIST
+#define GL_PROTO_ARG_LIST(...)
+#endif
+#ifndef GL_PROTO_ARG
+#define GL_PROTO_ARG(NAME, TYPE)
+#endif
+#ifndef GL_PROTO_INVOKE
+#define GL_PROTO_INVOKE(NAME, TYPE, ARGS)
+#endif
+#ifndef GL_PROTO_END
+#define GL_PROTO_END()
+#endif
+#ifndef GL_DEFINE_EXTENSION
+#define GL_DEFINE_EXTENSION(EXTENSION)
+#endif
+
+/* NOTE: this is auto-generated code -- do not edit! */
+
+EGL_PROTO_BEGIN(CreateImageKHR, EGLImageKHR, KHR_image_base)
+EGL_PROTO_ARG_LIST(
+EGL_PROTO_ARG(dpy, EGLDisplay),
+EGL_PROTO_ARG(ctx, EGLContext),
+EGL_PROTO_ARG(target, EGLenum),
+EGL_PROTO_ARG(buffer, EGLClientBuffer),
+EGL_PROTO_ARG(attrib_list, const EGLint *))
+EGL_PROTO_INVOKE(CreateImageKHR, EGLImageKHR, (dpy, ctx, target, buffer, attrib_list))
+EGL_PROTO_END()
+
+EGL_PROTO_BEGIN(DestroyImageKHR, EGLImageKHR, KHR_image_base)
+EGL_PROTO_ARG_LIST(
+EGL_PROTO_ARG(dpy, EGLDisplay),
+EGL_PROTO_ARG(image, EGLImageKHR))
+EGL_PROTO_INVOKE(DestroyImageKHR, EGLImageKHR, (dpy, image))
+EGL_PROTO_END()
+
+EGL_PROTO_BEGIN(CreateDRMImageMESA, EGLImageKHR, MESA_drm_image)
+EGL_PROTO_ARG_LIST(
+EGL_PROTO_ARG(dpy, EGLDisplay),
+EGL_PROTO_ARG(attrib_list, const EGLint *))
+EGL_PROTO_INVOKE(CreateDRMImageMESA, EGLImageKHR, (dpy, attrib_list))
+EGL_PROTO_END()
+
+EGL_PROTO_BEGIN(ExportDRMImageMESA, EGLImageKHR, MESA_drm_image)
+EGL_PROTO_ARG_LIST(
+EGL_PROTO_ARG(dpy, EGLDisplay),
+EGL_PROTO_ARG(image, EGLImageKHR),
+EGL_PROTO_ARG(name, EGLint *),
+EGL_PROTO_ARG(handle, EGLint *),
+EGL_PROTO_ARG(stride, EGLint *))
+EGL_PROTO_INVOKE(ExportDRMImageMESA, EGLImageKHR, (dpy, image, name, handle, stride))
+EGL_PROTO_END()
+
+EGL_DEFINE_EXTENSION(EXT_image_dma_buf_import)
+EGL_DEFINE_EXTENSION(KHR_create_context)
+EGL_DEFINE_EXTENSION(KHR_gl_texture_2D_image)
+EGL_DEFINE_EXTENSION(KHR_image_base)
+EGL_DEFINE_EXTENSION(KHR_surfaceless_context)
+EGL_DEFINE_EXTENSION(MESA_configless_context)
+EGL_DEFINE_EXTENSION(MESA_drm_image)
+
+GL_PROTO_BEGIN(GetError, GLenum, CORE_1_0)
+GL_PROTO_ARG_LIST()
+GL_PROTO_INVOKE(GetError, GLenum, ())
+GL_PROTO_END()
+
+GL_PROTO_BEGIN(GetString, const GLubyte *, CORE_1_0)
+GL_PROTO_ARG_LIST(
+GL_PROTO_ARG(name, GLenum))
+GL_PROTO_INVOKE(GetString, const GLubyte *, (name))
+GL_PROTO_END()
+
+GL_PROTO_BEGIN(GetIntegerv, void, CORE_1_0)
+GL_PROTO_ARG_LIST(
+GL_PROTO_ARG(pname, GLenum),
+GL_PROTO_ARG(params, GLint *))
+GL_PROTO_INVOKE(GetIntegerv, void, (pname, params))
+GL_PROTO_END()
+
+GL_PROTO_BEGIN(Enable, void, CORE_1_0)
+GL_PROTO_ARG_LIST(
+GL_PROTO_ARG(cap, GLenum))
+GL_PROTO_INVOKE(Enable, void, (cap))
+GL_PROTO_END()
+
+GL_PROTO_BEGIN(Disable, void, CORE_1_0)
+GL_PROTO_ARG_LIST(
+GL_PROTO_ARG(cap, GLenum))
+GL_PROTO_INVOKE(Disable, void, (cap))
+GL_PROTO_END()
+
+GL_PROTO_BEGIN(IsEnabled, GLboolean, CORE_1_0)
+GL_PROTO_ARG_LIST(
+GL_PROTO_ARG(cap, GLenum))
+GL_PROTO_INVOKE(IsEnabled, GLboolean, (cap))
+GL_PROTO_END()
+
+GL_PROTO_BEGIN(Finish, void, CORE_1_0)
+GL_PROTO_ARG_LIST()
+GL_PROTO_INVOKE(Finish, void, ())
+GL_PROTO_END()
+
+GL_PROTO_BEGIN(Flush, void, CORE_1_0)
+GL_PROTO_ARG_LIST()
+GL_PROTO_INVOKE(Flush, void, ())
+GL_PROTO_END()
+
+GL_PROTO_BEGIN(Begin, void, CORE_1_0)
+GL_PROTO_ARG_LIST(
+GL_PROTO_ARG(mode, GLenum))
+GL_PROTO_INVOKE(Begin, void, (mode))
+GL_PROTO_END()
+
+GL_PROTO_BEGIN(End, void, CORE_1_0)
+GL_PROTO_ARG_LIST()
+GL_PROTO_INVOKE(End, void, ())
+GL_PROTO_END()
+
+GL_PROTO_BEGIN(Color4f, void, CORE_1_0)
+GL_PROTO_ARG_LIST(
+GL_PROTO_ARG(red, GLfloat),
+GL_PROTO_ARG(green, GLfloat),
+GL_PROTO_ARG(blue, GLfloat),
+GL_PROTO_ARG(alpha, GLfloat))
+GL_PROTO_INVOKE(Color4f, void, (red, green, blue, alpha))
+GL_PROTO_END()
+
+GL_PROTO_BEGIN(Clear, void, CORE_1_0)
+GL_PROTO_ARG_LIST(
+GL_PROTO_ARG(mask, GLbitfield))
+GL_PROTO_INVOKE(Clear, void, (mask))
+GL_PROTO_END()
+
+GL_PROTO_BEGIN(ClearColor, void, CORE_1_0)
+GL_PROTO_ARG_LIST(
+GL_PROTO_ARG(red, GLclampf),
+GL_PROTO_ARG(green, GLclampf),
+GL_PROTO_ARG(blue, GLclampf),
+GL_PROTO_ARG(alpha, GLclampf))
+GL_PROTO_INVOKE(ClearColor, void, (red, green, blue, alpha))
+GL_PROTO_END()
+
+GL_PROTO_BEGIN(PushMatrix, void, CORE_1_0)
+GL_PROTO_ARG_LIST()
+GL_PROTO_INVOKE(PushMatrix, void, ())
+GL_PROTO_END()
+
+GL_PROTO_BEGIN(PopMatrix, void, CORE_1_0)
+GL_PROTO_ARG_LIST()
+GL_PROTO_INVOKE(PopMatrix, void, ())
+GL_PROTO_END()
+
+GL_PROTO_BEGIN(LoadIdentity, void, CORE_1_0)
+GL_PROTO_ARG_LIST()
+GL_PROTO_INVOKE(LoadIdentity, void, ())
+GL_PROTO_END()
+
+GL_PROTO_BEGIN(MatrixMode, void, CORE_1_0)
+GL_PROTO_ARG_LIST(
+GL_PROTO_ARG(mode, GLenum))
+GL_PROTO_INVOKE(MatrixMode, void, (mode))
+GL_PROTO_END()
+
+GL_PROTO_BEGIN(PushAttrib, void, CORE_1_0)
+GL_PROTO_ARG_LIST(
+GL_PROTO_ARG(mask, GLbitfield))
+GL_PROTO_INVOKE(PushAttrib, void, (mask))
+GL_PROTO_END()
+
+GL_PROTO_BEGIN(PopAttrib, void, CORE_1_0)
+GL_PROTO_ARG_LIST()
+GL_PROTO_INVOKE(PopAttrib, void, ())
+GL_PROTO_END()
+
+GL_PROTO_BEGIN(Viewport, void, CORE_1_0)
+GL_PROTO_ARG_LIST(
+GL_PROTO_ARG(x, GLint),
+GL_PROTO_ARG(y, GLint),
+GL_PROTO_ARG(width, GLsizei),
+GL_PROTO_ARG(height, GLsizei))
+GL_PROTO_INVOKE(Viewport, void, (x, y, width, height))
+GL_PROTO_END()
+
+GL_PROTO_BEGIN(Frustum, void, CORE_1_0)
+GL_PROTO_ARG_LIST(
+GL_PROTO_ARG(left, GLdouble),
+GL_PROTO_ARG(right, GLdouble),
+GL_PROTO_ARG(bottom, GLdouble),
+GL_PROTO_ARG(top, GLdouble),
+GL_PROTO_ARG(zNear, GLdouble),
+GL_PROTO_ARG(zFar, GLdouble))
+GL_PROTO_INVOKE(Frustum, void, (left, right, bottom, top, zNear, zFar))
+GL_PROTO_END()
+
+GL_PROTO_BEGIN(Scalef, void, CORE_1_0)
+GL_PROTO_ARG_LIST(
+GL_PROTO_ARG(x, GLfloat),
+GL_PROTO_ARG(y, GLfloat),
+GL_PROTO_ARG(z, GLfloat))
+GL_PROTO_INVOKE(Scalef, void, (x, y, z))
+GL_PROTO_END()
+
+GL_PROTO_BEGIN(Translatef, void, CORE_1_0)
+GL_PROTO_ARG_LIST(
+GL_PROTO_ARG(x, GLfloat),
+GL_PROTO_ARG(y, GLfloat),
+GL_PROTO_ARG(z, GLfloat))
+GL_PROTO_INVOKE(Translatef, void, (x, y, z))
+GL_PROTO_END()
+
+GL_PROTO_BEGIN(EnableClientState, void, CORE_1_0)
+GL_PROTO_ARG_LIST(
+GL_PROTO_ARG(array, GLenum))
+GL_PROTO_INVOKE(EnableClientState, void, (array))
+GL_PROTO_END()
+
+GL_PROTO_BEGIN(DisableClientState, void, CORE_1_0)
+GL_PROTO_ARG_LIST(
+GL_PROTO_ARG(array, GLenum))
+GL_PROTO_INVOKE(DisableClientState, void, (array))
+GL_PROTO_END()
+
+GL_PROTO_BEGIN(TexCoordPointer, void, CORE_1_0)
+GL_PROTO_ARG_LIST(
+GL_PROTO_ARG(size, GLint),
+GL_PROTO_ARG(type, GLenum),
+GL_PROTO_ARG(stride, GLsizei),
+GL_PROTO_ARG(pointer, const GLvoid *))
+GL_PROTO_INVOKE(TexCoordPointer, void, (size, type, stride, pointer))
+GL_PROTO_END()
+
+GL_PROTO_BEGIN(VertexPointer, void, CORE_1_0)
+GL_PROTO_ARG_LIST(
+GL_PROTO_ARG(size, GLint),
+GL_PROTO_ARG(type, GLenum),
+GL_PROTO_ARG(stride, GLsizei),
+GL_PROTO_ARG(pointer, const GLvoid *))
+GL_PROTO_INVOKE(VertexPointer, void, (size, type, stride, pointer))
+GL_PROTO_END()
+
+GL_PROTO_BEGIN(EnableVertexAttribArray, void, CORE_2_0)
+GL_PROTO_ARG_LIST(
+GL_PROTO_ARG(index, GLuint))
+GL_PROTO_INVOKE(EnableVertexAttribArray, void, (index))
+GL_PROTO_END()
+
+GL_PROTO_BEGIN(DisableVertexAttribArray, void, CORE_2_0)
+GL_PROTO_ARG_LIST(
+GL_PROTO_ARG(index, GLuint))
+GL_PROTO_INVOKE(DisableVertexAttribArray, void, (index))
+GL_PROTO_END()
+
+GL_PROTO_BEGIN(GetVertexAttribPointerv, void, CORE_2_0)
+GL_PROTO_ARG_LIST(
+GL_PROTO_ARG(index, GLuint),
+GL_PROTO_ARG(pname, GLenum),
+GL_PROTO_ARG(pointer, GLvoid **))
+GL_PROTO_INVOKE(GetVertexAttribPointerv, void, (index, pname, pointer))
+GL_PROTO_END()
+
+GL_PROTO_BEGIN(VertexAttribPointer, void, CORE_2_0)
+GL_PROTO_ARG_LIST(
+GL_PROTO_ARG(index, GLuint),
+GL_PROTO_ARG(size, GLint),
+GL_PROTO_ARG(type, GLenum),
+GL_PROTO_ARG(normalized, GLboolean),
+GL_PROTO_ARG(stride, GLsizei),
+GL_PROTO_ARG(pointer, const GLvoid *))
+GL_PROTO_INVOKE(VertexAttribPointer, void, (index, size, type, normalized, stride, pointer))
+GL_PROTO_END()
+
+GL_PROTO_BEGIN(DrawArrays, void, CORE_1_1)
+GL_PROTO_ARG_LIST(
+GL_PROTO_ARG(mode, GLenum),
+GL_PROTO_ARG(first, GLint),
+GL_PROTO_ARG(count, GLsizei))
+GL_PROTO_INVOKE(DrawArrays, void, (mode, first, count))
+GL_PROTO_END()
+
+GL_PROTO_BEGIN(GenTextures, void, CORE_1_1)
+GL_PROTO_ARG_LIST(
+GL_PROTO_ARG(n, GLsizei),
+GL_PROTO_ARG(textures, GLuint *))
+GL_PROTO_INVOKE(GenTextures, void, (n, textures))
+GL_PROTO_END()
+
+GL_PROTO_BEGIN(DeleteTextures, void, CORE_1_1)
+GL_PROTO_ARG_LIST(
+GL_PROTO_ARG(n, GLsizei),
+GL_PROTO_ARG(textures, const GLuint *))
+GL_PROTO_INVOKE(DeleteTextures, void, (n, textures))
+GL_PROTO_END()
+
+GL_PROTO_BEGIN(BindTexture, void, CORE_1_1)
+GL_PROTO_ARG_LIST(
+GL_PROTO_ARG(target, GLenum),
+GL_PROTO_ARG(texture, GLuint))
+GL_PROTO_INVOKE(BindTexture, void, (target, texture))
+GL_PROTO_END()
+
+GL_PROTO_BEGIN(ActiveTexture, void, CORE_1_3)
+GL_PROTO_ARG_LIST(
+GL_PROTO_ARG(texture, GLenum))
+GL_PROTO_INVOKE(ActiveTexture, void, (texture))
+GL_PROTO_END()
+
+GL_PROTO_BEGIN(GetTexLevelParameteriv, void, CORE_1_0)
+GL_PROTO_ARG_LIST(
+GL_PROTO_ARG(target, GLenum),
+GL_PROTO_ARG(level, GLint),
+GL_PROTO_ARG(pname, GLenum),
+GL_PROTO_ARG(params, GLint *))
+GL_PROTO_INVOKE(GetTexLevelParameteriv, void, (target, level, pname, params))
+GL_PROTO_END()
+
+GL_PROTO_BEGIN(TexParameterf, void, CORE_1_0)
+GL_PROTO_ARG_LIST(
+GL_PROTO_ARG(target, GLenum),
+GL_PROTO_ARG(pname, GLenum),
+GL_PROTO_ARG(param, GLfloat))
+GL_PROTO_INVOKE(TexParameterf, void, (target, pname, param))
+GL_PROTO_END()
+
+GL_PROTO_BEGIN(TexParameterfv, void, CORE_1_0)
+GL_PROTO_ARG_LIST(
+GL_PROTO_ARG(target, GLenum),
+GL_PROTO_ARG(pname, GLenum),
+GL_PROTO_ARG(params, const GLfloat *))
+GL_PROTO_INVOKE(TexParameterfv, void, (target, pname, params))
+GL_PROTO_END()
+
+GL_PROTO_BEGIN(TexParameteri, void, CORE_1_0)
+GL_PROTO_ARG_LIST(
+GL_PROTO_ARG(target, GLenum),
+GL_PROTO_ARG(pname, GLenum),
+GL_PROTO_ARG(param, GLint))
+GL_PROTO_INVOKE(TexParameteri, void, (target, pname, param))
+GL_PROTO_END()
+
+GL_PROTO_BEGIN(TexParameteriv, void, CORE_1_0)
+GL_PROTO_ARG_LIST(
+GL_PROTO_ARG(target, GLenum),
+GL_PROTO_ARG(pname, GLenum),
+GL_PROTO_ARG(params, const GLint *))
+GL_PROTO_INVOKE(TexParameteriv, void, (target, pname, params))
+GL_PROTO_END()
+
+GL_PROTO_BEGIN(TexImage2D, void, CORE_1_0)
+GL_PROTO_ARG_LIST(
+GL_PROTO_ARG(target, GLenum),
+GL_PROTO_ARG(level, GLint),
+GL_PROTO_ARG(internalformat, GLint),
+GL_PROTO_ARG(width, GLsizei),
+GL_PROTO_ARG(height, GLsizei),
+GL_PROTO_ARG(border, GLint),
+GL_PROTO_ARG(format, GLenum),
+GL_PROTO_ARG(type, GLenum),
+GL_PROTO_ARG(pixels, const GLvoid *))
+GL_PROTO_INVOKE(TexImage2D, void, (target, level, internalformat, width, height, border, format, type, pixels))
+GL_PROTO_END()
+
+GL_PROTO_BEGIN(TexSubImage2D, void, CORE_1_1)
+GL_PROTO_ARG_LIST(
+GL_PROTO_ARG(target, GLenum),
+GL_PROTO_ARG(level, GLint),
+GL_PROTO_ARG(xoffset, GLint),
+GL_PROTO_ARG(yoffset, GLint),
+GL_PROTO_ARG(width, GLsizei),
+GL_PROTO_ARG(height, GLsizei),
+GL_PROTO_ARG(format, GLenum),
+GL_PROTO_ARG(type, GLenum),
+GL_PROTO_ARG(UNUSED, GLuint),
+GL_PROTO_ARG(pixels, const GLvoid *))
+GL_PROTO_INVOKE(TexSubImage2D, void, (target, level, xoffset, yoffset, width, height, format, type, UNUSED, pixels))
+GL_PROTO_END()
+
+GL_PROTO_BEGIN(PixelStoref, void, CORE_1_0)
+GL_PROTO_ARG_LIST(
+GL_PROTO_ARG(pname, GLenum),
+GL_PROTO_ARG(param, GLfloat))
+GL_PROTO_INVOKE(PixelStoref, void, (pname, param))
+GL_PROTO_END()
+
+GL_PROTO_BEGIN(PixelStorei, void, CORE_1_0)
+GL_PROTO_ARG_LIST(
+GL_PROTO_ARG(pname, GLenum),
+GL_PROTO_ARG(param, GLint))
+GL_PROTO_INVOKE(PixelStorei, void, (pname, param))
+GL_PROTO_END()
+
+GL_PROTO_BEGIN(CreateShader, GLuint, CORE_2_0)
+GL_PROTO_ARG_LIST(
+GL_PROTO_ARG(type, GLenum))
+GL_PROTO_INVOKE(CreateShader, GLuint, (type))
+GL_PROTO_END()
+
+GL_PROTO_BEGIN(DeleteShader, void, CORE_2_0)
+GL_PROTO_ARG_LIST(
+GL_PROTO_ARG(program, GLuint))
+GL_PROTO_INVOKE(DeleteShader, void, (program))
+GL_PROTO_END()
+
+GL_PROTO_BEGIN(ShaderSource, void, CORE_2_0)
+GL_PROTO_ARG_LIST(
+GL_PROTO_ARG(shader, GLuint),
+GL_PROTO_ARG(count, GLsizei),
+GL_PROTO_ARG(string, const GLchar * const *),
+GL_PROTO_ARG(length, const GLint *))
+GL_PROTO_INVOKE(ShaderSource, void, (shader, count, string, length))
+GL_PROTO_END()
+
+GL_PROTO_BEGIN(CompileShader, void, CORE_2_0)
+GL_PROTO_ARG_LIST(
+GL_PROTO_ARG(shader, GLuint))
+GL_PROTO_INVOKE(CompileShader, void, (shader))
+GL_PROTO_END()
+
+GL_PROTO_BEGIN(GetShaderiv, void, CORE_2_0)
+GL_PROTO_ARG_LIST(
+GL_PROTO_ARG(shader, GLuint),
+GL_PROTO_ARG(pname, GLenum),
+GL_PROTO_ARG(params, GLint *))
+GL_PROTO_INVOKE(GetShaderiv, void, (shader, pname, params))
+GL_PROTO_END()
+
+GL_PROTO_BEGIN(GetShaderInfoLog, void, CORE_2_0)
+GL_PROTO_ARG_LIST(
+GL_PROTO_ARG(shader, GLuint),
+GL_PROTO_ARG(bufSize, GLsizei),
+GL_PROTO_ARG(length, GLsizei *),
+GL_PROTO_ARG(infoLog, GLchar *))
+GL_PROTO_INVOKE(GetShaderInfoLog, void, (shader, bufSize, length, infoLog))
+GL_PROTO_END()
+
+GL_PROTO_BEGIN(CreateProgram, GLuint, CORE_2_0)
+GL_PROTO_ARG_LIST()
+GL_PROTO_INVOKE(CreateProgram, GLuint, ())
+GL_PROTO_END()
+
+GL_PROTO_BEGIN(DeleteProgram, void, CORE_2_0)
+GL_PROTO_ARG_LIST(
+GL_PROTO_ARG(program, GLuint))
+GL_PROTO_INVOKE(DeleteProgram, void, (program))
+GL_PROTO_END()
+
+GL_PROTO_BEGIN(AttachShader, void, CORE_2_0)
+GL_PROTO_ARG_LIST(
+GL_PROTO_ARG(program, GLuint),
+GL_PROTO_ARG(shader, GLuint))
+GL_PROTO_INVOKE(AttachShader, void, (program, shader))
+GL_PROTO_END()
+
+GL_PROTO_BEGIN(LinkProgram, void, CORE_2_0)
+GL_PROTO_ARG_LIST(
+GL_PROTO_ARG(program, GLuint))
+GL_PROTO_INVOKE(LinkProgram, void, (program))
+GL_PROTO_END()
+
+GL_PROTO_BEGIN(UseProgram, void, CORE_2_0)
+GL_PROTO_ARG_LIST(
+GL_PROTO_ARG(program, GLuint))
+GL_PROTO_INVOKE(UseProgram, void, (program))
+GL_PROTO_END()
+
+GL_PROTO_BEGIN(GetProgramiv, void, CORE_2_0)
+GL_PROTO_ARG_LIST(
+GL_PROTO_ARG(program, GLuint),
+GL_PROTO_ARG(pname, GLenum),
+GL_PROTO_ARG(params, GLint *))
+GL_PROTO_INVOKE(GetProgramiv, void, (program, pname, params))
+GL_PROTO_END()
+
+GL_PROTO_BEGIN(GetProgramInfoLog, void, CORE_2_0)
+GL_PROTO_ARG_LIST(
+GL_PROTO_ARG(program, GLuint),
+GL_PROTO_ARG(bufSize, GLsizei),
+GL_PROTO_ARG(length, GLsizei *),
+GL_PROTO_ARG(infoLog, GLchar *))
+GL_PROTO_INVOKE(GetProgramInfoLog, void, (program, bufSize, length, infoLog))
+GL_PROTO_END()
+
+GL_PROTO_BEGIN(BindAttribLocation, void, CORE_2_0)
+GL_PROTO_ARG_LIST(
+GL_PROTO_ARG(program, GLuint),
+GL_PROTO_ARG(index, GLuint),
+GL_PROTO_ARG(name, const GLchar *))
+GL_PROTO_INVOKE(BindAttribLocation, void, (program, index, name))
+GL_PROTO_END()
+
+GL_PROTO_BEGIN(GetUniformLocation, GLint, CORE_2_0)
+GL_PROTO_ARG_LIST(
+GL_PROTO_ARG(program, GLuint),
+GL_PROTO_ARG(name, const GLchar *))
+GL_PROTO_INVOKE(GetUniformLocation, GLint, (program, name))
+GL_PROTO_END()
+
+GL_PROTO_BEGIN(Uniform1f, void, CORE_2_0)
+GL_PROTO_ARG_LIST(
+GL_PROTO_ARG(location, GLint),
+GL_PROTO_ARG(v0, GLfloat))
+GL_PROTO_INVOKE(Uniform1f, void, (location, v0))
+GL_PROTO_END()
+
+GL_PROTO_BEGIN(Uniform1fv, void, CORE_2_0)
+GL_PROTO_ARG_LIST(
+GL_PROTO_ARG(location, GLint),
+GL_PROTO_ARG(count, GLsizei),
+GL_PROTO_ARG(value, const GLfloat *))
+GL_PROTO_INVOKE(Uniform1fv, void, (location, count, value))
+GL_PROTO_END()
+
+GL_PROTO_BEGIN(Uniform1i, void, CORE_2_0)
+GL_PROTO_ARG_LIST(
+GL_PROTO_ARG(location, GLint),
+GL_PROTO_ARG(v0, GLint))
+GL_PROTO_INVOKE(Uniform1i, void, (location, v0))
+GL_PROTO_END()
+
+GL_PROTO_BEGIN(Uniform1iv, void, CORE_2_0)
+GL_PROTO_ARG_LIST(
+GL_PROTO_ARG(location, GLint),
+GL_PROTO_ARG(count, GLsizei),
+GL_PROTO_ARG(value, const GLint *))
+GL_PROTO_INVOKE(Uniform1iv, void, (location, count, value))
+GL_PROTO_END()
+
+GL_PROTO_BEGIN(Uniform2f, void, CORE_2_0)
+GL_PROTO_ARG_LIST(
+GL_PROTO_ARG(location, GLint),
+GL_PROTO_ARG(v0, GLfloat),
+GL_PROTO_ARG(v1, GLfloat))
+GL_PROTO_INVOKE(Uniform2f, void, (location, v0, v1))
+GL_PROTO_END()
+
+GL_PROTO_BEGIN(Uniform2fv, void, CORE_2_0)
+GL_PROTO_ARG_LIST(
+GL_PROTO_ARG(location, GLint),
+GL_PROTO_ARG(count, GLsizei),
+GL_PROTO_ARG(value, const GLfloat *))
+GL_PROTO_INVOKE(Uniform2fv, void, (location, count, value))
+GL_PROTO_END()
+
+GL_PROTO_BEGIN(Uniform2i, void, CORE_2_0)
+GL_PROTO_ARG_LIST(
+GL_PROTO_ARG(location, GLint),
+GL_PROTO_ARG(v0, GLint),
+GL_PROTO_ARG(v1, GLint))
+GL_PROTO_INVOKE(Uniform2i, void, (location, v0, v1))
+GL_PROTO_END()
+
+GL_PROTO_BEGIN(Uniform2iv, void, CORE_2_0)
+GL_PROTO_ARG_LIST(
+GL_PROTO_ARG(location, GLint),
+GL_PROTO_ARG(count, GLsizei),
+GL_PROTO_ARG(value, const GLint *))
+GL_PROTO_INVOKE(Uniform2iv, void, (location, count, value))
+GL_PROTO_END()
+
+GL_PROTO_BEGIN(Uniform3f, void, CORE_2_0)
+GL_PROTO_ARG_LIST(
+GL_PROTO_ARG(location, GLint),
+GL_PROTO_ARG(v0, GLfloat),
+GL_PROTO_ARG(v1, GLfloat),
+GL_PROTO_ARG(v2, GLfloat))
+GL_PROTO_INVOKE(Uniform3f, void, (location, v0, v1, v2))
+GL_PROTO_END()
+
+GL_PROTO_BEGIN(Uniform3fv, void, CORE_2_0)
+GL_PROTO_ARG_LIST(
+GL_PROTO_ARG(location, GLint),
+GL_PROTO_ARG(count, GLsizei),
+GL_PROTO_ARG(value, const GLfloat *))
+GL_PROTO_INVOKE(Uniform3fv, void, (location, count, value))
+GL_PROTO_END()
+
+GL_PROTO_BEGIN(Uniform3i, void, CORE_2_0)
+GL_PROTO_ARG_LIST(
+GL_PROTO_ARG(location, GLint),
+GL_PROTO_ARG(v0, GLint),
+GL_PROTO_ARG(v1, GLint),
+GL_PROTO_ARG(v2, GLint))
+GL_PROTO_INVOKE(Uniform3i, void, (location, v0, v1, v2))
+GL_PROTO_END()
+
+GL_PROTO_BEGIN(Uniform3iv, void, CORE_2_0)
+GL_PROTO_ARG_LIST(
+GL_PROTO_ARG(location, GLint),
+GL_PROTO_ARG(count, GLsizei),
+GL_PROTO_ARG(value, const GLint *))
+GL_PROTO_INVOKE(Uniform3iv, void, (location, count, value))
+GL_PROTO_END()
+
+GL_PROTO_BEGIN(Uniform4f, void, CORE_2_0)
+GL_PROTO_ARG_LIST(
+GL_PROTO_ARG(location, GLint),
+GL_PROTO_ARG(v0, GLfloat),
+GL_PROTO_ARG(v1, GLfloat),
+GL_PROTO_ARG(v2, GLfloat),
+GL_PROTO_ARG(v3, GLfloat))
+GL_PROTO_INVOKE(Uniform4f, void, (location, v0, v1, v2, v3))
+GL_PROTO_END()
+
+GL_PROTO_BEGIN(Uniform4fv, void, CORE_2_0)
+GL_PROTO_ARG_LIST(
+GL_PROTO_ARG(location, GLint),
+GL_PROTO_ARG(count, GLsizei),
+GL_PROTO_ARG(value, const GLfloat *))
+GL_PROTO_INVOKE(Uniform4fv, void, (location, count, value))
+GL_PROTO_END()
+
+GL_PROTO_BEGIN(Uniform4i, void, CORE_2_0)
+GL_PROTO_ARG_LIST(
+GL_PROTO_ARG(location, GLint),
+GL_PROTO_ARG(v0, GLint),
+GL_PROTO_ARG(v1, GLint),
+GL_PROTO_ARG(v2, GLint),
+GL_PROTO_ARG(v3, GLint))
+GL_PROTO_INVOKE(Uniform4i, void, (location, v0, v1, v2, v3))
+GL_PROTO_END()
+
+GL_PROTO_BEGIN(Uniform4iv, void, CORE_2_0)
+GL_PROTO_ARG_LIST(
+GL_PROTO_ARG(location, GLint),
+GL_PROTO_ARG(count, GLsizei),
+GL_PROTO_ARG(value, const GLint *))
+GL_PROTO_INVOKE(Uniform4iv, void, (location, count, value))
+GL_PROTO_END()
+
+GL_PROTO_BEGIN(UniformMatrix2fv, void, CORE_2_0)
+GL_PROTO_ARG_LIST(
+GL_PROTO_ARG(location, GLint),
+GL_PROTO_ARG(count, GLsizei),
+GL_PROTO_ARG(transpose, GLboolean),
+GL_PROTO_ARG(value, const GLfloat *))
+GL_PROTO_INVOKE(UniformMatrix2fv, void, (location, count, transpose, value))
+GL_PROTO_END()
+
+GL_PROTO_BEGIN(UniformMatrix3fv, void, CORE_2_0)
+GL_PROTO_ARG_LIST(
+GL_PROTO_ARG(location, GLint),
+GL_PROTO_ARG(count, GLsizei),
+GL_PROTO_ARG(transpose, GLboolean),
+GL_PROTO_ARG(value, const GLfloat *))
+GL_PROTO_INVOKE(UniformMatrix3fv, void, (location, count, transpose, value))
+GL_PROTO_END()
+
+GL_PROTO_BEGIN(UniformMatrix4fv, void, CORE_2_0)
+GL_PROTO_ARG_LIST(
+GL_PROTO_ARG(location, GLint),
+GL_PROTO_ARG(count, GLsizei),
+GL_PROTO_ARG(transpose, GLboolean),
+GL_PROTO_ARG(value, const GLfloat *))
+GL_PROTO_INVOKE(UniformMatrix4fv, void, (location, count, transpose, value))
+GL_PROTO_END()
+
+GL_PROTO_BEGIN(EGLImageTargetTexture2DOES, void, OES_EGL_image)
+GL_PROTO_ARG_LIST(
+GL_PROTO_ARG(target, GLenum),
+GL_PROTO_ARG(image, void *))
+GL_PROTO_INVOKE(EGLImageTargetTexture2DOES, void, (target, image))
+GL_PROTO_END()
+
+GL_PROTO_BEGIN(EGLImageTargetRenderbufferStorageOES, void, OES_EGL_image)
+GL_PROTO_ARG_LIST(
+GL_PROTO_ARG(target, GLenum),
+GL_PROTO_ARG(image, void *))
+GL_PROTO_INVOKE(EGLImageTargetRenderbufferStorageOES, void, (target, image))
+GL_PROTO_END()
+
+GL_DEFINE_EXTENSION(CORE_1_0)
+GL_DEFINE_EXTENSION(CORE_1_1)
+GL_DEFINE_EXTENSION(CORE_1_3)
+GL_DEFINE_EXTENSION(CORE_2_0)
+GL_DEFINE_EXTENSION(OES_EGL_image)
+
+#undef EGL_PROTO_BEGIN
+#undef EGL_PROTO_BEGIN_I
+#undef EGL_PROTO_ARG_LIST
+#undef EGL_PROTO_ARG
+#undef EGL_PROTO_INVOKE
+#undef EGL_PROTO_INVOKE_I
+#undef EGL_PROTO_END
+#undef EGL_DEFINE_EXTENSION
+#undef EGL_DEFINE_EXTENSION_I
+
+#undef GL_PROTO_BEGIN
+#undef GL_PROTO_BEGIN_I
+#undef GL_PROTO_ARG_LIST
+#undef GL_PROTO_ARG
+#undef GL_PROTO_INVOKE
+#undef GL_PROTO_INVOKE_I
+#undef GL_PROTO_END
+#undef GL_DEFINE_EXTENSION
+#undef GL_DEFINE_EXTENSION_I
+
+#undef GL_PROTO_GEN_CONCAT5
+#undef GL_PROTO_GEN_CONCAT5_I
+#undef GL_PROTO_GEN_CONCAT4
+#undef GL_PROTO_GEN_CONCAT4_I
+#undef GL_PROTO_GEN_CONCAT3
+#undef GL_PROTO_GEN_CONCAT3_I
+#undef GL_PROTO_GEN_CONCAT2
+#undef GL_PROTO_GEN_CONCAT2_I
+#undef GL_PROTO_GEN_CONCAT
+#undef GL_PROTO_GEN_STRING
+#undef GL_PROTO_GEN_STRING_I
diff -Nru gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/glibcompat.h gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/glibcompat.h
--- gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/glibcompat.h	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/glibcompat.h	2015-07-15 12:47:43.000000000 +0000
@@ -33,132 +33,6 @@
     old_api old_args;                                           \
 }
 
-#if !GLIB_CHECK_VERSION(2,27,2)
-static inline void
-g_list_free_full(GList *list, GDestroyNotify free_func)
-{
-    g_list_foreach(list, (GFunc)free_func, NULL);
-    g_list_free(list);
-}
-#endif
-
-#if !GLIB_CHECK_VERSION(2,28,0)
-static inline void
-g_clear_object_inline(volatile GObject **object_ptr)
-{
-    gpointer * const ptr = (gpointer)object_ptr;
-    gpointer old;
-
-    do {
-        old = g_atomic_pointer_get(ptr);
-    } while G_UNLIKELY(!g_atomic_pointer_compare_and_exchange(ptr, old, NULL));
-
-    if (old)
-        g_object_unref(old);
-}
-#undef  g_clear_object
-#define g_clear_object(obj) g_clear_object_inline((volatile GObject **)(obj))
-#endif
-
-#if !GLIB_CHECK_VERSION(2,31,2)
-typedef GStaticMutex GCompatMutex;
-G_COMPAT_DEFINE(g_compat_mutex_init, (GCompatMutex *mutex),
-                g_static_mutex_init, (mutex))
-G_COMPAT_DEFINE(g_compat_mutex_clear, (GCompatMutex *mutex),
-                g_static_mutex_free, (mutex))
-G_COMPAT_DEFINE(g_compat_mutex_lock, (GCompatMutex *mutex),
-                g_static_mutex_lock, (mutex))
-G_COMPAT_DEFINE(g_compat_mutex_unlock, (GCompatMutex *mutex),
-                g_static_mutex_unlock, (mutex))
-
-typedef GStaticRecMutex GCompatRecMutex;
-G_COMPAT_DEFINE(g_compat_rec_mutex_init, (GCompatRecMutex *mutex),
-                g_static_rec_mutex_init, (mutex))
-G_COMPAT_DEFINE(g_compat_rec_mutex_clear, (GCompatRecMutex *mutex),
-                g_static_rec_mutex_free, (mutex))
-G_COMPAT_DEFINE(g_compat_rec_mutex_lock, (GCompatRecMutex *mutex),
-                g_static_rec_mutex_lock, (mutex))
-G_COMPAT_DEFINE(g_compat_rec_mutex_unlock, (GCompatRecMutex *mutex),
-                g_static_rec_mutex_unlock, (mutex))
-
-typedef GCond *GCompatCond;
-G_COMPAT_DEFINE(g_compat_cond_init, (GCompatCond *cond),
-                *cond = g_cond_new, ())
-G_COMPAT_DEFINE(g_compat_cond_clear, (GCompatCond *cond),
-                if (*cond) g_cond_free, (*cond))
-G_COMPAT_DEFINE(g_compat_cond_signal, (GCompatCond *cond),
-                g_cond_signal, (*cond))
-G_COMPAT_DEFINE(g_compat_cond_broadcast, (GCompatCond *cond),
-                g_cond_broadcast, (*cond))
-G_COMPAT_DEFINE(g_compat_cond_wait, (GCompatCond *cond, GCompatMutex *mutex),
-                g_cond_wait, (*cond, g_static_mutex_get_mutex(mutex)))
-
-static inline gboolean
-g_cond_wait_until(GCompatCond *cond, GStaticMutex *mutex, gint64 end_time)
-{
-    gint64 diff_time;
-    GTimeVal timeout;
-
-    diff_time = end_time - g_get_monotonic_time();
-    g_get_current_time(&timeout);
-    g_time_val_add(&timeout, diff_time > 0 ? diff_time : 0);
-    return g_cond_timed_wait(*cond, g_static_mutex_get_mutex(mutex), &timeout);
-}
-
-#define GMutex                          GCompatMutex
-#undef  g_mutex_init
-#define g_mutex_init(mutex)             g_compat_mutex_init(mutex)
-#undef  g_mutex_clear
-#define g_mutex_clear(mutex)            g_compat_mutex_clear(mutex)
-#undef  g_mutex_lock
-#define g_mutex_lock(mutex)             g_compat_mutex_lock(mutex)
-#undef  g_mutex_unlock
-#define g_mutex_unlock(mutex)           g_compat_mutex_unlock(mutex)
-
-#define GRecMutex                       GCompatRecMutex
-#undef  g_rec_mutex_init
-#define g_rec_mutex_init(mutex)         g_compat_rec_mutex_init(mutex)
-#undef  g_rec_mutex_clear
-#define g_rec_mutex_clear(mutex)        g_compat_rec_mutex_clear(mutex)
-#undef  g_rec_mutex_lock
-#define g_rec_mutex_lock(mutex)         g_compat_rec_mutex_lock(mutex)
-#undef  g_rec_mutex_unlock
-#define g_rec_mutex_unlock(mutex)       g_compat_rec_mutex_unlock(mutex)
-
-#define GCond                           GCompatCond
-#undef  g_cond_init
-#define g_cond_init(cond)               g_compat_cond_init(cond)
-#undef  g_cond_clear
-#define g_cond_clear(cond)              g_compat_cond_clear(cond)
-#undef  g_cond_signal
-#define g_cond_signal(cond)             g_compat_cond_signal(cond)
-#undef  g_cond_wait
-#define g_cond_wait(cond, mutex)        g_compat_cond_wait(cond, mutex)
-
-#undef  g_thread_try_new
-#define g_thread_try_new(name, func, data, error) \
-    g_compat_thread_try_new(name, func, data, error)
-
-static inline GThread *
-g_compat_thread_try_new(const gchar *name, GThreadFunc func, gpointer data,
-    GError **error)
-{
-    return g_thread_create(func, data, TRUE, error);
-}
-#endif
-
-#if !GLIB_CHECK_VERSION(2,31,18)
-static inline gpointer
-g_async_queue_timeout_pop(GAsyncQueue *queue, guint64 timeout)
-{
-    GTimeVal end_time;
-
-    g_get_current_time(&end_time);
-    g_time_val_add(&end_time, timeout);
-    return g_async_queue_timed_pop(queue, &end_time);
-}
-#endif
-
 #undef G_COMPAT_DEFINE
 
 #endif /* GLIB_COMPAT_H */
diff -Nru gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstcompat.h gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstcompat.h
--- gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstcompat.h	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstcompat.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,351 +0,0 @@
-/*
- *  gstcompat.h - Compatibility glue for GStreamer
- *
- *  Copyright (C) 2013 Intel Corporation
- *    Author: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public License
- *  as published by the Free Software Foundation; either version 2.1
- *  of the License, or (at your option) any later version.
- *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free
- *  Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- *  Boston, MA 02110-1301 USA
- */
-
-#ifndef GST_COMPAT_H
-#define GST_COMPAT_H
-
-#include <gst/gst.h>
-
-/* ------------------------------------------------------------------------ */
-/* --- GStreamer >= 1.0                                                 --- */
-/* ------------------------------------------------------------------------ */
-
-#if GST_CHECK_VERSION(1,0,0)
-#include <gst/video/gstvideometa.h>
-
-/* GstStructure */
-#undef  gst_structure_get_fourcc
-#define gst_structure_get_fourcc(structure, fieldname, value) \
-    gst_compat_structure_get_fourcc(structure, fieldname, value)
-
-static inline gboolean
-gst_compat_structure_get_fourcc(const GstStructure *structure,
-    const gchar *fieldname, guint32 *value)
-{
-    const gchar *s = gst_structure_get_string(structure, fieldname);
-
-    if (!s || strlen(s) != 4)
-        return FALSE;
-
-    *value = GST_MAKE_FOURCC(s[0], s[1], s[2], s[3]);
-    return TRUE;
-}
-
-/* GstTypeFind */
-#undef  GstTypeFindPeekFunction
-#define GstTypeFindPeekFunction         GstCompatTypeFindPeekFunction
-#undef  GstTypeFindSuggestFunction
-#define GstTypeFindSuggestFunction      GstCompatTypeFindSuggestFunction
-
-typedef const guint8 *(*GstCompatTypeFindPeekFunction)(gpointer, gint64, guint);
-typedef void (*GstCompatTypeFindSuggestFunction)(gpointer, guint, GstCaps *);
-
-/* GstPad */
-#define GST_PAD_CHAIN_FUNCTION_ARGS \
-    GstPad *pad, GstObject *parent, GstBuffer *buffer
-#define GST_PAD_EVENT_FUNCTION_ARGS \
-    GstPad *pad, GstObject *parent, GstEvent *event
-#define GST_PAD_QUERY_FUNCTION_ARGS \
-    GstPad *pad, GstObject *parent, GstQuery *query
-#define GST_PAD_QUERY_FUNCTION_CALL(func, pad, parent, query) \
-    (func)(pad, parent, query)
-
-/* Misc helpers */
-#define GST_MAKE_FORMAT_STRING(FORMAT) \
-    "format=(string)" G_STRINGIFY(FORMAT)
-
-/* ------------------------------------------------------------------------ */
-/* --- GStreamer = 0.10                                                 --- */
-/* ------------------------------------------------------------------------ */
-
-#else
-
-/* GstMemory */
-typedef enum {
-    GST_MEMORY_FLAG_READONLY = GST_MINI_OBJECT_FLAG_READONLY
-} GstMemoryFlags;
-
-typedef enum {
-    GST_BUFFER_COPY_META        = GST_BUFFER_COPY_QDATA,
-    GST_BUFFER_COPY_MEMORY      = 0,
-} GstBufferCopyFlags1_0;
-
-typedef enum {
-    GST_MAP_READ        = 1 << 0,
-    GST_MAP_WRITE       = 1 << 1
-} GstMapFlags;
-
-typedef struct {
-    GstMapFlags         flags;
-    guint8             *data;
-    gsize               size;
-} GstMapInfo;
-
-/* GstBuffer */
-#undef  gst_buffer_new_wrapped
-#define gst_buffer_new_wrapped(data, size) \
-    gst_compat_buffer_new_wrapped_full(0, data, size, 0, size, data, g_free)
-#undef  gst_buffer_new_wrapped_full
-#define gst_buffer_new_wrapped_full(flags, data, maxsize, ofs, size, ud, udd) \
-    gst_compat_buffer_new_wrapped_full(flags, data, maxsize, ofs, size, ud, udd)
-#undef  gst_buffer_new_allocate
-#define gst_buffer_new_allocate(allocator, size, params) \
-    gst_compat_buffer_new_allocate((allocator), (size), (params))
-#undef  gst_buffer_get_size
-#define gst_buffer_get_size(buffer)     gst_compat_buffer_get_size(buffer)
-#undef  gst_buffer_map
-#define gst_buffer_map(buffer, mip, f)  gst_compat_buffer_map(buffer, mip, f)
-#undef  gst_buffer_unmap
-#define gst_buffer_unmap(buffer, mip)   gst_compat_buffer_unmap(buffer, mip)
-#undef  gst_buffer_extract
-#define gst_buffer_extract(buffer, offset, dest, size) \
-    gst_compat_buffer_extract(buffer, offset, dest, size)
-#undef  gst_buffer_fill
-#define gst_buffer_fill(buffer, offset, src, size) \
-    gst_compat_buffer_fill((buffer), (offset), (src), (size))
-#undef  gst_buffer_copy_into
-#define gst_buffer_copy_into(dest, src, flags, offset, size) \
-    gst_compat_buffer_copy_into(dest, src, flags, offset, size)
-
-static inline GstBuffer *
-gst_compat_buffer_new_wrapped_full(GstMemoryFlags flags, gpointer data,
-    gsize maxsize, gsize offset, gsize size, gpointer user_data,
-    GDestroyNotify notify)
-{
-    GstBuffer *buffer;
-
-    /* XXX: unsupported */
-    g_return_val_if_fail(maxsize >= size, NULL);
-
-    buffer = gst_buffer_new();
-    if (!buffer)
-        return NULL;
-
-    GST_BUFFER_DATA(buffer) = data + offset;
-    GST_BUFFER_SIZE(buffer) = size;
-
-    if (notify)
-        gst_mini_object_weak_ref(GST_MINI_OBJECT_CAST(buffer),
-            (GstMiniObjectWeakNotify)notify, user_data);
-    return buffer;
-}
-
-static inline GstBuffer *
-gst_compat_buffer_new_allocate(gpointer allocator, gsize size, gpointer params)
-{
-    /* XXX: unsupported */
-    g_return_val_if_fail(allocator == NULL, NULL);
-    g_return_val_if_fail(params == NULL, NULL);
-
-    return gst_buffer_new_and_alloc(size);
-}
-
-static inline gsize
-gst_compat_buffer_get_size(GstBuffer *buffer)
-{
-    return GST_BUFFER_SIZE(buffer);
-}
-
-static inline gboolean
-gst_compat_buffer_map(GstBuffer *buffer, GstMapInfo *mip, GstMapFlags flags)
-{
-    mip->flags = flags;
-    mip->data  = GST_BUFFER_DATA(buffer);
-    mip->size  = GST_BUFFER_SIZE(buffer);
-    return TRUE;
-}
-
-static inline void
-gst_compat_buffer_unmap(GstBuffer *buffer, GstMapInfo *mip)
-{
-}
-
-static inline gsize
-gst_compat_buffer_extract(GstBuffer *buffer, gsize offset, gpointer dest,
-    gsize size)
-{
-    gsize esize;
-
-    if (!buffer || !dest || offset >= GST_BUFFER_SIZE(buffer))
-        return 0;
-
-    esize = MIN(size, GST_BUFFER_SIZE(buffer) - offset);
-    memcpy(dest, GST_BUFFER_DATA(buffer) + offset, esize);
-    return esize;
-}
-
-static inline gsize
-gst_compat_buffer_fill(GstBuffer *buffer, gsize offset, gconstpointer src,
-    gsize size)
-{
-    gsize fsize;
-
-    if (!buffer || !src || offset >= GST_BUFFER_SIZE(buffer))
-        return 0;
-
-    fsize = MIN(size, GST_BUFFER_SIZE(buffer) - offset);
-    memcpy(GST_BUFFER_DATA(buffer) + offset, src, fsize);
-    return fsize;
-}
-
-static inline void
-gst_compat_buffer_copy_into(GstBuffer *dest, GstBuffer *src,
-    GstBufferCopyFlags flags, gsize offset, gsize size)
-{
-    g_return_if_fail(offset == 0);
-    g_return_if_fail(size == (gsize)-1);
-
-    gst_buffer_copy_metadata(dest, src, flags);
-}
-
-/* GstAdapter */
-#include <gst/base/gstadapter.h>
-
-#undef  gst_adapter_map
-#define gst_adapter_map(adapter, size)  gst_compat_adapter_map(adapter, size)
-#undef  gst_adapter_unmap
-#define gst_adapter_unmap(adapter)      gst_compat_adapter_unmap(adapter)
-
-static inline gconstpointer
-gst_compat_adapter_map(GstAdapter *adapter, gsize size)
-{
-    return gst_adapter_peek(adapter, size);
-}
-
-static inline void
-gst_compat_adapter_unmap(GstAdapter *adapter)
-{
-}
-
-/* GstCaps */
-#undef  gst_caps_merge
-#define gst_caps_merge(caps1, caps2)    gst_compat_caps_merge(caps1, caps2)
-#undef  gst_caps_merge_structure
-#define gst_caps_merge_structure(caps, structure) \
-    gst_compat_caps_merge_structure(caps, structure)
-
-static inline GstCaps *
-gst_compat_caps_merge(GstCaps *caps1, GstCaps *caps2)
-{
-    (gst_caps_merge)(caps1, caps2);
-    return caps1;
-}
-
-static inline GstCaps *
-gst_compat_caps_merge_structure(GstCaps *caps, GstStructure *structure)
-{
-    (gst_caps_merge_structure)(caps, structure);
-    return caps;
-}
-
-/* GstVideoOverlayComposition */
-#include <gst/video/video-overlay-composition.h>
-
-#undef  gst_video_overlay_rectangle_get_pixels_unscaled_raw
-#define gst_video_overlay_rectangle_get_pixels_unscaled_raw(rect, flags) \
-    gst_compat_video_overlay_rectangle_get_pixels_unscaled_raw(rect, flags)
-
-#ifndef HAVE_GST_VIDEO_OVERLAY_HWCAPS
-#define gst_video_overlay_rectangle_get_flags(rect) (0)
-#define gst_video_overlay_rectangle_get_global_alpha(rect) (1.0f)
-#endif
-
-static inline GstBuffer *
-gst_compat_video_overlay_rectangle_get_pixels_unscaled_raw(
-    GstVideoOverlayRectangle *rect, GstVideoOverlayFormatFlags flags)
-{
-    guint width, height, stride;
-
-    /* Try to retrieve the original buffer that was passed to
-       gst_video_overlay_rectangle_new_argb(). This will only work if
-       there was no previous user that required pixels with non native
-       alpha type */
-    return gst_video_overlay_rectangle_get_pixels_unscaled_argb(rect,
-        &width, &height, &stride, flags);
-}
-
-typedef enum {
-    GST_VIDEO_BUFFER_FLAG_TFF           = GST_VIDEO_BUFFER_TFF,
-    GST_VIDEO_BUFFER_FLAG_RFF           = GST_VIDEO_BUFFER_RFF,
-    GST_VIDEO_BUFFER_FLAG_ONEFIELD      = GST_VIDEO_BUFFER_ONEFIELD
-} GstVideoBufferFlags;
-
-/* GstPad */
-#undef  GST_FLOW_EOS
-#define GST_FLOW_EOS GST_FLOW_UNEXPECTED
-#undef  GST_FLOW_FLUSHING
-#define GST_FLOW_FLUSHING GST_FLOW_WRONG_STATE
-
-#define GST_PAD_CHAIN_FUNCTION_ARGS \
-    GstPad *pad, GstBuffer *buffer
-#define GST_PAD_EVENT_FUNCTION_ARGS \
-    GstPad *pad, GstEvent *event
-
-static inline gboolean
-gst_compat_pad_start_task(GstPad *pad, GstTaskFunction func, gpointer user_data,
-    GDestroyNotify notify)
-{
-    g_return_val_if_fail(notify == NULL, FALSE);
-
-    return gst_pad_start_task(pad, func, user_data);
-}
-
-#undef  gst_pad_start_task
-#define gst_pad_start_task(pad, func, user_data, notify) \
-    gst_compat_pad_start_task(pad, func, user_data, notify)
-
-/* GstElement */
-#undef  GST_ELEMENT_FLAG_SINK
-#define GST_ELEMENT_FLAG_SINK GST_ELEMENT_IS_SINK
-#undef  gst_element_class_set_static_metadata
-#define gst_element_class_set_static_metadata(klass, name, path, desc, author) \
-    gst_compat_element_class_set_static_metadata(klass, name, path, desc, author)
-
-static inline void
-gst_compat_element_class_set_static_metadata(GstElementClass *klass,
-    const gchar *name, const char *path, const gchar *desc, const gchar *author)
-{
-    gst_element_class_set_details_simple(klass, name, path, desc, author);
-}
-
-/* GstTypeFind */
-#undef  GstTypeFindPeekFunction
-#define GstTypeFindPeekFunction         GstCompatTypeFindPeekFunction
-#undef  GstTypeFindSuggestFunction
-#define GstTypeFindSuggestFunction      GstCompatTypeFindSuggestFunction
-
-typedef guint8 *(*GstCompatTypeFindPeekFunction)(gpointer, gint64, guint);
-typedef void (*GstCompatTypeFindSuggestFunction)(gpointer, guint, const GstCaps *);
-
-/* GstQuery */
-#define GST_PAD_QUERY_FUNCTION_ARGS \
-    GstPad *pad, GstQuery *query
-#define GST_PAD_QUERY_FUNCTION_CALL(func, pad, parent, query) \
-    (func)(pad, query)
-
-/* Misc helpers */
-#define GST_MAKE_FORMAT_STRING(FORMAT) \
-    "format=(fourcc)" G_STRINGIFY(FORMAT)
-
-#endif
-
-#endif /* GST_COMPAT_H */
diff -Nru gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapibufferproxy.c gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapibufferproxy.c
--- gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapibufferproxy.c	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapibufferproxy.c	2015-07-15 12:47:43.000000000 +0000
@@ -21,7 +21,6 @@
  */
 
 #include "sysdeps.h"
-#include <va/va_drmcommon.h>
 #include "gstvaapicompat.h"
 #include "gstvaapibufferproxy.h"
 #include "gstvaapibufferproxy_priv.h"
@@ -42,12 +41,14 @@
   guint va_type;
 
   switch (type) {
+#if VA_CHECK_VERSION(0,36,0)
     case GST_VAAPI_BUFFER_MEMORY_TYPE_DMA_BUF:
       va_type = VA_SURFACE_ATTRIB_MEM_TYPE_DRM_PRIME;
       break;
     case GST_VAAPI_BUFFER_MEMORY_TYPE_GEM_BUF:
       va_type = VA_SURFACE_ATTRIB_MEM_TYPE_KERNEL_DRM;
       break;
+#endif
     default:
       va_type = 0;
       break;
@@ -61,12 +62,14 @@
   guint type;
 
   switch (va_type) {
+#if VA_CHECK_VERSION(0,36,0)
     case VA_SURFACE_ATTRIB_MEM_TYPE_DRM_PRIME:
       type = GST_VAAPI_BUFFER_MEMORY_TYPE_DMA_BUF;
       break;
     case VA_SURFACE_ATTRIB_MEM_TYPE_KERNEL_DRM:
       type = GST_VAAPI_BUFFER_MEMORY_TYPE_GEM_BUF;
       break;
+#endif
     default:
       type = 0;
       break;
@@ -77,6 +80,7 @@
 static gboolean
 gst_vaapi_buffer_proxy_acquire_handle (GstVaapiBufferProxy * proxy)
 {
+#if VA_CHECK_VERSION (0,36,0)
   const guint mem_type = proxy->va_info.mem_type;
   VAStatus va_status;
 
@@ -95,11 +99,15 @@
   if (proxy->va_info.mem_type != mem_type)
     return FALSE;
   return TRUE;
+#else
+  return FALSE;
+#endif
 }
 
 static gboolean
 gst_vaapi_buffer_proxy_release_handle (GstVaapiBufferProxy * proxy)
 {
+#if VA_CHECK_VERSION (0,36,0)
   VAStatus va_status;
 
   if (!proxy->va_info.handle)
@@ -115,6 +123,9 @@
   if (!vaapi_check_status (va_status, "vaReleaseBufferHandle()"))
     return FALSE;
   return TRUE;
+#else
+  return FALSE;
+#endif
 }
 
 static void
@@ -143,6 +154,7 @@
 gst_vaapi_buffer_proxy_new (guintptr handle, guint type, gsize size,
     GDestroyNotify destroy_func, gpointer user_data)
 {
+#if VA_CHECK_VERSION (0,36,0)
   GstVaapiBufferProxy *proxy;
 
   g_return_val_if_fail (handle != 0, NULL);
@@ -171,12 +183,16 @@
   GST_ERROR ("unsupported buffer type (%d)", proxy->type);
   gst_vaapi_buffer_proxy_unref_internal (proxy);
   return NULL;
+#else
+  return NULL;
+#endif
 }
 
 GstVaapiBufferProxy *
 gst_vaapi_buffer_proxy_new_from_object (GstVaapiObject * object,
     VABufferID buf_id, guint type, GDestroyNotify destroy_func, gpointer data)
 {
+#if VA_CHECK_VERSION (0,36,0)
   GstVaapiBufferProxy *proxy;
 
   g_return_val_if_fail (object != NULL, NULL);
@@ -208,6 +224,9 @@
   GST_ERROR ("failed to acquire the underlying VA buffer handle");
   gst_vaapi_buffer_proxy_unref_internal (proxy);
   return NULL;
+#else
+  return NULL;
+#endif
 }
 
 /**
@@ -286,9 +305,13 @@
 guintptr
 gst_vaapi_buffer_proxy_get_handle (GstVaapiBufferProxy * proxy)
 {
-  g_return_val_if_fail (proxy != NULL, NULL);
+  g_return_val_if_fail (proxy != NULL, 0);
 
+#if VA_CHECK_VERSION (0,36,0)
   return GST_VAAPI_BUFFER_PROXY_HANDLE (proxy);
+#else
+  return 0;
+#endif
 }
 
 /**
@@ -304,5 +327,9 @@
 {
   g_return_val_if_fail (proxy != NULL, 0);
 
+#if VA_CHECK_VERSION (0,36,0)
   return GST_VAAPI_BUFFER_PROXY_SIZE (proxy);
+#else
+  return 0;
+#endif
 }
diff -Nru gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapibufferproxy_priv.h gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapibufferproxy_priv.h
--- gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapibufferproxy_priv.h	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapibufferproxy_priv.h	2015-07-15 12:47:43.000000000 +0000
@@ -68,7 +68,9 @@
   gpointer              destroy_data;
   guint                 type;
   VABufferID            va_buf;
+#if VA_CHECK_VERSION (0,36,0)
   VABufferInfo          va_info;
+#endif
 };
 
 G_GNUC_INTERNAL
diff -Nru gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapicompat.h gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapicompat.h
--- gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapicompat.h	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapicompat.h	2015-07-15 12:47:43.000000000 +0000
@@ -42,4 +42,12 @@
 # include <va/va_compat.h>
 #endif
 
+#if VA_CHECK_VERSION(0,36,0)
+#include <va/va_drmcommon.h>
+#endif
+
+#ifdef HAVE_VA_VA_DEC_HEVC_H
+# include <va/va_dec_hevc.h>
+#endif
+
 #endif /* GST_VAAPI_COMPAT_H */
diff -Nru gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapicontext.c gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapicontext.c
--- gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapicontext.c	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapicontext.c	2015-07-15 12:47:43.000000000 +0000
@@ -218,19 +218,20 @@
       guint va_rate_control;
 
       /* Rate control */
-      attrib->type = VAConfigAttribRateControl;
-      if (!context_get_attribute (context, attrib->type, &value))
-        goto cleanup;
-
       va_rate_control = from_GstVaapiRateControl (config->rc_mode);
-      if ((value & va_rate_control) != va_rate_control) {
-        GST_ERROR ("unsupported %s rate control",
-            string_of_VARateControl (va_rate_control));
-        goto cleanup;
-      }
-      attrib->value = va_rate_control;
-      attrib++;
+      if (va_rate_control != VA_RC_NONE) {
+        attrib->type = VAConfigAttribRateControl;
+        if (!context_get_attribute (context, attrib->type, &value))
+          goto cleanup;
 
+        if ((value & va_rate_control) != va_rate_control) {
+          GST_ERROR ("unsupported %s rate control",
+              string_of_VARateControl (va_rate_control));
+          goto cleanup;
+        }
+        attrib->value = va_rate_control;
+        attrib++;
+      }
       /* Packed headers */
       if (config->packed_headers) {
         attrib->type = VAConfigAttribEncPackedHeaders;
@@ -245,6 +246,23 @@
         attrib->value = config->packed_headers;
         attrib++;
       }
+#if VA_CHECK_VERSION(0,37,0)
+      if (cip->profile == GST_VAAPI_PROFILE_JPEG_BASELINE) {
+        VAConfigAttribValEncJPEG jpeg_attrib_val;
+        /* JPEG Encoding Attribute */
+        attrib->type = VAConfigAttribEncJPEG;
+        if (!context_get_attribute (context, attrib->type, &value))
+          goto cleanup;
+        jpeg_attrib_val.value = attrib->value;
+        /* Set JPEG profile attribs */
+        jpeg_attrib_val.bits.arithmatic_coding_mode = 0;
+        jpeg_attrib_val.bits.progressive_dct_mode = 0;
+        jpeg_attrib_val.bits.non_interleaved_mode = 1;
+        jpeg_attrib_val.bits.differential_mode = 0;
+        attrib->value = jpeg_attrib_val.value;
+        attrib++;
+      }
+#endif
       break;
     }
 #endif
diff -Nru gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapicontext_overlay.c gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapicontext_overlay.c
--- gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapicontext_overlay.c	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapicontext_overlay.c	2015-07-15 12:47:43.000000000 +0000
@@ -198,7 +198,6 @@
   buffer = gst_video_overlay_rectangle_get_pixels_unscaled_raw (rect, flags);
   if (!buffer)
     return FALSE;
-#if GST_CHECK_VERSION(1,0,0)
   {
     const guint n_blocks = gst_buffer_n_memory (buffer);
     gsize ofs;
@@ -217,10 +216,6 @@
         return FALSE;
     }
   }
-#else
-  if (GST_BUFFER_DATA (overlay->rect_buffer) != GST_BUFFER_DATA (buffer))
-    return FALSE;
-#endif
   return TRUE;
 }
 
@@ -251,11 +246,9 @@
 overlay_rectangle_update_global_alpha (GstVaapiOverlayRectangle * overlay,
     GstVideoOverlayRectangle * rect)
 {
-#ifdef HAVE_GST_VIDEO_OVERLAY_HWCAPS
   const guint flags = gst_video_overlay_rectangle_get_flags (rect);
   if (!(flags & GST_VIDEO_OVERLAY_FORMAT_FLAG_GLOBAL_ALPHA))
     return TRUE;
-#endif
   return gst_vaapi_subpicture_set_global_alpha (overlay->subpicture,
       gst_video_overlay_rectangle_get_global_alpha (rect));
 }
diff -Nru gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapidecoder.c gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapidecoder.c
--- gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapidecoder.c	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapidecoder.c	2015-07-15 12:47:43.000000000 +0000
@@ -241,7 +241,7 @@
 
   /* Drop frame if there is no slice data unit in there */
   if (G_UNLIKELY (frame->units->len == 0))
-    return GST_VAAPI_DECODER_STATUS_DROP_FRAME;
+    return (GstVaapiDecoderStatus) GST_VAAPI_DECODER_STATUS_DROP_FRAME;
   return GST_VAAPI_DECODER_STATUS_SUCCESS;
 }
 
@@ -816,21 +816,6 @@
   if (!out_frame)
     return GST_VAAPI_DECODER_STATUS_ERROR_NO_DATA;
 
-#if !GST_CHECK_VERSION(1,0,0)
-  if (!GST_VIDEO_CODEC_FRAME_IS_DECODE_ONLY (out_frame)) {
-    const guint flags = GST_VAAPI_SURFACE_PROXY_FLAGS (out_frame->user_data);
-    guint out_flags = 0;
-
-    if (flags & GST_VAAPI_SURFACE_PROXY_FLAG_TFF)
-      out_flags |= GST_VIDEO_CODEC_FRAME_FLAG_TFF;
-    if (flags & GST_VAAPI_SURFACE_PROXY_FLAG_RFF)
-      out_flags |= GST_VIDEO_CODEC_FRAME_FLAG_RFF;
-    if (flags & GST_VAAPI_SURFACE_PROXY_FLAG_ONEFIELD)
-      out_flags |= GST_VIDEO_CODEC_FRAME_FLAG_ONEFIELD;
-    GST_VIDEO_CODEC_FRAME_FLAG_SET (out_frame, out_flags);
-  }
-#endif
-
   *out_frame_ptr = out_frame;
   return GST_VAAPI_DECODER_STATUS_SUCCESS;
 }
@@ -908,8 +893,9 @@
       return "interleaved";
     case GST_VIDEO_INTERLACE_MODE_MIXED:
       return "mixed";
+    default:
+      return "<unknown>";
   }
-  return "<unknown>";
 }
 
 void
diff -Nru gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapidecoder.h gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapidecoder.h
--- gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapidecoder.h	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapidecoder.h	2015-07-15 12:47:43.000000000 +0000
@@ -129,6 +129,9 @@
 GstVaapiDecoderStatus
 gst_vaapi_decoder_flush (GstVaapiDecoder * decoder);
 
+GstVaapiDecoderStatus
+gst_vaapi_decoder_check_status (GstVaapiDecoder * decoder);
+
 G_END_DECLS
 
 #endif /* GST_VAAPI_DECODER_H */
diff -Nru gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapidecoder_h264.c gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapidecoder_h264.c
--- gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapidecoder_h264.c	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapidecoder_h264.c	2015-07-15 12:47:43.000000000 +0000
@@ -160,6 +160,9 @@
  *   access unit (AU)
  * @GST_VAAPI_PICTURE_FLAG_AU_END: flag that marks the end of an
  *   access unit (AU)
+ * @GST_VAAPI_PICTURE_FLAG_GHOST: flag that specifies a "non-existing"
+ *   picture, without any viable GstVideoCodecFrame associated to it.
+ *   i.e. a dummy picture with some valid contents
  * @GST_VAAPI_PICTURE_FLAG_SHORT_TERM_REFERENCE: flag that specifies
  *     "used for short-term reference"
  * @GST_VAAPI_PICTURE_FLAG_LONG_TERM_REFERENCE: flag that specifies
@@ -174,6 +177,7 @@
     GST_VAAPI_PICTURE_FLAG_ANCHOR       = (GST_VAAPI_PICTURE_FLAG_LAST << 3),
     GST_VAAPI_PICTURE_FLAG_AU_START     = (GST_VAAPI_PICTURE_FLAG_LAST << 4),
     GST_VAAPI_PICTURE_FLAG_AU_END       = (GST_VAAPI_PICTURE_FLAG_LAST << 5),
+    GST_VAAPI_PICTURE_FLAG_GHOST        = (GST_VAAPI_PICTURE_FLAG_LAST << 6),
 
     GST_VAAPI_PICTURE_FLAG_SHORT_TERM_REFERENCE = (
         GST_VAAPI_PICTURE_FLAG_REFERENCE),
@@ -238,6 +242,7 @@
     if (!gst_vaapi_picture_create(GST_VAAPI_PICTURE(picture), args))
         return FALSE;
 
+    picture->structure          = picture->base.structure;
     picture->field_poc[0]       = G_MAXINT32;
     picture->field_poc[1]       = G_MAXINT32;
     picture->output_needed      = FALSE;
@@ -281,6 +286,14 @@
     return (GstVaapiPictureH264 *)gst_vaapi_picture_new_field(&picture->base);
 }
 
+static inline GstVaapiPictureH264 *
+gst_vaapi_picture_h264_new_clone(GstVaapiPictureH264 *picture)
+{
+    g_return_val_if_fail(picture, NULL);
+
+    return (GstVaapiPictureH264 *)gst_vaapi_picture_new_clone(&picture->base);
+}
+
 /* ------------------------------------------------------------------------- */
 /* --- Frame Buffers (DPB)                                               --- */
 /* ------------------------------------------------------------------------- */
@@ -362,14 +375,14 @@
 }
 
 static gboolean
-gst_vaapi_frame_store_split_fields(GstVaapiFrameStore *fs)
+gst_vaapi_frame_store_split_fields(GstVaapiFrameStore *fs, gboolean tff)
 {
     GstVaapiPictureH264 * const first_field = fs->buffers[0];
     GstVaapiPictureH264 *second_field;
 
     g_return_val_if_fail(fs->num_buffers == 1, FALSE);
 
-    first_field->base.structure = GST_VAAPI_PICTURE_IS_TFF(first_field) ?
+    first_field->base.structure = tff ?
         GST_VAAPI_PICTURE_STRUCTURE_TOP_FIELD :
         GST_VAAPI_PICTURE_STRUCTURE_BOTTOM_FIELD;
     GST_VAAPI_PICTURE_FLAG_SET(first_field, GST_VAAPI_PICTURE_FLAG_INTERLACED);
@@ -449,6 +462,8 @@
     GST_H264_VIDEO_STATE_GOT_SPS        = 1 << 0,
     GST_H264_VIDEO_STATE_GOT_PPS        = 1 << 1,
     GST_H264_VIDEO_STATE_GOT_SLICE      = 1 << 2,
+    GST_H264_VIDEO_STATE_GOT_I_FRAME    = 1 << 3, // persistent across SPS
+    GST_H264_VIDEO_STATE_GOT_P_SLICE    = 1 << 4, // predictive (all non-intra)
 
     GST_H264_VIDEO_STATE_VALID_PICTURE_HEADERS = (
         GST_H264_VIDEO_STATE_GOT_SPS |
@@ -464,6 +479,7 @@
     guint                       decoder_state;
     GstVaapiStreamAlignH264     stream_alignment;
     GstVaapiPictureH264        *current_picture;
+    GstVaapiPictureH264        *missing_picture;
     GstVaapiParserInfoH264     *sps[GST_H264_MAX_SPS_COUNT];
     GstVaapiParserInfoH264     *active_sps;
     GstVaapiParserInfoH264     *pps[GST_H264_MAX_PPS_COUNT];
@@ -501,12 +517,15 @@
     gint32                      frame_num_offset;       // FrameNumOffset
     gint32                      frame_num;              // frame_num (from slice_header())
     gint32                      prev_frame_num;         // prevFrameNum
+    gint32                      prev_ref_frame_num;     // prevRefFrameNum
     gboolean                    prev_pic_has_mmco5;     // prevMmco5Pic
+    gboolean                    prev_pic_reference;     // previous picture is a reference
     guint                       prev_pic_structure;     // previous picture structure
     guint                       is_opened               : 1;
     guint                       is_avcC                 : 1;
     guint                       has_context             : 1;
     guint                       progressive_sequence    : 1;
+    guint                       top_field_first         : 1;
 };
 
 /**
@@ -534,6 +553,9 @@
 exec_ref_pic_marking(GstVaapiDecoderH264 *decoder, GstVaapiPictureH264 *picture);
 
 static gboolean
+exec_ref_pic_marking_sliding_window(GstVaapiDecoderH264 *decoder);
+
+static gboolean
 is_inter_view_reference_for_next_pictures(GstVaapiDecoderH264 *decoder,
     GstVaapiPictureH264 *picture);
 
@@ -701,24 +723,25 @@
 static gboolean
 dpb_output(GstVaapiDecoderH264 *decoder, GstVaapiFrameStore *fs)
 {
-    GstVaapiPictureH264 *picture;
+    GstVaapiPictureH264 *picture = NULL;
+    guint i;
 
     g_return_val_if_fail(fs != NULL, FALSE);
 
     if (!gst_vaapi_frame_store_is_complete(fs))
         return TRUE;
 
-    picture = fs->buffers[0];
-    g_return_val_if_fail(picture != NULL, FALSE);
-    picture->output_needed = FALSE;
-
-    if (fs->num_buffers > 1) {
-        picture = fs->buffers[1];
-        g_return_val_if_fail(picture != NULL, FALSE);
-        picture->output_needed = FALSE;
+    for (i = 0; i < fs->num_buffers; i++) {
+        GstVaapiPictureH264 * const pic = fs->buffers[i];
+        g_return_val_if_fail(pic != NULL, FALSE);
+        pic->output_needed = FALSE;
+        if (!GST_VAAPI_PICTURE_FLAG_IS_SET(pic, GST_VAAPI_PICTURE_FLAG_GHOST))
+            picture = pic;
     }
 
     fs->output_needed = 0;
+    if (!picture)
+        return TRUE;
     return gst_vaapi_picture_output(GST_VAAPI_PICTURE_CAST(picture));
 }
 
@@ -749,6 +772,64 @@
     return -1;
 }
 
+/* Finds the picture with the nearest previous POC and same structure */
+static gint
+dpb_find_nearest_prev_poc(GstVaapiDecoderH264 *decoder,
+    GstVaapiPictureH264 *picture, guint picture_structure,
+    GstVaapiPictureH264 **found_picture_ptr)
+{
+    GstVaapiDecoderH264Private * const priv = &decoder->priv;
+    GstVaapiPictureH264 *found_picture = NULL;
+    guint i, j, found_index;
+
+    g_return_val_if_fail(picture != NULL, -1);
+
+    if (!picture_structure)
+        picture_structure = picture->base.structure;
+
+    for (i = 0; i < priv->dpb_count; i++) {
+        GstVaapiFrameStore * const fs = priv->dpb[i];
+        if (picture->base.view_id != fs->view_id)
+            continue;
+        for (j = 0; j < fs->num_buffers; j++) {
+            GstVaapiPictureH264 * const pic = fs->buffers[j];
+            if (pic->base.structure != picture_structure)
+                continue;
+            if (pic->base.poc >= picture->base.poc)
+                continue;
+            if (!found_picture || found_picture->base.poc < pic->base.poc)
+                found_picture = pic, found_index = i;
+        }
+    }
+
+    if (found_picture_ptr)
+        *found_picture_ptr = found_picture;
+    return found_picture ? found_index : -1;
+}
+
+/* Finds the picture with the associated FrameNum */
+static gint
+dpb_find_frame_num(GstVaapiDecoderH264 *decoder, GstVaapiPictureH264 *picture,
+    gint frame_num, GstVaapiPictureH264 **found_picture_ptr)
+{
+    GstVaapiDecoderH264Private * const priv = &decoder->priv;
+    guint i, j;
+
+    for (i = 0; i < priv->dpb_count; i++) {
+        GstVaapiFrameStore * const fs = priv->dpb[i];
+        if (picture && picture->base.view_id != fs->view_id)
+            continue;
+        for (j = 0; j < fs->num_buffers; j++) {
+            if (fs->buffers[j]->frame_num != frame_num)
+                continue;
+            if (found_picture_ptr)
+                *found_picture_ptr = fs->buffers[j];
+            return i;
+        }
+    }
+    return -1;
+}
+
 /* Finds the picture with the lowest POC that needs to be output */
 static gint
 dpb_find_lowest_poc(GstVaapiDecoderH264 *decoder, GstVaapiPictureH264 *picture,
@@ -986,7 +1067,7 @@
     gst_vaapi_frame_store_unref(fs);
 
     if (!priv->progressive_sequence && gst_vaapi_frame_store_has_frame(fs)) {
-        if (!gst_vaapi_frame_store_split_fields(fs))
+        if (!gst_vaapi_frame_store_split_fields(fs, priv->top_field_first))
             return FALSE;
     }
 
@@ -1109,6 +1190,7 @@
     GstVaapiDecoderH264Private * const priv = &decoder->priv;
 
     gst_vaapi_picture_replace(&priv->current_picture, NULL);
+    gst_vaapi_picture_replace(&priv->missing_picture, NULL);
     gst_vaapi_parser_info_h264_replace(&priv->prev_slice_pi, NULL);
     gst_vaapi_parser_info_h264_replace(&priv->prev_pi, NULL);
 
@@ -1177,6 +1259,7 @@
     priv->chroma_type           = GST_VAAPI_CHROMA_TYPE_YUV420;
     priv->prev_pic_structure    = GST_VAAPI_PICTURE_STRUCTURE_FRAME;
     priv->progressive_sequence  = TRUE;
+    priv->top_field_first       = FALSE;
     return TRUE;
 }
 
@@ -1207,6 +1290,12 @@
     GstVaapiDecoderH264Private * const priv = &decoder->priv;
     GstVaapiParserInfoH264 * const pi = priv->sps[sps->id];
 
+    /* Propagate "got I-frame" state to the next SPS unit if the
+       current sequence was not ended */
+    if (pi && priv->active_sps)
+        pi->state |= (priv->active_sps->state &
+            GST_H264_VIDEO_STATE_GOT_I_FRAME);
+
     gst_vaapi_parser_info_h264_replace(&priv->active_sps, pi);
     return pi ? &pi->data.sps : NULL;
 }
@@ -1383,8 +1472,13 @@
         priv->mb_height = mb_height;
     }
 
-    priv->progressive_sequence = sps->frame_mbs_only_flag;
-    gst_vaapi_decoder_set_interlaced(base_decoder, !priv->progressive_sequence);
+    if (priv->progressive_sequence != sps->frame_mbs_only_flag) {
+        GST_DEBUG("interlacing-mode changed");
+        priv->progressive_sequence = sps->frame_mbs_only_flag;
+        gst_vaapi_decoder_set_interlaced(base_decoder,
+            !priv->progressive_sequence);
+        priv->top_field_first = FALSE;
+    }
 
     gst_vaapi_decoder_set_pixel_aspect_ratio(
         base_decoder,
@@ -1488,10 +1582,20 @@
 decode_current_picture(GstVaapiDecoderH264 *decoder)
 {
     GstVaapiDecoderH264Private * const priv = &decoder->priv;
+    GstVaapiParserInfoH264 * const sps_pi = decoder->priv.active_sps;
     GstVaapiPictureH264 * const picture = priv->current_picture;
 
-    if (!is_valid_state(priv->decoder_state, GST_H264_VIDEO_STATE_VALID_PICTURE))
+    if (!is_valid_state(priv->decoder_state,
+            GST_H264_VIDEO_STATE_VALID_PICTURE))
         goto drop_frame;
+
+    priv->decoder_state |= sps_pi->state;
+    if (!(priv->decoder_state & GST_H264_VIDEO_STATE_GOT_I_FRAME)) {
+        if (priv->decoder_state & GST_H264_VIDEO_STATE_GOT_P_SLICE)
+            goto drop_frame;
+        sps_pi->state |= GST_H264_VIDEO_STATE_GOT_I_FRAME;
+    }
+
     priv->decoder_state = 0;
     priv->pic_structure = GST_H264_SEI_PIC_STRUCT_FRAME;
 
@@ -1515,7 +1619,7 @@
 drop_frame:
     priv->decoder_state = 0;
     priv->pic_structure = GST_H264_SEI_PIC_STRUCT_FRAME;
-    return GST_VAAPI_DECODER_STATUS_DROP_FRAME;
+    return (GstVaapiDecoderStatus) GST_VAAPI_DECODER_STATUS_DROP_FRAME;
 }
 
 static GstVaapiDecoderStatus
@@ -1668,6 +1772,8 @@
     pi->voc = get_view_order_index(sps, pi->view_id);
 
     priv->parser_state |= GST_H264_VIDEO_STATE_GOT_SLICE;
+    if (!GST_H264_IS_I_SLICE(slice_hdr))
+        priv->parser_state |= GST_H264_VIDEO_STATE_GOT_P_SLICE;
     return GST_VAAPI_DECODER_STATUS_SUCCESS;
 }
 
@@ -1742,13 +1848,14 @@
 decode_sequence_end(GstVaapiDecoderH264 *decoder)
 {
     GstVaapiDecoderH264Private * const priv = &decoder->priv;
-    GstVaapiDecoderStatus status;
+    GstVaapiParserInfoH264 * const sps_pi = decoder->priv.active_sps;
 
     GST_DEBUG("decode sequence-end");
 
-    status = decode_current_picture(decoder);
-    if (status != GST_VAAPI_DECODER_STATUS_SUCCESS)
-        return status;
+    /* Sequence ended, don't try to propagate "got I-frame" state
+       beyond this point */
+    if (sps_pi)
+        sps_pi->state &= ~GST_H264_VIDEO_STATE_GOT_I_FRAME;
 
     dpb_flush(decoder, NULL);
 
@@ -2561,7 +2668,7 @@
     GstH264RefPicListModification *ref_pic_list_modification;
     guint num_ref_pic_list_modifications;
     GstVaapiPictureH264 **ref_list;
-    guint *ref_list_count_ptr, ref_list_count, ref_list_idx = 0;
+    guint *ref_list_count_ptr, ref_list_idx = 0;
     const guint16 *view_ids = NULL;
     guint i, j, n, num_refs, num_view_ids = 0;
     gint found_ref_idx;
@@ -2611,7 +2718,6 @@
             }
         }
     }
-    ref_list_count = *ref_list_count_ptr;
 
     if (!GST_VAAPI_PICTURE_IS_FRAME(picture)) {
         MaxPicNum  = 1 << (sps->log2_max_frame_num_minus4 + 5); // 2 * MaxFrameNum
@@ -2871,6 +2977,245 @@
     }
 }
 
+static GstVaapiPictureH264 *
+fill_picture_first_field_gap(GstVaapiDecoderH264 *decoder,
+    GstVaapiPictureH264 *f0)
+{
+    GstVaapiDecoderH264Private * const priv = &decoder->priv;
+    GstVaapiPictureH264 *f1;
+
+    f1 = gst_vaapi_picture_h264_new_clone(f0);
+    if (!f1)
+        goto error_allocate_field;
+
+    gst_vaapi_picture_replace(&priv->missing_picture, f1);
+    gst_vaapi_picture_unref(f1);
+
+    GST_VAAPI_PICTURE_FLAG_SET(f1,
+        (GST_VAAPI_PICTURE_FLAG_ONEFIELD |
+         GST_VAAPI_PICTURE_FLAG_SKIPPED |
+         GST_VAAPI_PICTURE_FLAG_GHOST));
+
+    gst_vaapi_picture_h264_set_reference(f1, 0, FALSE);
+    return f1;
+
+    /* ERRORS */
+error_allocate_field:
+    GST_ERROR("failed to allocate missing field for current frame store");
+    return NULL;
+}
+
+static gboolean
+fill_picture_first_field_gap_done(GstVaapiDecoderH264 *decoder,
+    GstH264SliceHdr *slice_hdr)
+{
+    GstVaapiDecoderH264Private * const priv = &decoder->priv;
+    GstVaapiPictureH264 * const lost_field = priv->missing_picture;
+    GstH264SliceHdr lost_slice_hdr;
+    gboolean success = FALSE;
+
+    g_return_val_if_fail(priv->current_picture != NULL, FALSE);
+
+    if (!lost_field)
+        return TRUE;
+
+    lost_field->frame_num       = slice_hdr->frame_num;
+    lost_field->frame_num_wrap  = slice_hdr->frame_num;
+
+    gst_vaapi_picture_h264_set_reference(lost_field,
+        (GST_VAAPI_PICTURE_FLAGS(priv->current_picture) &
+         GST_VAAPI_PICTURE_FLAGS_REFERENCE), FALSE);
+
+    lost_slice_hdr = *slice_hdr;
+    lost_slice_hdr.bottom_field_flag = !lost_slice_hdr.bottom_field_flag;
+
+    init_picture_poc(decoder, lost_field, &lost_slice_hdr);
+    init_picture_ref_lists(decoder, lost_field);
+    init_picture_refs_pic_num(decoder, lost_field, &lost_slice_hdr);
+    if (!exec_ref_pic_marking_sliding_window(decoder))
+        goto error_exec_ref_pic_marking;
+    if (!dpb_add(decoder, lost_field))
+        goto error_dpb_add;
+    success = TRUE;
+
+cleanup:
+    gst_vaapi_picture_replace(&priv->missing_picture, NULL);
+    return success;
+
+    /* ERRORS */
+error_exec_ref_pic_marking:
+    GST_ERROR("failed to execute reference picture marking process");
+    goto cleanup;
+error_dpb_add:
+    GST_ERROR("failed to store lost picture into the DPB");
+    goto cleanup;
+}
+
+static GstVaapiPictureH264 *
+fill_picture_other_field_gap(GstVaapiDecoderH264 *decoder,
+    GstVaapiPictureH264 *f0)
+{
+    GstVaapiPictureH264 *prev_picture, *f1;
+    gint prev_picture_index;
+    guint picture_structure;
+
+    picture_structure = f0->base.structure;
+    switch (picture_structure) {
+    case GST_VAAPI_PICTURE_STRUCTURE_TOP_FIELD:
+        picture_structure = GST_VAAPI_PICTURE_STRUCTURE_BOTTOM_FIELD;
+        break;
+    case GST_VAAPI_PICTURE_STRUCTURE_BOTTOM_FIELD:
+        picture_structure = GST_VAAPI_PICTURE_STRUCTURE_TOP_FIELD;
+        break;
+    default:
+        g_assert(0 && "unexpected picture structure");
+        return NULL;
+    }
+    GST_VAAPI_PICTURE_FLAG_SET(f0, GST_VAAPI_PICTURE_FLAG_ONEFIELD);
+
+    prev_picture_index = dpb_find_nearest_prev_poc(decoder, f0,
+        picture_structure, &prev_picture);
+    if (prev_picture_index < 0)
+        return NULL;
+
+    f1 = gst_vaapi_picture_h264_new_field(f0);
+    if (!f1)
+        goto error_allocate_field;
+
+    gst_vaapi_surface_proxy_replace(&f1->base.proxy, prev_picture->base.proxy);
+    f1->base.surface = GST_VAAPI_SURFACE_PROXY_SURFACE(f1->base.proxy);
+    f1->base.surface_id = GST_VAAPI_SURFACE_PROXY_SURFACE_ID(f1->base.proxy);
+    f1->base.poc++;
+    f1->structure = f1->base.structure;
+
+    /* XXX: clone other H.264 picture specific flags */
+    GST_VAAPI_PICTURE_FLAG_SET(f1,
+        (GST_VAAPI_PICTURE_FLAG_SKIPPED |
+         GST_VAAPI_PICTURE_FLAG_GHOST));
+
+    if (!dpb_add(decoder, f1))
+        goto error_append_field;
+    gst_vaapi_picture_unref(f1);
+    return f1;
+
+    /* ERRORS */
+error_allocate_field:
+    GST_ERROR("failed to allocate missing field for previous frame store");
+    return NULL;
+error_append_field:
+    GST_ERROR("failed to add missing field into previous frame store");
+    gst_vaapi_picture_unref(f1);
+    return NULL;
+}
+
+static gboolean
+fill_picture_gaps(GstVaapiDecoderH264 *decoder, GstVaapiPictureH264 *picture,
+    GstH264SliceHdr *slice_hdr)
+{
+    GstVaapiDecoderH264Private * const priv = &decoder->priv;
+    GstH264SPS * const sps = get_sps(decoder);
+    const gint32 MaxFrameNum = 1 << (sps->log2_max_frame_num_minus4 + 4);
+    GstVaapiPicture *base_picture;
+    GstVaapiPictureH264 *lost_picture, *prev_picture;
+    GstH264SliceHdr lost_slice_hdr;
+    gboolean success = FALSE;
+
+    if (priv->prev_ref_frame_num == priv->frame_num)
+        return TRUE;
+    if ((priv->prev_ref_frame_num + 1) % MaxFrameNum == priv->frame_num)
+        return TRUE;
+    if (priv->dpb_count == 0)
+        return TRUE;
+
+    prev_picture = NULL;
+    dpb_find_frame_num(decoder, picture, priv->prev_ref_frame_num,
+        &prev_picture);
+    if (prev_picture)
+        gst_vaapi_picture_ref(prev_picture);
+    gst_vaapi_picture_ref(picture);
+
+    lost_slice_hdr = *slice_hdr;
+    lost_slice_hdr.field_pic_flag = 0;
+    if (sps->pic_order_cnt_type == 1) {
+        lost_slice_hdr.delta_pic_order_cnt[0] = 0;
+        lost_slice_hdr.delta_pic_order_cnt[1] = 0;
+    }
+    lost_slice_hdr.dec_ref_pic_marking.adaptive_ref_pic_marking_mode_flag = 0;
+
+    /* XXX: this process is incorrect for MVC */
+    /* XXX: optimize to reduce the number of dummy pictures created */
+    priv->frame_num = priv->prev_ref_frame_num;
+    for (;;) {
+        priv->prev_ref_frame_num = priv->frame_num;
+        priv->frame_num = (priv->prev_ref_frame_num + 1) % MaxFrameNum;
+        if (priv->frame_num == slice_hdr->frame_num)
+            break;
+
+        /* Create new picture */
+        if (prev_picture)
+            lost_picture = gst_vaapi_picture_h264_new_clone(prev_picture);
+        else
+            lost_picture = gst_vaapi_picture_h264_new(decoder);
+        if (!lost_picture)
+            goto error_allocate_picture;
+
+        base_picture                    = &lost_picture->base;
+        base_picture->type              = GST_VAAPI_PICTURE_TYPE_NONE;
+        base_picture->pts               = GST_CLOCK_TIME_NONE;
+        base_picture->structure         = GST_VAAPI_PICTURE_STRUCTURE_FRAME;
+        lost_picture->frame_num         = priv->frame_num;
+        lost_picture->frame_num_wrap    = priv->frame_num;
+        lost_picture->structure         = base_picture->structure;
+
+        GST_VAAPI_PICTURE_FLAG_SET(lost_picture,
+            (GST_VAAPI_PICTURE_FLAG_SKIPPED |
+             GST_VAAPI_PICTURE_FLAG_GHOST |
+             GST_VAAPI_PICTURE_FLAG_SHORT_TERM_REFERENCE));
+
+        if (sps->pic_order_cnt_type != 0)
+            init_picture_poc(decoder, lost_picture, &lost_slice_hdr);
+        else {
+            base_picture->poc = prev_picture->base.poc + 2;
+            if (prev_picture->field_poc[0] != G_MAXINT32)
+                lost_picture->field_poc[0] = prev_picture->field_poc[0] + 2;
+            if (prev_picture->field_poc[1] != G_MAXINT32)
+                lost_picture->field_poc[1] = prev_picture->field_poc[1] + 2;
+        }
+
+        gst_vaapi_picture_replace(&prev_picture, lost_picture);
+        gst_vaapi_picture_replace(&priv->current_picture, lost_picture);
+        gst_vaapi_picture_unref(lost_picture);
+
+        init_picture_ref_lists(decoder, lost_picture);
+        init_picture_refs_pic_num(decoder, lost_picture, &lost_slice_hdr);
+        if (!exec_ref_pic_marking_sliding_window(decoder))
+            goto error_exec_ref_pic_marking;
+        if (!dpb_add(decoder, lost_picture))
+            goto error_dpb_add;
+        gst_vaapi_picture_replace(&priv->current_picture, NULL);
+    }
+    success = TRUE;
+
+cleanup:
+    priv->frame_num = slice_hdr->frame_num;
+    priv->prev_ref_frame_num = (priv->frame_num + MaxFrameNum - 1) % MaxFrameNum;
+    gst_vaapi_picture_replace(&prev_picture, NULL);
+    gst_vaapi_picture_replace(&priv->current_picture, picture);
+    gst_vaapi_picture_unref(picture);
+    return success;
+
+    /* ERRORS */
+error_allocate_picture:
+    GST_ERROR("failed to allocate lost picture");
+    goto cleanup;
+error_exec_ref_pic_marking:
+    GST_ERROR("failed to execute reference picture marking process");
+    goto cleanup;
+error_dpb_add:
+    GST_ERROR("failed to store lost picture into the DPB");
+    goto cleanup;
+}
+
 static gboolean
 init_picture(
     GstVaapiDecoderH264 *decoder,
@@ -2880,6 +3225,8 @@
     GstVaapiPicture * const base_picture = &picture->base;
     GstH264SliceHdr * const slice_hdr = &pi->data.slice_hdr;
 
+    if (priv->prev_pic_reference)
+        priv->prev_ref_frame_num = priv->frame_num;
     priv->prev_frame_num        = priv->frame_num;
     priv->frame_num             = slice_hdr->frame_num;
     picture->frame_num          = priv->frame_num;
@@ -2912,6 +3259,8 @@
         GST_VAAPI_PICTURE_FLAG_SET(picture, GST_VAAPI_PICTURE_FLAG_IDR);
         dpb_flush(decoder, picture);
     }
+    else if (!fill_picture_gaps(decoder, picture, slice_hdr))
+        return FALSE;
 
     /* Initialize picture structure */
     if (slice_hdr->field_pic_flag) {
@@ -2926,7 +3275,7 @@
     case GST_H264_SEI_PIC_STRUCT_TOP_FIELD:
         base_picture->structure = GST_VAAPI_PICTURE_STRUCTURE_TOP_FIELD;
         if (GST_VAAPI_PICTURE_IS_FIRST_FIELD(picture))
-            GST_VAAPI_PICTURE_FLAG_SET(picture, GST_VAAPI_PICTURE_FLAG_TFF);
+            priv->top_field_first = TRUE;
         break;
     case GST_H264_SEI_PIC_STRUCT_BOTTOM_FIELD:
         base_picture->structure = GST_VAAPI_PICTURE_STRUCTURE_BOTTOM_FIELD;
@@ -2936,13 +3285,19 @@
         // fall-through
     case GST_H264_SEI_PIC_STRUCT_TOP_BOTTOM:
         if (GST_VAAPI_PICTURE_IS_FIRST_FIELD(picture))
-            GST_VAAPI_PICTURE_FLAG_SET(picture, GST_VAAPI_PICTURE_FLAG_TFF);
+            priv->top_field_first = TRUE;
         break;
     case GST_H264_SEI_PIC_STRUCT_BOTTOM_TOP_BOTTOM:
         GST_VAAPI_PICTURE_FLAG_SET(picture, GST_VAAPI_PICTURE_FLAG_RFF);
         break;
+    case GST_H264_SEI_PIC_STRUCT_FRAME:
+        if (!priv->progressive_sequence && priv->dpb_count == 0)
+            priv->top_field_first = TRUE;
+        break;
     }
     picture->structure = base_picture->structure;
+    if (priv->top_field_first)
+        GST_VAAPI_PICTURE_FLAG_SET(picture, GST_VAAPI_PICTURE_FLAG_TFF);
 
     /* Initialize reference flags */
     if (pi->nalu.ref_idc) {
@@ -2958,6 +3313,7 @@
                 GST_VAAPI_PICTURE_FLAG_SHORT_TERM_REFERENCE);
     }
 
+    fill_picture_first_field_gap_done(decoder, slice_hdr);
     init_picture_poc(decoder, picture, slice_hdr);
     return TRUE;
 }
@@ -3238,13 +3594,14 @@
 {
     GstVaapiDecoderH264Private * const priv = &decoder->priv;
 
+    priv->prev_pic_reference = GST_VAAPI_PICTURE_IS_REFERENCE(picture);
     priv->prev_pic_has_mmco5 = FALSE;
     priv->prev_pic_structure = picture->structure;
 
     if (GST_VAAPI_PICTURE_IS_INTER_VIEW(picture))
         g_ptr_array_add(priv->inter_views, gst_vaapi_picture_ref(picture));
 
-    if (!GST_VAAPI_PICTURE_IS_REFERENCE(picture))
+    if (!priv->prev_pic_reference)
         return TRUE;
 
     if (!GST_VAAPI_PICTURE_IS_IDR(picture)) {
@@ -3485,24 +3842,64 @@
     return pi->voc < prev_pi->voc;
 }
 
+/* Determines whether the supplied picture has the same field parity
+   than a picture specified through the other slice header */
+static inline gboolean
+same_field_parity(GstVaapiPictureH264 *field, GstH264SliceHdr *slice_hdr)
+{
+    g_return_val_if_fail(GST_VAAPI_PICTURE_IS_INTERLACED(field), FALSE);
+
+    return ((field->base.structure == GST_VAAPI_PICTURE_STRUCTURE_BOTTOM_FIELD) ^
+         slice_hdr->bottom_field_flag) == 0;
+}
+
 /* Finds the first field picture corresponding to the supplied picture */
 static GstVaapiPictureH264 *
-find_first_field(GstVaapiDecoderH264 *decoder, GstVaapiParserInfoH264 *pi)
+find_first_field(GstVaapiDecoderH264 *decoder, GstVaapiParserInfoH264 *pi,
+    gboolean fill_gaps)
 {
     GstVaapiDecoderH264Private * const priv = &decoder->priv;
     GstH264SliceHdr * const slice_hdr = &pi->data.slice_hdr;
     GstVaapiFrameStore *fs;
+    GstVaapiPictureH264 *f0, *f1;
 
-    if (!slice_hdr->field_pic_flag)
+    fs = priv->prev_frames[pi->voc];
+    if (!fs)
         return NULL;
 
-    fs = priv->prev_frames[pi->voc];
-    if (!fs || gst_vaapi_frame_store_has_frame(fs))
+    f0 = fs->buffers[0];
+    if (!slice_hdr->field_pic_flag) {
+        if (fill_gaps && !gst_vaapi_frame_store_has_frame(fs))
+            fill_picture_other_field_gap(decoder, f0);
         return NULL;
+    }
 
-    if (fs->buffers[0]->frame_num == slice_hdr->frame_num)
-        return fs->buffers[0];
-    return NULL;
+    /* At this point, the current frame is known to be interlaced */
+    if (gst_vaapi_frame_store_has_frame(fs)) {
+        f1 = NULL;
+        if (fill_gaps && !same_field_parity(f0, slice_hdr))
+            f1 = fill_picture_first_field_gap(decoder, f0);
+        return f1;
+    }
+
+    /* At this point, the previous frame is interlaced and contains a
+       single field */
+    if (f0->frame_num == slice_hdr->frame_num) {
+        f1 = f0;
+        if (fill_gaps && same_field_parity(f0, slice_hdr)) {
+            fill_picture_other_field_gap(decoder, f0);
+            f1 = NULL;
+        }
+        return f1;
+    }
+
+    f1 = NULL;
+    if (fill_gaps) {
+        fill_picture_other_field_gap(decoder, f0);
+        if (!same_field_parity(f0, slice_hdr))
+            f1 = fill_picture_first_field_gap(decoder, f0);
+    }
+    return f1;
 }
 
 static GstVaapiDecoderStatus
@@ -3523,10 +3920,6 @@
     switch (sps->profile_idc) {
     case GST_H264_PROFILE_MULTIVIEW_HIGH:
     case GST_H264_PROFILE_STEREO_HIGH:
-        if (0) {
-            GST_DEBUG("drop picture from substream");
-            return GST_VAAPI_DECODER_STATUS_DROP_FRAME;
-        }
         break;
     }
 
@@ -3535,8 +3928,9 @@
         return status;
 
     priv->decoder_state = 0;
+    gst_vaapi_picture_replace(&priv->missing_picture, NULL);
 
-    first_field = find_first_field(decoder, pi);
+    first_field = find_first_field(decoder, pi, TRUE);
     if (first_field) {
         /* Re-use current picture where the first field was decoded */
         picture = gst_vaapi_picture_h264_new_field(first_field);
@@ -3791,7 +4185,6 @@
 
     gst_vaapi_picture_add_slice(GST_VAAPI_PICTURE_CAST(picture), slice);
     picture->last_slice_hdr = slice_hdr;
-    priv->decoder_state |= GST_H264_VIDEO_STATE_GOT_SLICE;
     return GST_VAAPI_DECODER_STATUS_SUCCESS;
 }
 
@@ -3892,6 +4285,9 @@
             goto cleanup;
         ofs = pi->nalu.offset + pi->nalu.size;
 
+        pi->state = priv->parser_state;
+        pi->flags = 0;
+
         status = decode_sps(decoder, &unit);
         if (status != GST_VAAPI_DECODER_STATUS_SUCCESS)
             goto cleanup;
@@ -3922,6 +4318,9 @@
             goto cleanup;
         ofs = pi->nalu.offset + pi->nalu.size;
 
+        pi->state = priv->parser_state;
+        pi->flags = 0;
+
         status = decode_pps(decoder, &unit);
         if (status != GST_VAAPI_DECODER_STATUS_SUCCESS)
             goto cleanup;
diff -Nru gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapidecoder_h265.c gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapidecoder_h265.c
--- gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapidecoder_h265.c	1970-01-01 00:00:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapidecoder_h265.c	2015-07-15 12:47:43.000000000 +0000
@@ -0,0 +1,3061 @@
+/*
+ *  gstvaapidecoder_h265.c - H.265 decoder
+ *
+ *  Copyright (C) 2015 Intel Corporation
+ *    Author: Sreerenj Balachandran <sreerenj.balachandran@intel.com>
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public License
+ *  as published by the Free Software Foundation; either version 2.1
+ *  of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free
+ *  Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ *  Boston, MA 02110-1301 USA
+ */
+
+/**
+ * SECTION:gstvaapidecoder_h265
+ * @short_description: H.265 decoder
+ */
+
+#include "sysdeps.h"
+#include <string.h>
+#include <math.h>
+#include <gst/base/gstadapter.h>
+#include <gst/codecparsers/gsth265parser.h>
+#include "gstvaapicompat.h"
+#include "gstvaapidecoder_h265.h"
+#include "gstvaapidecoder_objects.h"
+#include "gstvaapidecoder_priv.h"
+#include "gstvaapidisplay_priv.h"
+#include "gstvaapiobject_priv.h"
+#include "gstvaapiutils_h265_priv.h"
+
+#define DEBUG 1
+#include "gstvaapidebug.h"
+
+/* Defined to 1 if strict ordering of DPB is needed. Only useful for debug */
+#define USE_STRICT_DPB_ORDERING 0
+
+typedef struct _GstVaapiDecoderH265Private GstVaapiDecoderH265Private;
+typedef struct _GstVaapiDecoderH265Class GstVaapiDecoderH265Class;
+typedef struct _GstVaapiFrameStore GstVaapiFrameStore;
+typedef struct _GstVaapiFrameStoreClass GstVaapiFrameStoreClass;
+typedef struct _GstVaapiParserInfoH265 GstVaapiParserInfoH265;
+typedef struct _GstVaapiPictureH265 GstVaapiPictureH265;
+
+static gboolean nal_is_slice (guint8 nal_type);
+
+/* ------------------------------------------------------------------------- */
+/* --- H.265 Parser Info                                                 --- */
+/* ------------------------------------------------------------------------- */
+
+/*
+ * Extended decoder unit flags:
+ *
+ * @GST_VAAPI_DECODER_UNIT_AU_START: marks the start of an access unit.
+ * @GST_VAAPI_DECODER_UNIT_AU_END: marks the end of an access unit.
+ */
+enum
+{
+  GST_VAAPI_DECODER_UNIT_FLAG_AU_START =
+      (GST_VAAPI_DECODER_UNIT_FLAG_LAST << 0),
+  GST_VAAPI_DECODER_UNIT_FLAG_AU_END = (GST_VAAPI_DECODER_UNIT_FLAG_LAST << 1),
+
+  GST_VAAPI_DECODER_UNIT_FLAGS_AU = (GST_VAAPI_DECODER_UNIT_FLAG_AU_START |
+      GST_VAAPI_DECODER_UNIT_FLAG_AU_END),
+};
+
+#define GST_VAAPI_PARSER_INFO_H265(obj) \
+    ((GstVaapiParserInfoH265 *)(obj))
+
+struct _GstVaapiParserInfoH265
+{
+  GstVaapiMiniObject parent_instance;
+  GstH265NalUnit nalu;
+  union
+  {
+    GstH265VPS vps;
+    GstH265SPS sps;
+    GstH265PPS pps;
+    /* Fix SEI parsing in codecparser, have to use GArray like h264parser */
+    GstH265SEIMessage sei;
+    GstH265SliceHdr slice_hdr;
+  } data;
+  guint state;
+  guint flags;                  // Same as decoder unit flags (persistent)
+};
+
+static void
+gst_vaapi_parser_info_h265_finalize (GstVaapiParserInfoH265 * pi)
+{
+  if (nal_is_slice (pi->nalu.type))
+    gst_h265_slice_hdr_free (&pi->data.slice_hdr);
+  else {
+    switch (pi->nalu.type) {
+      case GST_H265_NAL_VPS:
+      case GST_H265_NAL_SPS:
+      case GST_H265_NAL_PPS:
+        break;
+      case GST_H265_NAL_PREFIX_SEI:
+      case GST_H265_NAL_SUFFIX_SEI:
+        gst_h265_sei_free (&pi->data.sei);
+        break;
+    }
+  }
+}
+
+static inline const GstVaapiMiniObjectClass *
+gst_vaapi_parser_info_h265_class (void)
+{
+  static const GstVaapiMiniObjectClass GstVaapiParserInfoH265Class = {
+    .size = sizeof (GstVaapiParserInfoH265),
+    .finalize = (GDestroyNotify) gst_vaapi_parser_info_h265_finalize
+  };
+  return &GstVaapiParserInfoH265Class;
+}
+
+static inline GstVaapiParserInfoH265 *
+gst_vaapi_parser_info_h265_new (void)
+{
+  return (GstVaapiParserInfoH265 *)
+      gst_vaapi_mini_object_new (gst_vaapi_parser_info_h265_class ());
+}
+
+#define gst_vaapi_parser_info_h265_ref(pi) \
+    gst_vaapi_mini_object_ref(GST_VAAPI_MINI_OBJECT(pi))
+
+#define gst_vaapi_parser_info_h265_unref(pi) \
+    gst_vaapi_mini_object_unref(GST_VAAPI_MINI_OBJECT(pi))
+
+#define gst_vaapi_parser_info_h265_replace(old_pi_ptr, new_pi)          \
+    gst_vaapi_mini_object_replace((GstVaapiMiniObject **)(old_pi_ptr),  \
+        (GstVaapiMiniObject *)(new_pi))
+
+/* ------------------------------------------------------------------------- */
+/* --- H.265 Pictures                                                    --- */
+/* ------------------------------------------------------------------------- */
+
+/*
+ * Extended picture flags:
+ *
+ * @GST_VAAPI_PICTURE_FLAG_IDR: flag that specifies an IDR picture
+ * @GST_VAAPI_PICTURE_FLAG_AU_START: flag that marks the start of an
+ *   access unit (AU)
+ * @GST_VAAPI_PICTURE_FLAG_AU_END: flag that marks the end of an
+ *   access unit (AU)
+ * @GST_VAAPI_PICTURE_FLAG_RPS_ST_CURR_BEFORE: flag indicate the inclusion
+ *   of picture in RefPicSetStCurrBefore reference list
+ * @GST_VAAPI_PICTURE_FLAG_RPS_ST_CURR_AFTER: flag indicate the inclusion
+ *   of picture in RefPictSetStCurrAfter reference list
+ * @GST_VAAPI_PICTURE_FLAG_RPS_ST_FOLL: flag indicate the inclusion
+ *   of picture in RefPicSetStFoll reference list
+ * @GST_VAAPI_PICTURE_FLAG_RPS_LT_CURR: flag indicate the inclusion
+ *   of picture in RefPicSetLtCurr reference list
+ * @GST_VAAPI_PICTURE_FLAG_RPS_LT_FOLL: flag indicate the inclusion
+ *   of picture in RefPicSetLtFoll reference list
+ * @GST_VAAPI_PICTURE_FLAG_SHORT_TERM_REFERENCE: flag that specifies
+ *     "used for short-term reference"
+ * @GST_VAAPI_PICTURE_FLAG_LONG_TERM_REFERENCE: flag that specifies
+ *     "used for long-term reference"
+ * @GST_VAAPI_PICTURE_FLAGS_REFERENCE: mask covering any kind of
+ *     reference picture (short-term reference or long-term reference)
+ */
+enum
+{
+  GST_VAAPI_PICTURE_FLAG_IDR = (GST_VAAPI_PICTURE_FLAG_LAST << 0),
+  GST_VAAPI_PICTURE_FLAG_REFERENCE2 = (GST_VAAPI_PICTURE_FLAG_LAST << 1),
+  GST_VAAPI_PICTURE_FLAG_AU_START = (GST_VAAPI_PICTURE_FLAG_LAST << 4),
+  GST_VAAPI_PICTURE_FLAG_AU_END = (GST_VAAPI_PICTURE_FLAG_LAST << 5),
+  GST_VAAPI_PICTURE_FLAG_RPS_ST_CURR_BEFORE =
+      (GST_VAAPI_PICTURE_FLAG_LAST << 6),
+  GST_VAAPI_PICTURE_FLAG_RPS_ST_CURR_AFTER = (GST_VAAPI_PICTURE_FLAG_LAST << 7),
+  GST_VAAPI_PICTURE_FLAG_RPS_ST_FOLL = (GST_VAAPI_PICTURE_FLAG_LAST << 8),
+  GST_VAAPI_PICTURE_FLAG_RPS_LT_CURR = (GST_VAAPI_PICTURE_FLAG_LAST << 9),
+  GST_VAAPI_PICTURE_FLAG_RPS_LT_FOLL = (GST_VAAPI_PICTURE_FLAG_LAST << 10),
+
+  GST_VAAPI_PICTURE_FLAG_SHORT_TERM_REFERENCE =
+      (GST_VAAPI_PICTURE_FLAG_REFERENCE),
+  GST_VAAPI_PICTURE_FLAG_LONG_TERM_REFERENCE =
+      (GST_VAAPI_PICTURE_FLAG_REFERENCE | GST_VAAPI_PICTURE_FLAG_REFERENCE2),
+  GST_VAAPI_PICTURE_FLAGS_REFERENCE =
+      (GST_VAAPI_PICTURE_FLAG_SHORT_TERM_REFERENCE |
+      GST_VAAPI_PICTURE_FLAG_LONG_TERM_REFERENCE),
+
+  GST_VAAPI_PICTURE_FLAGS_RPS_ST =
+      (GST_VAAPI_PICTURE_FLAG_RPS_ST_CURR_BEFORE |
+      GST_VAAPI_PICTURE_FLAG_RPS_ST_CURR_AFTER |
+      GST_VAAPI_PICTURE_FLAG_RPS_ST_FOLL),
+  GST_VAAPI_PICTURE_FLAGS_RPS_LT =
+      (GST_VAAPI_PICTURE_FLAG_RPS_LT_CURR | GST_VAAPI_PICTURE_FLAG_RPS_LT_FOLL),
+};
+
+#define GST_VAAPI_PICTURE_IS_IDR(picture) \
+    (GST_VAAPI_PICTURE_FLAG_IS_SET(picture, GST_VAAPI_PICTURE_FLAG_IDR))
+
+#define GST_VAAPI_PICTURE_IS_SHORT_TERM_REFERENCE(picture)      \
+    ((GST_VAAPI_PICTURE_FLAGS(picture) &                        \
+      GST_VAAPI_PICTURE_FLAGS_REFERENCE) ==                     \
+     GST_VAAPI_PICTURE_FLAG_SHORT_TERM_REFERENCE)
+
+#define GST_VAAPI_PICTURE_IS_LONG_TERM_REFERENCE(picture)       \
+    ((GST_VAAPI_PICTURE_FLAGS(picture) &                        \
+      GST_VAAPI_PICTURE_FLAGS_REFERENCE) ==                     \
+     GST_VAAPI_PICTURE_FLAG_LONG_TERM_REFERENCE)
+
+#define GST_VAAPI_PICTURE_H265(picture) \
+    ((GstVaapiPictureH265 *)(picture))
+
+struct _GstVaapiPictureH265
+{
+  GstVaapiPicture base;
+  GstH265SliceHdr *last_slice_hdr;
+  guint structure;
+  gint32 poc;                   // PicOrderCntVal (8.3.1) 
+  gint32 poc_lsb;               // slice_pic_order_cnt_lsb
+  guint32 pic_latency_cnt;      // PicLatencyCount
+  guint output_flag:1;
+  guint output_needed:1;
+  guint NoRaslOutputFlag:1;
+  guint NoOutputOfPriorPicsFlag:1;
+  guint RapPicFlag:1;           // nalu type between 16 and 21
+  guint IntraPicFlag:1;         // Intra pic (only Intra slices)
+};
+
+GST_VAAPI_CODEC_DEFINE_TYPE (GstVaapiPictureH265, gst_vaapi_picture_h265);
+
+void
+gst_vaapi_picture_h265_destroy (GstVaapiPictureH265 * picture)
+{
+  gst_vaapi_picture_destroy (GST_VAAPI_PICTURE (picture));
+}
+
+gboolean
+gst_vaapi_picture_h265_create (GstVaapiPictureH265 * picture,
+    const GstVaapiCodecObjectConstructorArgs * args)
+{
+  if (!gst_vaapi_picture_create (GST_VAAPI_PICTURE (picture), args))
+    return FALSE;
+
+  picture->structure = picture->base.structure;
+  picture->poc = G_MAXINT32;
+  picture->output_needed = FALSE;
+  return TRUE;
+}
+
+static inline GstVaapiPictureH265 *
+gst_vaapi_picture_h265_new (GstVaapiDecoderH265 * decoder)
+{
+  return (GstVaapiPictureH265 *)
+      gst_vaapi_codec_object_new (&GstVaapiPictureH265Class,
+      GST_VAAPI_CODEC_BASE (decoder), NULL,
+      sizeof (VAPictureParameterBufferHEVC), NULL, 0, 0);
+}
+
+static inline void
+gst_vaapi_picture_h265_set_reference (GstVaapiPictureH265 * picture,
+    guint reference_flags)
+{
+  if (!picture)
+    return;
+  GST_VAAPI_PICTURE_FLAG_UNSET (picture,
+      GST_VAAPI_PICTURE_FLAGS_RPS_ST | GST_VAAPI_PICTURE_FLAGS_RPS_LT);
+  GST_VAAPI_PICTURE_FLAG_UNSET (picture, GST_VAAPI_PICTURE_FLAGS_REFERENCE);
+  GST_VAAPI_PICTURE_FLAG_SET (picture, reference_flags);
+}
+
+/* ------------------------------------------------------------------------- */
+/* --- Frame Buffers (DPB)                                               --- */
+/* ------------------------------------------------------------------------- */
+
+struct _GstVaapiFrameStore
+{
+  /*< private > */
+  GstVaapiMiniObject parent_instance;
+
+  GstVaapiPictureH265 *buffer;
+};
+
+static void
+gst_vaapi_frame_store_finalize (gpointer object)
+{
+  GstVaapiFrameStore *const fs = object;
+
+  gst_vaapi_picture_replace (&fs->buffer, NULL);
+}
+
+static GstVaapiFrameStore *
+gst_vaapi_frame_store_new (GstVaapiPictureH265 * picture)
+{
+  GstVaapiFrameStore *fs;
+
+  static const GstVaapiMiniObjectClass GstVaapiFrameStoreClass = {
+    sizeof (GstVaapiFrameStore),
+    gst_vaapi_frame_store_finalize
+  };
+
+  fs = (GstVaapiFrameStore *)
+      gst_vaapi_mini_object_new (&GstVaapiFrameStoreClass);
+  if (!fs)
+    return NULL;
+
+  fs->buffer = gst_vaapi_picture_ref (picture);
+
+  return fs;
+}
+
+static inline gboolean
+gst_vaapi_frame_store_has_reference (GstVaapiFrameStore * fs)
+{
+  if (GST_VAAPI_PICTURE_IS_REFERENCE (fs->buffer))
+    return TRUE;
+  return FALSE;
+}
+
+#define gst_vaapi_frame_store_ref(fs) \
+    gst_vaapi_mini_object_ref(GST_VAAPI_MINI_OBJECT(fs))
+
+#define gst_vaapi_frame_store_unref(fs) \
+    gst_vaapi_mini_object_unref(GST_VAAPI_MINI_OBJECT(fs))
+
+#define gst_vaapi_frame_store_replace(old_fs_p, new_fs)                 \
+    gst_vaapi_mini_object_replace((GstVaapiMiniObject **)(old_fs_p),    \
+        (GstVaapiMiniObject *)(new_fs))
+
+/* ------------------------------------------------------------------------- */
+/* --- H.265 Decoder                                                     --- */
+/* ------------------------------------------------------------------------- */
+
+#define GST_VAAPI_DECODER_H265_CAST(decoder) \
+    ((GstVaapiDecoderH265 *)(decoder))
+
+typedef enum
+{
+  GST_H265_VIDEO_STATE_GOT_VPS = 1 << 0,
+  GST_H265_VIDEO_STATE_GOT_SPS = 1 << 1,
+  GST_H265_VIDEO_STATE_GOT_PPS = 1 << 2,
+  GST_H265_VIDEO_STATE_GOT_SLICE = 1 << 3,
+
+  GST_H265_VIDEO_STATE_VALID_PICTURE_HEADERS =
+      (GST_H265_VIDEO_STATE_GOT_SPS | GST_H265_VIDEO_STATE_GOT_PPS),
+  GST_H265_VIDEO_STATE_VALID_PICTURE =
+      (GST_H265_VIDEO_STATE_VALID_PICTURE_HEADERS |
+      GST_H265_VIDEO_STATE_GOT_SLICE)
+} GstH265VideoState;
+
+struct _GstVaapiDecoderH265Private
+{
+  GstH265Parser *parser;
+  guint parser_state;
+  guint decoder_state;
+  GstVaapiStreamAlignH265 stream_alignment;
+  GstVaapiPictureH265 *current_picture;
+  GstVaapiParserInfoH265 *vps[GST_H265_MAX_VPS_COUNT];
+  GstVaapiParserInfoH265 *active_vps;
+  GstVaapiParserInfoH265 *sps[GST_H265_MAX_SPS_COUNT];
+  GstVaapiParserInfoH265 *active_sps;
+  GstVaapiParserInfoH265 *pps[GST_H265_MAX_PPS_COUNT];
+  GstVaapiParserInfoH265 *active_pps;
+  GstVaapiParserInfoH265 *prev_pi;
+  GstVaapiParserInfoH265 *prev_slice_pi;
+  GstVaapiParserInfoH265 *prev_independent_slice_pi;
+  GstVaapiFrameStore **dpb;
+  guint dpb_count;
+  guint dpb_size;
+  guint dpb_size_max;
+  GstVaapiProfile profile;
+  GstVaapiEntrypoint entrypoint;
+  GstVaapiChromaType chroma_type;
+
+  GstVaapiPictureH265 *RefPicSetStCurrBefore[16];
+  GstVaapiPictureH265 *RefPicSetStCurrAfter[16];
+  GstVaapiPictureH265 *RefPicSetStFoll[16];
+  GstVaapiPictureH265 *RefPicSetLtCurr[16];
+  GstVaapiPictureH265 *RefPicSetLtFoll[16];
+
+  GstVaapiPictureH265 *RefPicList0[16];
+  guint RefPicList0_count;
+  GstVaapiPictureH265 *RefPicList1[16];
+  guint RefPicList1_count;
+
+  guint32 SpsMaxLatencyPictures;
+
+  guint nal_length_size;
+
+  guint pic_width_in_luma_samples;      //sps->pic_width_in_luma_samples
+  guint pic_height_in_luma_samples;     //sps->pic_height_in_luma_samples
+  guint pic_structure;          // pic_struct (from SEI pic_timing() or inferred)
+  gint32 poc;                   // PicOrderCntVal
+  gint32 poc_msb;               // PicOrderCntMsb
+  gint32 poc_lsb;               // pic_order_cnt_lsb (from slice_header())
+  gint32 prev_poc_msb;          // prevPicOrderCntMsb
+  gint32 prev_poc_lsb;          // prevPicOrderCntLsb
+  gint32 prev_tid0pic_poc_lsb;
+  gint32 prev_tid0pic_poc_msb;
+  gint32 PocStCurrBefore[16];
+  gint32 PocStCurrAfter[16];
+  gint32 PocStFoll[16];
+  gint32 PocLtCurr[16];
+  gint32 PocLtFoll[16];
+  guint NumPocStCurrBefore;
+  guint NumPocStCurrAfter;
+  guint NumPocStFoll;
+  guint NumPocLtCurr;
+  guint NumPocLtFoll;
+  guint NumPocTotalCurr;
+  guint is_opened:1;
+  guint is_hvcC:1;
+  guint has_context:1;
+  guint progressive_sequence:1;
+  guint new_bitstream:1;
+  guint prev_nal_is_eos:1;      /*previous nal type is EOS */
+  guint associated_irap_NoRaslOutputFlag:1;
+};
+
+/**
+ * GstVaapiDecoderH265:
+ *
+ * A decoder based on H265.
+ */
+struct _GstVaapiDecoderH265
+{
+  /*< private > */
+  GstVaapiDecoder parent_instance;
+  GstVaapiDecoderH265Private priv;
+};
+
+/**
+ * GstVaapiDecoderH265Class:
+ *
+ * A decoder class based on H265.
+ */
+struct _GstVaapiDecoderH265Class
+{
+  /*< private > */
+  GstVaapiDecoderClass parent_class;
+};
+
+#define RSV_VCL_N10 10
+#define RSV_VCL_N12 12
+#define RSV_VCL_N14 14
+
+static gboolean
+nal_is_idr (guint8 nal_type)
+{
+  if ((nal_type == GST_H265_NAL_SLICE_IDR_W_RADL) ||
+      (nal_type == GST_H265_NAL_SLICE_IDR_N_LP))
+    return TRUE;
+  return FALSE;
+}
+
+static gboolean
+nal_is_irap (guint8 nal_type)
+{
+  if ((nal_type >= GST_H265_NAL_SLICE_BLA_W_LP) &&
+      (nal_type <= RESERVED_IRAP_NAL_TYPE_MAX))
+    return TRUE;
+  return FALSE;
+}
+
+static gboolean
+nal_is_bla (guint8 nal_type)
+{
+  if ((nal_type >= GST_H265_NAL_SLICE_BLA_W_LP) &&
+      (nal_type <= GST_H265_NAL_SLICE_BLA_N_LP))
+    return TRUE;
+  return FALSE;
+}
+
+static gboolean
+nal_is_cra (guint8 nal_type)
+{
+  if (nal_type == GST_H265_NAL_SLICE_CRA_NUT)
+    return TRUE;
+  return FALSE;
+}
+
+static gboolean
+nal_is_radl (guint8 nal_type)
+{
+  if ((nal_type >= GST_H265_NAL_SLICE_RADL_N) &&
+      (nal_type <= GST_H265_NAL_SLICE_RADL_R))
+    return TRUE;
+  return FALSE;
+}
+
+static gboolean
+nal_is_rasl (guint8 nal_type)
+{
+  if ((nal_type >= GST_H265_NAL_SLICE_RASL_N) &&
+      (nal_type <= GST_H265_NAL_SLICE_RASL_R))
+    return TRUE;
+  return FALSE;
+}
+
+static gboolean
+nal_is_slice (guint8 nal_type)
+{
+  if ((nal_type >= GST_H265_NAL_SLICE_TRAIL_N) &&
+      (nal_type <= GST_H265_NAL_SLICE_CRA_NUT))
+    return TRUE;
+  return FALSE;
+}
+
+static gboolean
+nal_is_ref (guint8 nal_type)
+{
+  gboolean ret = FALSE;
+  switch (nal_type) {
+    case GST_H265_NAL_SLICE_TRAIL_N:
+    case GST_H265_NAL_SLICE_TSA_N:
+    case GST_H265_NAL_SLICE_STSA_N:
+    case GST_H265_NAL_SLICE_RADL_N:
+    case GST_H265_NAL_SLICE_RASL_N:
+    case RSV_VCL_N10:
+    case RSV_VCL_N12:
+    case RSV_VCL_N14:
+      ret = FALSE;
+      break;
+    default:
+      ret = TRUE;
+      break;
+  }
+  return ret;
+}
+
+/* Activates the supplied PPS */
+static GstH265PPS *
+ensure_pps (GstVaapiDecoderH265 * decoder, GstH265PPS * pps)
+{
+  GstVaapiDecoderH265Private *const priv = &decoder->priv;
+  GstVaapiParserInfoH265 *const pi = priv->pps[pps->id];
+
+  gst_vaapi_parser_info_h265_replace (&priv->active_pps, pi);
+  return pi ? &pi->data.pps : NULL;
+}
+
+/* Returns the active PPS */
+static inline GstH265PPS *
+get_pps (GstVaapiDecoderH265 * decoder)
+{
+  GstVaapiParserInfoH265 *const pi = decoder->priv.active_pps;
+
+  return pi ? &pi->data.pps : NULL;
+}
+
+/* Activate the supplied SPS */
+static GstH265SPS *
+ensure_sps (GstVaapiDecoderH265 * decoder, GstH265SPS * sps)
+{
+  GstVaapiDecoderH265Private *const priv = &decoder->priv;
+  GstVaapiParserInfoH265 *const pi = priv->sps[sps->id];
+
+  gst_vaapi_parser_info_h265_replace (&priv->active_sps, pi);
+  return pi ? &pi->data.sps : NULL;
+}
+
+/* Returns the active SPS */
+static inline GstH265SPS *
+get_sps (GstVaapiDecoderH265 * decoder)
+{
+  GstVaapiParserInfoH265 *const pi = decoder->priv.active_sps;
+
+  return pi ? &pi->data.sps : NULL;
+}
+
+/* Activate the supplied VPS */
+static GstH265VPS *
+ensure_vps (GstVaapiDecoderH265 * decoder, GstH265VPS * vps)
+{
+  GstVaapiDecoderH265Private *const priv = &decoder->priv;
+  GstVaapiParserInfoH265 *const pi = priv->vps[vps->id];
+
+  gst_vaapi_parser_info_h265_replace (&priv->active_vps, pi);
+  return pi ? &pi->data.vps : NULL;
+}
+
+/* Returns the active VPS */
+static inline GstH265VPS *
+get_vps (GstVaapiDecoderH265 * decoder)
+{
+  GstVaapiParserInfoH265 *const pi = decoder->priv.active_vps;
+  return pi ? &pi->data.vps : NULL;
+}
+
+/* Get number of reference frames to use */
+static guint
+get_max_dec_frame_buffering (GstH265SPS * sps)
+{
+  guint max_dec_frame_buffering;
+  GstVaapiLevelH265 level;
+  const GstVaapiH265LevelLimits *level_limits;
+
+  level = gst_vaapi_utils_h265_get_level (sps->profile_tier_level.level_idc);
+  level_limits = gst_vaapi_utils_h265_get_level_limits (level);
+  if (G_UNLIKELY (!level_limits)) {
+    GST_FIXME ("unsupported level_idc value (%d)",
+        sps->profile_tier_level.level_idc);
+    max_dec_frame_buffering = 16;
+  }
+  /* Fixme: Add limit check based on Annex A */
+  return MAX (1, (sps->max_dec_pic_buffering_minus1[0] + 1));
+}
+
+static void
+dpb_remove_index (GstVaapiDecoderH265 * decoder, gint index)
+{
+  GstVaapiDecoderH265Private *const priv = &decoder->priv;
+  guint i, num_frames = --priv->dpb_count;
+
+  if (USE_STRICT_DPB_ORDERING) {
+    for (i = index; i < num_frames; i++)
+      gst_vaapi_frame_store_replace (&priv->dpb[i], priv->dpb[i + 1]);
+  } else if (index != num_frames)
+    gst_vaapi_frame_store_replace (&priv->dpb[index], priv->dpb[num_frames]);
+  gst_vaapi_frame_store_replace (&priv->dpb[num_frames], NULL);
+}
+
+static gboolean
+dpb_output (GstVaapiDecoderH265 * decoder, GstVaapiFrameStore * fs)
+{
+  GstVaapiPictureH265 *picture;
+
+  g_return_val_if_fail (fs != NULL, FALSE);
+
+  picture = fs->buffer;
+  g_return_val_if_fail (picture != NULL, FALSE);
+
+  picture->output_needed = FALSE;
+  return gst_vaapi_picture_output (GST_VAAPI_PICTURE_CAST (picture));
+}
+
+/* Get the dpb picture having the specifed poc or poc_lsb */
+static GstVaapiPictureH265 *
+dpb_get_picture (GstVaapiDecoderH265 * decoder, gint poc, gboolean match_lsb)
+{
+  GstVaapiDecoderH265Private *const priv = &decoder->priv;
+  guint i;
+
+  for (i = 0; i < priv->dpb_count; i++) {
+    GstVaapiPictureH265 *const picture = priv->dpb[i]->buffer;
+
+    if (picture && GST_VAAPI_PICTURE_FLAG_IS_SET (picture,
+            GST_VAAPI_PICTURE_FLAGS_REFERENCE)) {
+      if (match_lsb) {
+        if (picture->poc_lsb == poc)
+          return picture;
+      } else {
+        if (picture->poc == poc)
+          return picture;
+      }
+    }
+  }
+  return NULL;
+}
+
+/* Get the dpb picture having the specifed poc and shor/long ref flags */
+static GstVaapiPictureH265 *
+dpb_get_ref_picture (GstVaapiDecoderH265 * decoder, gint poc, gboolean is_short)
+{
+  GstVaapiDecoderH265Private *const priv = &decoder->priv;
+  guint i;
+
+  for (i = 0; i < priv->dpb_count; i++) {
+    GstVaapiPictureH265 *const picture = priv->dpb[i]->buffer;
+
+    if (picture && picture->poc == poc) {
+      if (is_short && GST_VAAPI_PICTURE_IS_SHORT_TERM_REFERENCE (picture))
+        return picture;
+      else if (GST_VAAPI_PICTURE_IS_LONG_TERM_REFERENCE (picture))
+        return picture;
+    }
+  }
+
+  return NULL;
+}
+
+/* Finds the picture with the lowest POC that needs to be output */
+static gint
+dpb_find_lowest_poc (GstVaapiDecoderH265 * decoder,
+    GstVaapiPictureH265 ** found_picture_ptr)
+{
+  GstVaapiDecoderH265Private *const priv = &decoder->priv;
+  GstVaapiPictureH265 *found_picture = NULL;
+  guint i, found_index;
+
+  for (i = 0; i < priv->dpb_count; i++) {
+    GstVaapiPictureH265 *const picture = priv->dpb[i]->buffer;
+    if (picture && !picture->output_needed)
+      continue;
+    if (!found_picture || found_picture->poc > picture->poc)
+      found_picture = picture, found_index = i;
+  }
+
+  if (found_picture_ptr)
+    *found_picture_ptr = found_picture;
+  return found_picture ? found_index : -1;
+}
+
+static gboolean
+dpb_bump (GstVaapiDecoderH265 * decoder, GstVaapiPictureH265 * picture)
+{
+  GstVaapiDecoderH265Private *const priv = &decoder->priv;
+  GstVaapiPictureH265 *found_picture;
+  gint found_index;
+  gboolean success;
+
+  found_index = dpb_find_lowest_poc (decoder, &found_picture);
+  if (found_index < 0)
+    return FALSE;
+
+  success = dpb_output (decoder, priv->dpb[found_index]);
+
+  if (!gst_vaapi_frame_store_has_reference (priv->dpb[found_index]))
+    dpb_remove_index (decoder, found_index);
+
+  return success;
+}
+
+static void
+dpb_clear (GstVaapiDecoderH265 * decoder, gboolean hard_flush)
+{
+  GstVaapiDecoderH265Private *const priv = &decoder->priv;
+  GstVaapiPictureH265 *pic;
+  guint i;
+
+  if (hard_flush) {
+    for (i = 0; i < priv->dpb_count; i++)
+      dpb_remove_index (decoder, i);
+    priv->dpb_count = 0;
+  } else {
+    /* Remove unused pictures from DPB */
+    i = 0;
+    while (i < priv->dpb_count) {
+      GstVaapiFrameStore *const fs = priv->dpb[i];
+      pic = fs->buffer;
+      if (!pic->output_needed && !gst_vaapi_frame_store_has_reference (fs))
+        dpb_remove_index (decoder, i);
+      else
+        i++;
+    }
+  }
+}
+
+static void
+dpb_flush (GstVaapiDecoderH265 * decoder)
+{
+  /* Output any frame remaining in DPB */
+  while (dpb_bump (decoder, NULL));
+  dpb_clear (decoder, TRUE);
+}
+
+static gint
+dpb_get_num_need_output (GstVaapiDecoderH265 * decoder)
+{
+  GstVaapiDecoderH265Private *const priv = &decoder->priv;
+  guint i = 0, n_output_needed = 0;
+
+  while (i < priv->dpb_count) {
+    GstVaapiFrameStore *const fs = priv->dpb[i];
+    if (fs->buffer->output_needed)
+      n_output_needed++;
+    i++;
+  }
+
+  return n_output_needed;
+}
+
+static gboolean
+check_latency_cnt (GstVaapiDecoderH265 * decoder)
+{
+  GstVaapiDecoderH265Private *const priv = &decoder->priv;
+  GstVaapiPictureH265 *tmp_pic;
+  guint i = 0;
+
+  while (i < priv->dpb_count) {
+    GstVaapiFrameStore *const fs = priv->dpb[i];
+    tmp_pic = fs->buffer;
+    if (tmp_pic->output_needed) {
+      if (tmp_pic->pic_latency_cnt >= priv->SpsMaxLatencyPictures)
+        return TRUE;
+    }
+    i++;
+  }
+
+  return FALSE;
+}
+
+static gboolean
+dpb_add (GstVaapiDecoderH265 * decoder, GstVaapiPictureH265 * picture)
+{
+  GstVaapiDecoderH265Private *const priv = &decoder->priv;
+  GstH265SPS *const sps = get_sps (decoder);
+  GstVaapiFrameStore *fs;
+  GstVaapiPictureH265 *tmp_pic;
+  guint i = 0;
+
+  /* C.5.2.3 */
+  while (i < priv->dpb_count) {
+    GstVaapiFrameStore *const fs = priv->dpb[i];
+    tmp_pic = fs->buffer;
+    if (tmp_pic->output_needed)
+      tmp_pic->pic_latency_cnt += 1;
+    i++;
+  }
+
+  if (picture->output_flag) {
+    picture->output_needed = 1;
+    picture->pic_latency_cnt = 0;
+  } else
+    picture->output_needed = 0;
+
+  /* set pic as short_term_ref */
+  gst_vaapi_picture_h265_set_reference (picture,
+      GST_VAAPI_PICTURE_FLAG_SHORT_TERM_REFERENCE);
+
+  /* C.5.2.4 "Bumping" process */
+  while ((dpb_get_num_need_output (decoder) >
+          sps->max_num_reorder_pics[sps->max_sub_layers_minus1])
+      || (sps->max_latency_increase_plus1[sps->max_sub_layers_minus1]
+          && check_latency_cnt (decoder)))
+    dpb_bump (decoder, picture);
+
+  /* Create new frame store */
+  fs = gst_vaapi_frame_store_new (picture);
+  if (!fs)
+    return FALSE;
+  gst_vaapi_frame_store_replace (&priv->dpb[priv->dpb_count++], fs);
+  gst_vaapi_frame_store_unref (fs);
+
+  return TRUE;
+}
+
+
+/* C.5.2.2 */
+static gboolean
+dpb_init (GstVaapiDecoderH265 * decoder, GstVaapiPictureH265 * picture,
+    GstVaapiParserInfoH265 * pi)
+{
+  GstVaapiDecoderH265Private *const priv = &decoder->priv;
+  GstH265SliceHdr *const slice_hdr = &pi->data.slice_hdr;
+  GstH265SPS *const sps = get_sps (decoder);
+
+  if (nal_is_irap (pi->nalu.type)
+      && picture->NoRaslOutputFlag && !priv->new_bitstream) {
+
+    if (pi->nalu.type == GST_H265_NAL_SLICE_CRA_NUT)
+      picture->NoOutputOfPriorPicsFlag = 1;
+    else
+      picture->NoOutputOfPriorPicsFlag =
+          slice_hdr->no_output_of_prior_pics_flag;
+
+    if (picture->NoOutputOfPriorPicsFlag)
+      dpb_clear (decoder, TRUE);
+    else {
+      dpb_clear (decoder, FALSE);
+      while (dpb_bump (decoder, NULL));
+    }
+  } else {
+    dpb_clear (decoder, FALSE);
+    while ((dpb_get_num_need_output (decoder) >
+            sps->max_num_reorder_pics[sps->max_sub_layers_minus1])
+        || (sps->max_latency_increase_plus1[sps->max_sub_layers_minus1]
+            && check_latency_cnt (decoder))
+        || (priv->dpb_count >=
+            (sps->max_dec_pic_buffering_minus1[sps->max_sub_layers_minus1] +
+                1))) {
+      dpb_bump (decoder, picture);
+    }
+  }
+
+  return TRUE;
+}
+
+static gboolean
+dpb_reset (GstVaapiDecoderH265 * decoder, guint dpb_size)
+{
+  GstVaapiDecoderH265Private *const priv = &decoder->priv;
+
+  if (dpb_size > priv->dpb_size_max) {
+    priv->dpb = g_try_realloc_n (priv->dpb, dpb_size, sizeof (*priv->dpb));
+    if (!priv->dpb)
+      return FALSE;
+    memset (&priv->dpb[priv->dpb_size_max], 0,
+        (dpb_size - priv->dpb_size_max) * sizeof (*priv->dpb));
+    priv->dpb_size_max = dpb_size;
+  }
+  priv->dpb_size = dpb_size;
+  GST_DEBUG ("DPB size %u", priv->dpb_size);
+  return TRUE;
+}
+
+static GstVaapiDecoderStatus
+get_status (GstH265ParserResult result)
+{
+  GstVaapiDecoderStatus status;
+
+  switch (result) {
+    case GST_H265_PARSER_OK:
+      status = GST_VAAPI_DECODER_STATUS_SUCCESS;
+      break;
+    case GST_H265_PARSER_NO_NAL_END:
+      status = GST_VAAPI_DECODER_STATUS_ERROR_NO_DATA;
+      break;
+    case GST_H265_PARSER_ERROR:
+      status = GST_VAAPI_DECODER_STATUS_ERROR_BITSTREAM_PARSER;
+      break;
+    default:
+      status = GST_VAAPI_DECODER_STATUS_ERROR_UNKNOWN;
+      break;
+  }
+  return status;
+}
+
+static void
+gst_vaapi_decoder_h265_close (GstVaapiDecoderH265 * decoder)
+{
+  GstVaapiDecoderH265Private *const priv = &decoder->priv;
+
+  gst_vaapi_picture_replace (&priv->current_picture, NULL);
+  gst_vaapi_parser_info_h265_replace (&priv->prev_slice_pi, NULL);
+  gst_vaapi_parser_info_h265_replace (&priv->prev_independent_slice_pi, NULL);
+  gst_vaapi_parser_info_h265_replace (&priv->prev_pi, NULL);
+
+  dpb_clear (decoder, TRUE);
+
+  if (priv->parser) {
+    gst_h265_parser_free (priv->parser);
+    priv->parser = NULL;
+  }
+}
+
+static gboolean
+gst_vaapi_decoder_h265_open (GstVaapiDecoderH265 * decoder)
+{
+  GstVaapiDecoderH265Private *const priv = &decoder->priv;
+
+  gst_vaapi_decoder_h265_close (decoder);
+  priv->parser = gst_h265_parser_new ();
+  if (!priv->parser)
+    return FALSE;
+  return TRUE;
+}
+
+static void
+gst_vaapi_decoder_h265_destroy (GstVaapiDecoder * base_decoder)
+{
+  GstVaapiDecoderH265 *const decoder =
+      GST_VAAPI_DECODER_H265_CAST (base_decoder);
+  GstVaapiDecoderH265Private *const priv = &decoder->priv;
+  guint i;
+
+  gst_vaapi_decoder_h265_close (decoder);
+  g_free (priv->dpb);
+  priv->dpb = NULL;
+  priv->dpb_size = 0;
+  for (i = 0; i < G_N_ELEMENTS (priv->pps); i++)
+    gst_vaapi_parser_info_h265_replace (&priv->pps[i], NULL);
+  gst_vaapi_parser_info_h265_replace (&priv->active_pps, NULL);
+  for (i = 0; i < G_N_ELEMENTS (priv->sps); i++)
+    gst_vaapi_parser_info_h265_replace (&priv->sps[i], NULL);
+  gst_vaapi_parser_info_h265_replace (&priv->active_sps, NULL);
+  for (i = 0; i < G_N_ELEMENTS (priv->vps); i++)
+    gst_vaapi_parser_info_h265_replace (&priv->vps[i], NULL);
+  gst_vaapi_parser_info_h265_replace (&priv->active_vps, NULL);
+}
+
+static gboolean
+gst_vaapi_decoder_h265_create (GstVaapiDecoder * base_decoder)
+{
+  GstVaapiDecoderH265 *const decoder =
+      GST_VAAPI_DECODER_H265_CAST (base_decoder);
+  GstVaapiDecoderH265Private *const priv = &decoder->priv;
+
+  priv->profile = GST_VAAPI_PROFILE_UNKNOWN;
+  priv->entrypoint = GST_VAAPI_ENTRYPOINT_VLD;
+  priv->chroma_type = GST_VAAPI_CHROMA_TYPE_YUV420;
+  priv->progressive_sequence = TRUE;
+  priv->new_bitstream = TRUE;
+  priv->prev_nal_is_eos = FALSE;
+  return TRUE;
+}
+
+
+static void
+fill_profiles (GstVaapiProfile profiles[16], guint * n_profiles_ptr,
+    GstVaapiProfile profile)
+{
+  guint n_profiles = *n_profiles_ptr;
+
+  profiles[n_profiles++] = profile;
+  switch (profile) {
+    case GST_VAAPI_PROFILE_H265_MAIN:
+      profiles[n_profiles++] = GST_VAAPI_PROFILE_H265_MAIN10;
+      break;
+    case GST_VAAPI_PROFILE_H265_MAIN_STILL_PICTURE:
+      profiles[n_profiles++] = GST_VAAPI_PROFILE_H265_MAIN;
+      profiles[n_profiles++] = GST_VAAPI_PROFILE_H265_MAIN10;
+      break;
+    default:
+      break;
+  }
+  *n_profiles_ptr = n_profiles;
+}
+
+static GstVaapiProfile
+get_profile (GstVaapiDecoderH265 * decoder, GstH265SPS * sps, guint dpb_size)
+{
+  GstVaapiDecoderH265Private *const priv = &decoder->priv;
+  GstVaapiDisplay *const display = GST_VAAPI_DECODER_DISPLAY (decoder);
+  GstVaapiProfile profile, profiles[3];
+  guint i, n_profiles = 0;
+
+  profile =
+      gst_vaapi_utils_h265_get_profile (sps->profile_tier_level.profile_idc);
+  if (!profile)
+    return GST_VAAPI_PROFILE_UNKNOWN;
+  fill_profiles (profiles, &n_profiles, profile);
+  switch (profile) {
+    case GST_VAAPI_PROFILE_H265_MAIN10:
+      if (sps->profile_tier_level.profile_compatibility_flag[1]) {      // A.2.3.2 (main profile)
+        fill_profiles (profiles, &n_profiles, GST_VAAPI_PROFILE_H265_MAIN);
+      }
+      break;
+    default:
+      break;
+  }
+
+  /* If the preferred profile (profiles[0]) matches one that we already
+     found, then just return it now instead of searching for it again */
+  if (profiles[0] == priv->profile)
+    return priv->profile;
+  for (i = 0; i < n_profiles; i++) {
+    if (gst_vaapi_display_has_decoder (display, profiles[i], priv->entrypoint))
+      return profiles[i];
+  }
+  return GST_VAAPI_PROFILE_UNKNOWN;
+}
+
+static GstVaapiDecoderStatus
+ensure_context (GstVaapiDecoderH265 * decoder, GstH265SPS * sps)
+{
+  GstVaapiDecoder *const base_decoder = GST_VAAPI_DECODER_CAST (decoder);
+  GstVaapiDecoderH265Private *const priv = &decoder->priv;
+  GstVaapiContextInfo info;
+  GstVaapiProfile profile;
+  GstVaapiChromaType chroma_type;
+  gboolean reset_context = FALSE;
+  guint dpb_size;
+
+  dpb_size = get_max_dec_frame_buffering (sps);
+  if (priv->dpb_size < dpb_size) {
+    GST_DEBUG ("DPB size increased");
+    reset_context = TRUE;
+  }
+
+  profile = get_profile (decoder, sps, dpb_size);
+  if (!profile) {
+    GST_ERROR ("unsupported profile_idc %u",
+        sps->profile_tier_level.profile_idc);
+    return GST_VAAPI_DECODER_STATUS_ERROR_UNSUPPORTED_PROFILE;
+  }
+
+  if (!priv->profile || (priv->profile != profile)) {
+    GST_DEBUG ("profile changed");
+    reset_context = TRUE;
+    priv->profile = profile;
+  }
+
+  chroma_type = gst_vaapi_utils_h265_get_chroma_type (sps->chroma_format_idc);
+  if (!chroma_type) {
+    GST_ERROR ("unsupported chroma_format_idc %u", sps->chroma_format_idc);
+    return GST_VAAPI_DECODER_STATUS_ERROR_UNSUPPORTED_CHROMA_FORMAT;
+  }
+
+  if (priv->chroma_type != chroma_type) {
+    GST_DEBUG ("chroma format changed");
+    reset_context = TRUE;
+    priv->chroma_type = chroma_type;
+  }
+
+  if (priv->pic_width_in_luma_samples != sps->pic_width_in_luma_samples ||
+      priv->pic_height_in_luma_samples != sps->pic_height_in_luma_samples) {
+    GST_DEBUG ("size changed");
+    reset_context = TRUE;
+    priv->pic_width_in_luma_samples = sps->pic_width_in_luma_samples;
+    priv->pic_height_in_luma_samples = sps->pic_height_in_luma_samples;
+  }
+
+  priv->progressive_sequence = 1;       /*Fixme */
+  gst_vaapi_decoder_set_interlaced (base_decoder, !priv->progressive_sequence);
+  gst_vaapi_decoder_set_pixel_aspect_ratio (base_decoder,
+      sps->vui_params.par_n, sps->vui_params.par_d);
+  if (!reset_context && priv->has_context)
+    return GST_VAAPI_DECODER_STATUS_SUCCESS;
+
+  /* XXX: fix surface size when cropping is implemented */
+  info.profile = priv->profile;
+  info.entrypoint = priv->entrypoint;
+  info.chroma_type = priv->chroma_type;
+  info.width = sps->width;
+  info.height = sps->height;
+  info.ref_frames = dpb_size;
+
+  if (!gst_vaapi_decoder_ensure_context (GST_VAAPI_DECODER (decoder), &info))
+    return GST_VAAPI_DECODER_STATUS_ERROR_UNKNOWN;
+  priv->has_context = TRUE;
+
+  /* Reset DPB */
+  if (!dpb_reset (decoder, dpb_size))
+    return GST_VAAPI_DECODER_STATUS_ERROR_ALLOCATION_FAILED;
+
+  return GST_VAAPI_DECODER_STATUS_SUCCESS;
+}
+
+static void
+fill_iq_matrix_4x4 (VAIQMatrixBufferHEVC * iq_matrix,
+    GstH265ScalingList * scaling_list)
+{
+  guint i;
+
+  g_assert (G_N_ELEMENTS (iq_matrix->ScalingList4x4) == 6);
+  g_assert (G_N_ELEMENTS (iq_matrix->ScalingList4x4[0]) == 16);
+  for (i = 0; i < G_N_ELEMENTS (iq_matrix->ScalingList4x4); i++) {
+    gst_h265_quant_matrix_4x4_get_raster_from_zigzag (iq_matrix->ScalingList4x4
+        [i], scaling_list->scaling_lists_4x4[i]);
+  }
+}
+
+static void
+fill_iq_matrix_8x8 (VAIQMatrixBufferHEVC * iq_matrix,
+    GstH265ScalingList * scaling_list)
+{
+  guint i;
+
+  g_assert (G_N_ELEMENTS (iq_matrix->ScalingList8x8) == 6);
+  g_assert (G_N_ELEMENTS (iq_matrix->ScalingList8x8[0]) == 64);
+  for (i = 0; i < G_N_ELEMENTS (iq_matrix->ScalingList8x8); i++) {
+    gst_h265_quant_matrix_8x8_get_raster_from_zigzag (iq_matrix->ScalingList8x8
+        [i], scaling_list->scaling_lists_8x8[i]);
+  }
+}
+
+static void
+fill_iq_matrix_16x16 (VAIQMatrixBufferHEVC * iq_matrix,
+    GstH265ScalingList * scaling_list)
+{
+  guint i;
+
+  g_assert (G_N_ELEMENTS (iq_matrix->ScalingList16x16) == 6);
+  g_assert (G_N_ELEMENTS (iq_matrix->ScalingList16x16[0]) == 64);
+  for (i = 0; i < G_N_ELEMENTS (iq_matrix->ScalingList16x16); i++) {
+    gst_h265_quant_matrix_16x16_get_raster_from_zigzag
+        (iq_matrix->ScalingList16x16[i], scaling_list->scaling_lists_16x16[i]);
+  }
+}
+
+static void
+fill_iq_matrix_32x32 (VAIQMatrixBufferHEVC * iq_matrix,
+    GstH265ScalingList * scaling_list)
+{
+  guint i;
+
+  g_assert (G_N_ELEMENTS (iq_matrix->ScalingList32x32) == 2);
+  g_assert (G_N_ELEMENTS (iq_matrix->ScalingList32x32[0]) == 64);
+  for (i = 0; i < G_N_ELEMENTS (iq_matrix->ScalingList32x32); i++) {
+    gst_h265_quant_matrix_32x32_get_raster_from_zigzag
+        (iq_matrix->ScalingList32x32[i], scaling_list->scaling_lists_32x32[i]);
+  }
+}
+
+static void
+fill_iq_matrix_dc_16x16 (VAIQMatrixBufferHEVC * iq_matrix,
+    GstH265ScalingList * scaling_list)
+{
+  guint i;
+
+  for (i = 0; i < 6; i++)
+    iq_matrix->ScalingListDC16x16[i] =
+        scaling_list->scaling_list_dc_coef_minus8_16x16[i] + 8;
+}
+
+static void
+fill_iq_matrix_dc_32x32 (VAIQMatrixBufferHEVC * iq_matrix,
+    GstH265ScalingList * scaling_list)
+{
+  guint i;
+
+  for (i = 0; i < 2; i++)
+    iq_matrix->ScalingListDC32x32[i] =
+        scaling_list->scaling_list_dc_coef_minus8_32x32[i] + 8;
+}
+
+static GstVaapiDecoderStatus
+ensure_quant_matrix (GstVaapiDecoderH265 * decoder,
+    GstVaapiPictureH265 * picture)
+{
+  GstVaapiPicture *const base_picture = &picture->base;
+  GstH265PPS *const pps = get_pps (decoder);
+  GstH265SPS *const sps = get_sps (decoder);
+  GstH265ScalingList *scaling_list = NULL;
+  VAIQMatrixBufferHEVC *iq_matrix;
+
+  if (pps &&
+      (pps->scaling_list_data_present_flag ||
+          (sps->scaling_list_enabled_flag
+              && !sps->scaling_list_data_present_flag)))
+    scaling_list = &pps->scaling_list;
+  else if (sps && sps->scaling_list_enabled_flag
+      && sps->scaling_list_data_present_flag)
+    scaling_list = &sps->scaling_list;
+  else
+    return GST_VAAPI_DECODER_STATUS_SUCCESS;
+
+  base_picture->iq_matrix = GST_VAAPI_IQ_MATRIX_NEW (HEVC, decoder);
+  if (!base_picture->iq_matrix) {
+    GST_ERROR ("failed to allocate IQ matrix");
+    return GST_VAAPI_DECODER_STATUS_ERROR_ALLOCATION_FAILED;
+  }
+  iq_matrix = base_picture->iq_matrix->param;
+
+  /* Only supporting 4:2:0 */
+  if (sps->chroma_format_idc != 1)
+    return GST_VAAPI_DECODER_STATUS_ERROR_UNSUPPORTED_CHROMA_FORMAT;
+
+  fill_iq_matrix_4x4 (iq_matrix, scaling_list);
+  fill_iq_matrix_8x8 (iq_matrix, scaling_list);
+  fill_iq_matrix_16x16 (iq_matrix, scaling_list);
+  fill_iq_matrix_32x32 (iq_matrix, scaling_list);
+  fill_iq_matrix_dc_16x16 (iq_matrix, scaling_list);
+  fill_iq_matrix_dc_32x32 (iq_matrix, scaling_list);
+
+  return GST_VAAPI_DECODER_STATUS_SUCCESS;
+}
+
+static inline gboolean
+is_valid_state (guint state, guint ref_state)
+{
+  return (state & ref_state) == ref_state;
+}
+
+static GstVaapiDecoderStatus
+decode_current_picture (GstVaapiDecoderH265 * decoder)
+{
+  GstVaapiDecoderH265Private *const priv = &decoder->priv;
+  GstVaapiPictureH265 *const picture = priv->current_picture;
+
+  if (!is_valid_state (priv->decoder_state, GST_H265_VIDEO_STATE_VALID_PICTURE)) {
+    goto drop_frame;
+  }
+
+  priv->decoder_state = 0;
+  /*Fixme: Use SEI header values */
+  priv->pic_structure = GST_VAAPI_PICTURE_STRUCTURE_FRAME;
+
+  if (!picture)
+    return GST_VAAPI_DECODER_STATUS_SUCCESS;
+
+  if (!gst_vaapi_picture_decode (GST_VAAPI_PICTURE_CAST (picture)))
+    goto error;
+
+  if (!dpb_add (decoder, picture))
+    goto error;
+
+  gst_vaapi_picture_replace (&priv->current_picture, NULL);
+  return GST_VAAPI_DECODER_STATUS_SUCCESS;
+
+error:
+  gst_vaapi_picture_replace (&priv->current_picture, NULL);
+  return GST_VAAPI_DECODER_STATUS_ERROR_UNKNOWN;
+drop_frame:
+  priv->decoder_state = 0;
+  priv->pic_structure = GST_VAAPI_PICTURE_STRUCTURE_FRAME;
+  return (GstVaapiDecoderStatus) GST_VAAPI_DECODER_STATUS_DROP_FRAME;
+}
+
+static GstVaapiDecoderStatus
+parse_vps (GstVaapiDecoderH265 * decoder, GstVaapiDecoderUnit * unit)
+{
+  GstVaapiDecoderH265Private *const priv = &decoder->priv;
+  GstVaapiParserInfoH265 *const pi = unit->parsed_info;
+  GstH265VPS *const vps = &pi->data.vps;
+  GstH265ParserResult result;
+
+  GST_DEBUG ("parse VPS");
+  priv->parser_state = 0;
+
+  memset (vps, 0, sizeof (GstH265VPS));
+
+  result = gst_h265_parser_parse_vps (priv->parser, &pi->nalu, vps);
+  if (result != GST_H265_PARSER_OK)
+    return get_status (result);
+
+  priv->parser_state |= GST_H265_VIDEO_STATE_GOT_VPS;
+  return GST_VAAPI_DECODER_STATUS_SUCCESS;
+}
+
+static GstVaapiDecoderStatus
+parse_sps (GstVaapiDecoderH265 * decoder, GstVaapiDecoderUnit * unit)
+{
+  GstVaapiDecoderH265Private *const priv = &decoder->priv;
+  GstVaapiParserInfoH265 *const pi = unit->parsed_info;
+  GstH265SPS *const sps = &pi->data.sps;
+  GstH265ParserResult result;
+
+  GST_DEBUG ("parse SPS");
+  priv->parser_state = 0;
+
+  memset (sps, 0, sizeof (GstH265SPS));
+
+  result = gst_h265_parser_parse_sps (priv->parser, &pi->nalu, sps, TRUE);
+  if (result != GST_H265_PARSER_OK)
+    return get_status (result);
+
+  priv->parser_state |= GST_H265_VIDEO_STATE_GOT_SPS;
+  return GST_VAAPI_DECODER_STATUS_SUCCESS;
+}
+
+static void
+get_pic_width_height_in_ctbs (GstH265PPS * pps,
+    guint * PicWidthInCtbsY, guint * PicHeightInCtbsY)
+{
+  gint MinCbLog2SizeY, CtbLog2SizeY, MinCbSizeY, CtbSizeY;
+  GstH265SPS *sps = pps->sps;
+
+  MinCbLog2SizeY = sps->log2_min_luma_coding_block_size_minus3 + 3;
+  CtbLog2SizeY = MinCbLog2SizeY + sps->log2_diff_max_min_luma_coding_block_size;
+  MinCbSizeY = 1 << MinCbLog2SizeY;
+  CtbSizeY = 1 << CtbLog2SizeY;
+
+  *PicWidthInCtbsY =
+      ceil ((double) sps->pic_width_in_luma_samples / (double) CtbSizeY);
+  *PicHeightInCtbsY =
+      ceil ((double) sps->pic_height_in_luma_samples / (double) CtbSizeY);
+}
+
+static GstVaapiDecoderStatus
+parse_pps (GstVaapiDecoderH265 * decoder, GstVaapiDecoderUnit * unit)
+{
+  GstVaapiDecoderH265Private *const priv = &decoder->priv;
+  GstVaapiParserInfoH265 *const pi = unit->parsed_info;
+  GstH265PPS *const pps = &pi->data.pps;
+  GstH265ParserResult result;
+  guint col_width[19], row_height[21];
+
+  GST_DEBUG ("parse PPS");
+  priv->parser_state &= GST_H265_VIDEO_STATE_GOT_SPS;
+
+  memset (col_width, 0, sizeof (col_width));
+  memset (row_height, 0, sizeof (row_height));
+
+  memset (pps, 0, sizeof (GstH265PPS));
+
+  result = gst_h265_parser_parse_pps (priv->parser, &pi->nalu, pps);
+  if (result != GST_H265_PARSER_OK)
+    return get_status (result);
+
+  if (pps->tiles_enabled_flag) {
+    guint i;
+    guint PicWidthInCtbsY, PicHeightInCtbsY;
+
+    get_pic_width_height_in_ctbs (pps, &PicWidthInCtbsY, &PicHeightInCtbsY);
+    GST_DEBUG ("PicWidthInCtbsY %d PicHeightInCtbsY %d", PicWidthInCtbsY,
+        PicHeightInCtbsY);
+
+    /* Tile Scanning Conversion 6-3 and 6-4 */
+    if (pps->uniform_spacing_flag) {
+
+      for (i = 0; i <= pps->num_tile_columns_minus1; i++)
+        col_width[i] =
+            ((i + 1) * PicWidthInCtbsY) / (pps->num_tile_columns_minus1 + 1) -
+            (i * PicWidthInCtbsY) / (pps->num_tile_columns_minus1 + 1);
+
+      for (i = 0; i <= pps->num_tile_rows_minus1; i++)
+        row_height[i] =
+            ((i + 1) * PicHeightInCtbsY) / (pps->num_tile_rows_minus1 + 1) -
+            (i * PicHeightInCtbsY) / (pps->num_tile_rows_minus1 + 1);
+
+    } else {
+
+      col_width[pps->num_tile_columns_minus1] = PicWidthInCtbsY;
+      for (i = 0; i < pps->num_tile_columns_minus1; i++) {
+        col_width[i] = pps->column_width_minus1[i] + 1;
+        col_width[pps->num_tile_columns_minus1] -= col_width[i];
+      }
+
+      row_height[pps->num_tile_rows_minus1] = PicHeightInCtbsY;
+      for (i = 0; i < pps->num_tile_rows_minus1; i++) {
+        row_height[i] = pps->row_height_minus1[i] + 1;
+        row_height[pps->num_tile_rows_minus1] -= row_height[i];
+      }
+    }
+    for (i = 0; i <= pps->num_tile_columns_minus1; i++)
+      pps->column_width_minus1[i] = col_width[i] - 1;
+    for (i = 0; i <= pps->num_tile_rows_minus1; i++)
+      pps->row_height_minus1[i] = row_height[i] - 1;
+  }
+
+  priv->parser_state |= GST_H265_VIDEO_STATE_GOT_PPS;
+  return GST_VAAPI_DECODER_STATUS_SUCCESS;
+}
+
+static GstVaapiDecoderStatus
+parse_sei (GstVaapiDecoderH265 * decoder, GstVaapiDecoderUnit * unit)
+{
+  GST_FIXME ("Parse SEI, Not implemented !");
+#if 0
+  GstVaapiDecoderH265Private *const priv = &decoder->priv;
+  GstVaapiParserInfoH265 *const pi = unit->parsed_info;
+  GstH265SEIMessage *sei = &pi->data.sei;
+  GstH265ParserResult result;
+  GST_DEBUG ("parse SEI");
+  result = gst_h265_parser_parse_sei (priv->parser, &pi->nalu, sei);
+  if (result != GST_H265_PARSER_OK) {
+    GST_WARNING ("failed to parse SEI messages");
+    return get_status (result);
+  }
+#endif
+  return GST_VAAPI_DECODER_STATUS_SUCCESS;
+}
+
+static GstVaapiDecoderStatus
+parse_slice (GstVaapiDecoderH265 * decoder, GstVaapiDecoderUnit * unit)
+{
+  GstVaapiDecoderH265Private *const priv = &decoder->priv;
+  GstVaapiParserInfoH265 *const pi = unit->parsed_info;
+  GstH265SliceHdr *const slice_hdr = &pi->data.slice_hdr;
+  GstH265ParserResult result;
+
+  GST_DEBUG ("parse slice");
+  priv->parser_state &= (GST_H265_VIDEO_STATE_GOT_SPS |
+      GST_H265_VIDEO_STATE_GOT_PPS);
+
+  slice_hdr->short_term_ref_pic_set_idx = 0;
+
+  memset (slice_hdr, 0, sizeof (GstH265SliceHdr));
+
+  result = gst_h265_parser_parse_slice_hdr (priv->parser, &pi->nalu, slice_hdr);
+  if (result != GST_H265_PARSER_OK)
+    return get_status (result);
+
+  priv->parser_state |= GST_H265_VIDEO_STATE_GOT_SLICE;
+  return GST_VAAPI_DECODER_STATUS_SUCCESS;
+}
+
+static GstVaapiDecoderStatus
+decode_vps (GstVaapiDecoderH265 * decoder, GstVaapiDecoderUnit * unit)
+{
+  GstVaapiDecoderH265Private *const priv = &decoder->priv;
+  GstVaapiParserInfoH265 *const pi = unit->parsed_info;
+  GstH265VPS *const vps = &pi->data.vps;
+
+  GST_DEBUG ("decode VPS");
+
+  gst_vaapi_parser_info_h265_replace (&priv->vps[vps->id], pi);
+
+  return GST_VAAPI_DECODER_STATUS_SUCCESS;
+}
+
+static GstVaapiDecoderStatus
+decode_sps (GstVaapiDecoderH265 * decoder, GstVaapiDecoderUnit * unit)
+{
+  GstVaapiDecoderH265Private *const priv = &decoder->priv;
+  GstVaapiParserInfoH265 *const pi = unit->parsed_info;
+  GstH265SPS *const sps = &pi->data.sps;
+
+  GST_DEBUG ("decode SPS");
+
+  if (sps->max_latency_increase_plus1[sps->max_sub_layers_minus1])
+    priv->SpsMaxLatencyPictures =
+        sps->max_num_reorder_pics[sps->max_sub_layers_minus1] +
+        sps->max_latency_increase_plus1[sps->max_sub_layers_minus1] - 1;
+
+  gst_vaapi_parser_info_h265_replace (&priv->sps[sps->id], pi);
+
+  return GST_VAAPI_DECODER_STATUS_SUCCESS;
+}
+
+static GstVaapiDecoderStatus
+decode_pps (GstVaapiDecoderH265 * decoder, GstVaapiDecoderUnit * unit)
+{
+  GstVaapiDecoderH265Private *const priv = &decoder->priv;
+  GstVaapiParserInfoH265 *const pi = unit->parsed_info;
+  GstH265PPS *const pps = &pi->data.pps;
+
+  GST_DEBUG ("decode PPS");
+
+  gst_vaapi_parser_info_h265_replace (&priv->pps[pps->id], pi);
+
+  return GST_VAAPI_DECODER_STATUS_SUCCESS;
+}
+
+static GstVaapiDecoderStatus
+decode_sei (GstVaapiDecoderH265 * decoder, GstVaapiDecoderUnit * unit)
+{
+  GST_FIXME ("Decode SEI, Not implemented!");
+#if 0
+  GstVaapiDecoderH265Private *const priv = &decoder->priv;
+  GstVaapiParserInfoH265 *const pi = unit->parsed_info;
+  GstH265SEIMessage *sei = &pi->data.sei;
+  guint i;
+  GST_DEBUG ("decode SEI messages");
+  switch (sei->payloadType) {
+    case GST_H265_SEI_PIC_TIMING:{
+      GstH265PicTiming *pic_timing = &sei->payload.pic_timing;
+      /* Fix: only if vps->frame_field_info_present_flag */
+      priv->pic_structure = pic_timing->pic_struct;
+      break;
+    }
+    default:
+      break;
+  }
+#endif
+  return GST_VAAPI_DECODER_STATUS_SUCCESS;
+}
+
+static GstVaapiDecoderStatus
+decode_sequence_end (GstVaapiDecoderH265 * decoder)
+{
+  GstVaapiDecoderStatus status;
+
+  GST_DEBUG ("decode sequence-end");
+
+  status = decode_current_picture (decoder);
+  if (status != GST_VAAPI_DECODER_STATUS_SUCCESS)
+    return status;
+
+  dpb_flush (decoder);
+  return GST_VAAPI_DECODER_STATUS_SUCCESS;
+}
+
+/* 8.3.1 - Decoding process for picture order count */
+static void
+init_picture_poc (GstVaapiDecoderH265 * decoder,
+    GstVaapiPictureH265 * picture, GstVaapiParserInfoH265 * pi)
+{
+  GstVaapiDecoderH265Private *const priv = &decoder->priv;
+  GstH265SliceHdr *const slice_hdr = &pi->data.slice_hdr;
+  GstH265SPS *const sps = get_sps (decoder);
+  const gint32 MaxPicOrderCntLsb =
+      1 << (sps->log2_max_pic_order_cnt_lsb_minus4 + 4);
+  guint8 nal_type = pi->nalu.type;
+  guint8 temporal_id = pi->nalu.temporal_id_plus1 - 1;
+
+  GST_DEBUG ("decode PicOrderCntVal");
+
+  priv->prev_poc_lsb = priv->poc_lsb;
+  priv->prev_poc_msb = priv->poc_msb;
+
+  if (!(nal_is_irap (nal_type) && picture->NoRaslOutputFlag)) {
+    priv->prev_poc_lsb = priv->prev_tid0pic_poc_lsb;
+    priv->prev_poc_msb = priv->prev_tid0pic_poc_msb;
+  }
+
+  /* Finding PicOrderCntMsb */
+  if (nal_is_irap (nal_type) && picture->NoRaslOutputFlag)
+    priv->poc_msb = 0;
+  else {
+    /* (8-1) */
+    if ((slice_hdr->pic_order_cnt_lsb < priv->prev_poc_lsb) &&
+        ((priv->prev_poc_lsb - slice_hdr->pic_order_cnt_lsb) >=
+            (MaxPicOrderCntLsb / 2)))
+      priv->poc_msb = priv->prev_poc_msb + MaxPicOrderCntLsb;
+
+    else if ((slice_hdr->pic_order_cnt_lsb > priv->prev_poc_lsb) &&
+        ((slice_hdr->pic_order_cnt_lsb - priv->prev_poc_lsb) >
+            (MaxPicOrderCntLsb / 2)))
+      priv->poc_msb = priv->prev_poc_msb - MaxPicOrderCntLsb;
+
+    else
+      priv->poc_msb = priv->prev_poc_msb;
+  }
+
+  /* (8-2) */
+  priv->poc = picture->poc = priv->poc_msb + slice_hdr->pic_order_cnt_lsb;
+  priv->poc_lsb = picture->poc_lsb = slice_hdr->pic_order_cnt_lsb;
+
+  if (nal_is_idr (nal_type)) {
+    picture->poc = 0;
+    picture->poc_lsb = 0;
+    priv->poc_lsb = 0;
+    priv->poc_msb = 0;
+    priv->prev_poc_lsb = 0;
+    priv->prev_poc_msb = 0;
+    priv->prev_tid0pic_poc_lsb = 0;
+    priv->prev_tid0pic_poc_msb = 0;
+  }
+
+  picture->base.poc = picture->poc;
+  GST_DEBUG ("PicOrderCntVal %d", picture->base.poc);
+
+  if (!temporal_id && !nal_is_rasl (nal_type) &&
+      !nal_is_radl (nal_type) && nal_is_ref (nal_type)) {
+    priv->prev_tid0pic_poc_lsb = slice_hdr->pic_order_cnt_lsb;
+    priv->prev_tid0pic_poc_msb = priv->poc_msb;
+  }
+}
+
+static void
+init_picture_refs (GstVaapiDecoderH265 * decoder,
+    GstVaapiPictureH265 * picture, GstH265SliceHdr * slice_hdr)
+{
+  GstVaapiDecoderH265Private *const priv = &decoder->priv;
+  guint32 NumRpsCurrTempList0 = 0, NumRpsCurrTempList1 = 0;
+  GstVaapiPictureH265 *RefPicListTemp0[16] = { NULL, }, *RefPicListTemp1[16] = {
+  NULL,};
+  guint i, rIdx = 0;
+  guint num_ref_idx_l0_active_minus1 = 0;
+  guint num_ref_idx_l1_active_minus1 = 0;
+  GstH265RefPicListModification *ref_pic_list_modification;
+  guint type;
+
+  memset (priv->RefPicList0, 0, sizeof (GstVaapiPictureH265 *) * 16);
+  memset (priv->RefPicList1, 0, sizeof (GstVaapiPictureH265 *) * 16);
+  priv->RefPicList0_count = priv->RefPicList1_count = 0;
+
+  if ((slice_hdr->type != GST_H265_B_SLICE) &&
+      (slice_hdr->type != GST_H265_P_SLICE))
+    return;
+
+  if (slice_hdr->dependent_slice_segment_flag) {
+    GstH265SliceHdr *tmp = &priv->prev_independent_slice_pi->data.slice_hdr;
+    num_ref_idx_l0_active_minus1 = tmp->num_ref_idx_l0_active_minus1;
+    num_ref_idx_l1_active_minus1 = tmp->num_ref_idx_l1_active_minus1;
+    ref_pic_list_modification = &tmp->ref_pic_list_modification;
+    type = tmp->type;
+  } else {
+    num_ref_idx_l0_active_minus1 = slice_hdr->num_ref_idx_l0_active_minus1;
+    num_ref_idx_l1_active_minus1 = slice_hdr->num_ref_idx_l1_active_minus1;
+    ref_pic_list_modification = &slice_hdr->ref_pic_list_modification;
+    type = slice_hdr->type;
+  }
+
+  NumRpsCurrTempList0 =
+      MAX ((num_ref_idx_l0_active_minus1 + 1), priv->NumPocTotalCurr);
+  NumRpsCurrTempList1 =
+      MAX ((num_ref_idx_l1_active_minus1 + 1), priv->NumPocTotalCurr);
+
+  /* (8-8) */
+  while (rIdx < NumRpsCurrTempList0) {
+    for (i = 0; i < priv->NumPocStCurrBefore && rIdx < NumRpsCurrTempList0;
+        rIdx++, i++)
+      RefPicListTemp0[rIdx] = priv->RefPicSetStCurrBefore[i];
+    for (i = 0; i < priv->NumPocStCurrAfter && rIdx < NumRpsCurrTempList0;
+        rIdx++, i++)
+      RefPicListTemp0[rIdx] = priv->RefPicSetStCurrAfter[i];
+    for (i = 0; i < priv->NumPocLtCurr && rIdx < NumRpsCurrTempList0;
+        rIdx++, i++)
+      RefPicListTemp0[rIdx] = priv->RefPicSetLtCurr[i];
+  }
+
+  /* construct RefPicList0 (8-9) */
+  for (rIdx = 0; rIdx <= num_ref_idx_l0_active_minus1; rIdx++)
+    priv->RefPicList0[rIdx] =
+        ref_pic_list_modification->ref_pic_list_modification_flag_l0 ?
+        RefPicListTemp0[ref_pic_list_modification->list_entry_l0[rIdx]] :
+        RefPicListTemp0[rIdx];
+  priv->RefPicList0_count = rIdx;
+
+  if (type == GST_H265_B_SLICE) {
+    rIdx = 0;
+
+    /* (8-10) */
+    while (rIdx < NumRpsCurrTempList1) {
+      for (i = 0; i < priv->NumPocStCurrAfter && rIdx < NumRpsCurrTempList1;
+          rIdx++, i++)
+        RefPicListTemp1[rIdx] = priv->RefPicSetStCurrAfter[i];
+      for (i = 0; i < priv->NumPocStCurrBefore && rIdx < NumRpsCurrTempList1;
+          rIdx++, i++)
+        RefPicListTemp1[rIdx] = priv->RefPicSetStCurrBefore[i];
+      for (i = 0; i < priv->NumPocLtCurr && rIdx < NumRpsCurrTempList1;
+          rIdx++, i++)
+        RefPicListTemp1[rIdx] = priv->RefPicSetLtCurr[i];
+    }
+
+    /* construct RefPicList1 (8-10) */
+    for (rIdx = 0; rIdx <= num_ref_idx_l1_active_minus1; rIdx++)
+      priv->RefPicList1[rIdx] =
+          ref_pic_list_modification->ref_pic_list_modification_flag_l1 ?
+          RefPicListTemp1[ref_pic_list_modification->list_entry_l1
+          [rIdx]] : RefPicListTemp1[rIdx];
+    priv->RefPicList1_count = rIdx;
+  }
+}
+
+static gboolean
+init_picture (GstVaapiDecoderH265 * decoder,
+    GstVaapiPictureH265 * picture, GstVaapiParserInfoH265 * pi)
+{
+  GstVaapiDecoderH265Private *const priv = &decoder->priv;
+  GstVaapiPicture *const base_picture = &picture->base;
+  GstH265SliceHdr *const slice_hdr = &pi->data.slice_hdr;
+
+  base_picture->pts = GST_VAAPI_DECODER_CODEC_FRAME (decoder)->pts;
+  base_picture->type = GST_VAAPI_PICTURE_TYPE_NONE;
+
+  if (nal_is_idr (pi->nalu.type)) {
+    GST_DEBUG ("<IDR>");
+    GST_VAAPI_PICTURE_FLAG_SET (picture, GST_VAAPI_PICTURE_FLAG_IDR);
+  }
+
+  if (pi->nalu.type >= GST_H265_NAL_SLICE_BLA_W_LP &&
+      pi->nalu.type <= GST_H265_NAL_SLICE_CRA_NUT)
+    picture->RapPicFlag = TRUE;
+
+  /*Fixme: Use SEI header values */
+  base_picture->structure = GST_VAAPI_PICTURE_STRUCTURE_FRAME;
+  picture->structure = base_picture->structure;
+
+  /*NoRaslOutputFlag ==1 if the current picture is
+     1) an IDR picture
+     2) a BLA picture
+     3) a CRA picture that is the first access unit in the bitstream
+     4) first picture that follows an end of sequence NAL unit in decoding order
+     5) has HandleCraAsBlaFlag == 1 (set by external means, so not considering )
+   */
+  if (nal_is_idr (pi->nalu.type) || nal_is_bla (pi->nalu.type) ||
+      (nal_is_cra (pi->nalu.type) && priv->new_bitstream)
+      || priv->prev_nal_is_eos) {
+    picture->NoRaslOutputFlag = 1;
+  }
+
+  if (nal_is_irap (pi->nalu.type)) {
+    picture->IntraPicFlag = TRUE;
+    priv->associated_irap_NoRaslOutputFlag = picture->NoRaslOutputFlag;
+  }
+
+  if (nal_is_rasl (pi->nalu.type) && priv->associated_irap_NoRaslOutputFlag)
+    picture->output_flag = FALSE;
+  else
+    picture->output_flag = slice_hdr->pic_output_flag;
+
+  init_picture_poc (decoder, picture, pi);
+
+  return TRUE;
+}
+
+static void
+vaapi_init_picture (VAPictureHEVC * pic)
+{
+  pic->picture_id = VA_INVALID_SURFACE;
+  pic->pic_order_cnt = 0;
+  pic->flags = VA_PICTURE_HEVC_INVALID;
+}
+
+static void
+vaapi_fill_picture (VAPictureHEVC * pic, GstVaapiPictureH265 * picture,
+    guint picture_structure)
+{
+
+  if (!picture_structure)
+    picture_structure = picture->structure;
+
+  pic->picture_id = picture->base.surface_id;
+  pic->pic_order_cnt = picture->poc;
+  pic->flags = 0;
+
+  /* Set the VAPictureHEVC flags */
+  if (GST_VAAPI_PICTURE_IS_LONG_TERM_REFERENCE (picture))
+    pic->flags |= VA_PICTURE_HEVC_LONG_TERM_REFERENCE;
+
+  if (GST_VAAPI_PICTURE_FLAG_IS_SET (picture,
+          GST_VAAPI_PICTURE_FLAG_RPS_ST_CURR_BEFORE))
+    pic->flags |= VA_PICTURE_HEVC_RPS_ST_CURR_BEFORE;
+
+  else if (GST_VAAPI_PICTURE_FLAG_IS_SET (picture,
+          GST_VAAPI_PICTURE_FLAG_RPS_ST_CURR_AFTER))
+    pic->flags |= VA_PICTURE_HEVC_RPS_ST_CURR_AFTER;
+
+  else if (GST_VAAPI_PICTURE_FLAG_IS_SET (picture,
+          GST_VAAPI_PICTURE_FLAG_RPS_LT_CURR))
+    pic->flags |= VA_PICTURE_HEVC_RPS_LT_CURR;
+
+  switch (picture_structure) {
+    case GST_VAAPI_PICTURE_STRUCTURE_FRAME:
+      break;
+    case GST_VAAPI_PICTURE_STRUCTURE_TOP_FIELD:
+      pic->flags |= VA_PICTURE_HEVC_FIELD_PIC;
+      break;
+    case GST_VAAPI_PICTURE_STRUCTURE_BOTTOM_FIELD:
+      pic->flags |= VA_PICTURE_HEVC_FIELD_PIC;
+      pic->flags |= VA_PICTURE_HEVC_BOTTOM_FIELD;
+      break;
+    default:
+      break;
+  }
+}
+
+static guint
+get_index_for_RefPicListX (VAPictureHEVC * ReferenceFrames,
+    GstVaapiPictureH265 * pic)
+{
+  gint i;
+
+  for (i = 0; i < 15; i++) {
+    if ((ReferenceFrames[i].picture_id != VA_INVALID_ID) && pic) {
+      if ((ReferenceFrames[i].pic_order_cnt == pic->poc) &&
+          (ReferenceFrames[i].picture_id == pic->base.surface_id)) {
+        return i;
+      }
+    }
+  }
+  return 0xff;
+}
+
+static gboolean
+fill_picture (GstVaapiDecoderH265 * decoder, GstVaapiPictureH265 * picture)
+{
+  GstVaapiDecoderH265Private *const priv = &decoder->priv;
+  GstVaapiPicture *const base_picture = &picture->base;
+  GstH265PPS *const pps = get_pps (decoder);
+  GstH265SPS *const sps = get_sps (decoder);
+  VAPictureParameterBufferHEVC *const pic_param = base_picture->param;
+  guint i, n;
+
+  pic_param->pic_fields.value = 0;
+  pic_param->slice_parsing_fields.value = 0;
+
+  /* Fill in VAPictureHEVC */
+  vaapi_fill_picture (&pic_param->CurrPic, picture, 0);
+  /* Fill in ReferenceFrames */
+  for (i = 0, n = 0; i < priv->dpb_count; i++) {
+    GstVaapiFrameStore *const fs = priv->dpb[i];
+    if ((gst_vaapi_frame_store_has_reference (fs)))
+      vaapi_fill_picture (&pic_param->ReferenceFrames[n++], fs->buffer,
+          fs->buffer->structure);
+    if (n >= G_N_ELEMENTS (pic_param->ReferenceFrames))
+      break;
+  }
+  for (; n < G_N_ELEMENTS (pic_param->ReferenceFrames); n++)
+    vaapi_init_picture (&pic_param->ReferenceFrames[n]);
+
+
+#define COPY_FIELD(s, f) \
+    pic_param->f = (s)->f
+#define COPY_BFM(a, s, f) \
+    pic_param->a.bits.f = (s)->f
+
+  COPY_FIELD (sps, pic_width_in_luma_samples);
+  COPY_FIELD (sps, pic_height_in_luma_samples);
+  COPY_BFM (pic_fields, sps, chroma_format_idc);
+  COPY_BFM (pic_fields, sps, separate_colour_plane_flag);
+  COPY_BFM (pic_fields, sps, pcm_enabled_flag);
+  COPY_BFM (pic_fields, sps, scaling_list_enabled_flag);
+  COPY_BFM (pic_fields, pps, transform_skip_enabled_flag);
+  COPY_BFM (pic_fields, sps, amp_enabled_flag);
+  COPY_BFM (pic_fields, sps, strong_intra_smoothing_enabled_flag);
+  COPY_BFM (pic_fields, pps, sign_data_hiding_enabled_flag);
+  COPY_BFM (pic_fields, pps, constrained_intra_pred_flag);
+  COPY_BFM (pic_fields, pps, cu_qp_delta_enabled_flag);
+  COPY_BFM (pic_fields, pps, weighted_pred_flag);
+  COPY_BFM (pic_fields, pps, weighted_bipred_flag);
+  COPY_BFM (pic_fields, pps, transquant_bypass_enabled_flag);
+  COPY_BFM (pic_fields, pps, tiles_enabled_flag);
+  COPY_BFM (pic_fields, pps, entropy_coding_sync_enabled_flag);
+  pic_param->pic_fields.bits.pps_loop_filter_across_slices_enabled_flag =
+      pps->loop_filter_across_slices_enabled_flag;
+  COPY_BFM (pic_fields, pps, loop_filter_across_tiles_enabled_flag);
+  COPY_BFM (pic_fields, sps, pcm_loop_filter_disabled_flag);
+  /* Fix: Assign value based on sps_max_num_reorder_pics */
+  pic_param->pic_fields.bits.NoPicReorderingFlag = 0;
+  /* Fix: Enable if picture has no B slices */
+  pic_param->pic_fields.bits.NoBiPredFlag = 0;
+
+  pic_param->sps_max_dec_pic_buffering_minus1 =
+      sps->max_dec_pic_buffering_minus1[0];
+  COPY_FIELD (sps, bit_depth_luma_minus8);
+  COPY_FIELD (sps, bit_depth_chroma_minus8);
+  COPY_FIELD (sps, pcm_sample_bit_depth_luma_minus1);
+  COPY_FIELD (sps, pcm_sample_bit_depth_chroma_minus1);
+  COPY_FIELD (sps, log2_min_luma_coding_block_size_minus3);
+  COPY_FIELD (sps, log2_diff_max_min_luma_coding_block_size);
+  COPY_FIELD (sps, log2_min_transform_block_size_minus2);
+  COPY_FIELD (sps, log2_diff_max_min_transform_block_size);
+  COPY_FIELD (sps, log2_min_pcm_luma_coding_block_size_minus3);
+  COPY_FIELD (sps, log2_diff_max_min_pcm_luma_coding_block_size);
+  COPY_FIELD (sps, max_transform_hierarchy_depth_intra);
+  COPY_FIELD (sps, max_transform_hierarchy_depth_inter);
+  COPY_FIELD (pps, init_qp_minus26);
+  COPY_FIELD (pps, diff_cu_qp_delta_depth);
+  pic_param->pps_cb_qp_offset = pps->cb_qp_offset;
+  pic_param->pps_cr_qp_offset = pps->cr_qp_offset;
+  COPY_FIELD (pps, log2_parallel_merge_level_minus2);
+  COPY_FIELD (pps, num_tile_columns_minus1);
+  COPY_FIELD (pps, num_tile_rows_minus1);
+  for (i = 0; i <= pps->num_tile_columns_minus1; i++)
+    pic_param->column_width_minus1[i] = pps->column_width_minus1[i];
+  for (; i < 19; i++)
+    pic_param->column_width_minus1[i] = 0;
+  for (i = 0; i <= pps->num_tile_rows_minus1; i++)
+    pic_param->row_height_minus1[i] = pps->row_height_minus1[i];
+  for (; i < 21; i++)
+    pic_param->row_height_minus1[i] = 0;
+
+  COPY_BFM (slice_parsing_fields, pps, lists_modification_present_flag);
+  COPY_BFM (slice_parsing_fields, sps, long_term_ref_pics_present_flag);
+  pic_param->slice_parsing_fields.bits.sps_temporal_mvp_enabled_flag =
+      sps->temporal_mvp_enabled_flag;
+  COPY_BFM (slice_parsing_fields, pps, cabac_init_present_flag);
+  COPY_BFM (slice_parsing_fields, pps, output_flag_present_flag);
+  COPY_BFM (slice_parsing_fields, pps, dependent_slice_segments_enabled_flag);
+  pic_param->slice_parsing_fields.
+      bits.pps_slice_chroma_qp_offsets_present_flag =
+      pps->slice_chroma_qp_offsets_present_flag;
+  COPY_BFM (slice_parsing_fields, sps, sample_adaptive_offset_enabled_flag);
+  COPY_BFM (slice_parsing_fields, pps, deblocking_filter_override_enabled_flag);
+  pic_param->slice_parsing_fields.bits.pps_disable_deblocking_filter_flag =
+      pps->deblocking_filter_disabled_flag;
+  COPY_BFM (slice_parsing_fields, pps,
+      slice_segment_header_extension_present_flag);
+  pic_param->slice_parsing_fields.bits.RapPicFlag = picture->RapPicFlag;
+  pic_param->slice_parsing_fields.bits.IdrPicFlag =
+      GST_VAAPI_PICTURE_FLAG_IS_SET (picture, GST_VAAPI_PICTURE_FLAG_IDR);
+  pic_param->slice_parsing_fields.bits.IntraPicFlag = picture->IntraPicFlag;
+
+  COPY_FIELD (sps, log2_max_pic_order_cnt_lsb_minus4);
+  COPY_FIELD (sps, num_short_term_ref_pic_sets);
+  pic_param->num_long_term_ref_pic_sps = sps->num_long_term_ref_pics_sps;
+  COPY_FIELD (pps, num_ref_idx_l0_default_active_minus1);
+  COPY_FIELD (pps, num_ref_idx_l1_default_active_minus1);
+  pic_param->pps_beta_offset_div2 = pps->beta_offset_div2;
+  pic_param->pps_tc_offset_div2 = pps->tc_offset_div2;
+  COPY_FIELD (pps, num_extra_slice_header_bits);
+
+  /*Fixme: Set correct value as mentioned in va_dec_hevc.h */
+  pic_param->st_rps_bits = 0;
+  return TRUE;
+}
+
+/* Detection of the first VCL NAL unit of a coded picture (7.4.2.4.5 ) */
+static gboolean
+is_new_picture (GstVaapiParserInfoH265 * pi, GstVaapiParserInfoH265 * prev_pi)
+{
+  GstH265SliceHdr *const slice_hdr = &pi->data.slice_hdr;
+
+  if (!prev_pi)
+    return TRUE;
+
+  if (slice_hdr->first_slice_segment_in_pic_flag)
+    return TRUE;
+
+  return FALSE;
+}
+
+/* Detection of a new access unit, assuming we are already in presence
+   of a new picture */
+static inline gboolean
+is_new_access_unit (GstVaapiParserInfoH265 * pi,
+    GstVaapiParserInfoH265 * prev_pi)
+{
+  if (!prev_pi)
+    return TRUE;
+
+  return FALSE;
+}
+
+static gboolean
+has_entry_in_rps (GstVaapiPictureH265 * dpb_pic,
+    GstVaapiPictureH265 ** rps_list, guint rps_list_length)
+{
+  guint i;
+
+  if (!dpb_pic || !rps_list || !rps_list_length)
+    return FALSE;
+
+  for (i = 0; i < rps_list_length; i++) {
+    if (rps_list[i] && rps_list[i]->poc == dpb_pic->poc)
+      return TRUE;
+  }
+  return FALSE;
+}
+
+/* the derivation process for the RPS and the picture marking */
+static void
+derive_and_mark_rps (GstVaapiDecoderH265 * decoder,
+    GstVaapiPictureH265 * picture, GstVaapiParserInfoH265 * pi,
+    gint32 * CurrDeltaPocMsbPresentFlag, gint32 * FollDeltaPocMsbPresentFlag)
+{
+  GstVaapiDecoderH265Private *const priv = &decoder->priv;
+  GstVaapiPictureH265 *dpb_pic = NULL;
+  guint i;
+
+  memset (priv->RefPicSetLtCurr, 0, sizeof (GstVaapiPictureH265 *) * 16);
+  memset (priv->RefPicSetLtFoll, 0, sizeof (GstVaapiPictureH265 *) * 16);
+  memset (priv->RefPicSetStCurrBefore, 0, sizeof (GstVaapiPictureH265 *) * 16);
+  memset (priv->RefPicSetStCurrAfter, 0, sizeof (GstVaapiPictureH265 *) * 16);
+  memset (priv->RefPicSetStFoll, 0, sizeof (GstVaapiPictureH265 *) * 16);
+
+  /* (8-6) */
+  for (i = 0; i < priv->NumPocLtCurr; i++) {
+    if (!CurrDeltaPocMsbPresentFlag[i]) {
+      dpb_pic = dpb_get_picture (decoder, priv->PocLtCurr[i], TRUE);
+      if (dpb_pic)
+        priv->RefPicSetLtCurr[i] = dpb_pic;
+      else
+        priv->RefPicSetLtCurr[i] = NULL;
+    } else {
+      dpb_pic = dpb_get_picture (decoder, priv->PocLtCurr[i], FALSE);
+      if (dpb_pic)
+        priv->RefPicSetLtCurr[i] = dpb_pic;
+      else
+        priv->RefPicSetLtCurr[i] = NULL;
+    }
+  }
+  for (; i < 16; i++)
+    priv->RefPicSetLtCurr[i] = NULL;
+
+  for (i = 0; i < priv->NumPocLtFoll; i++) {
+    if (!FollDeltaPocMsbPresentFlag[i]) {
+      dpb_pic = dpb_get_picture (decoder, priv->PocLtFoll[i], TRUE);
+      if (dpb_pic)
+        priv->RefPicSetLtFoll[i] = dpb_pic;
+      else
+        priv->RefPicSetLtFoll[i] = NULL;
+    } else {
+      dpb_pic = dpb_get_picture (decoder, priv->PocLtFoll[i], FALSE);
+      if (dpb_pic)
+        priv->RefPicSetLtFoll[i] = dpb_pic;
+      else
+        priv->RefPicSetLtFoll[i] = NULL;
+    }
+  }
+  for (; i < 16; i++)
+    priv->RefPicSetLtFoll[i] = NULL;
+
+  /* Mark all ref pics in RefPicSetLtCurr and RefPicSetLtFol as long_term_refs */
+  for (i = 0; i < priv->NumPocLtCurr; i++) {
+    if (priv->RefPicSetLtCurr[i])
+      gst_vaapi_picture_h265_set_reference (priv->RefPicSetLtCurr[i],
+          GST_VAAPI_PICTURE_FLAG_LONG_TERM_REFERENCE |
+          GST_VAAPI_PICTURE_FLAG_RPS_LT_CURR);
+  }
+  for (i = 0; i < priv->NumPocLtFoll; i++) {
+    if (priv->RefPicSetLtFoll[i])
+      gst_vaapi_picture_h265_set_reference (priv->RefPicSetLtFoll[i],
+          GST_VAAPI_PICTURE_FLAG_LONG_TERM_REFERENCE |
+          GST_VAAPI_PICTURE_FLAG_RPS_LT_FOLL);
+  }
+
+  /* (8-7) */
+  for (i = 0; i < priv->NumPocStCurrBefore; i++) {
+    dpb_pic = dpb_get_ref_picture (decoder, priv->PocStCurrBefore[i], TRUE);
+    if (dpb_pic) {
+      gst_vaapi_picture_h265_set_reference (dpb_pic,
+          GST_VAAPI_PICTURE_FLAG_SHORT_TERM_REFERENCE |
+          GST_VAAPI_PICTURE_FLAG_RPS_ST_CURR_BEFORE);
+      priv->RefPicSetStCurrBefore[i] = dpb_pic;
+    } else
+      priv->RefPicSetStCurrBefore[i] = NULL;
+  }
+  for (; i < 16; i++)
+    priv->RefPicSetStCurrBefore[i] = NULL;
+
+  for (i = 0; i < priv->NumPocStCurrAfter; i++) {
+    dpb_pic = dpb_get_ref_picture (decoder, priv->PocStCurrAfter[i], TRUE);
+    if (dpb_pic) {
+      gst_vaapi_picture_h265_set_reference (dpb_pic,
+          GST_VAAPI_PICTURE_FLAG_SHORT_TERM_REFERENCE |
+          GST_VAAPI_PICTURE_FLAG_RPS_ST_CURR_AFTER);
+      priv->RefPicSetStCurrAfter[i] = dpb_pic;
+    } else
+      priv->RefPicSetStCurrAfter[i] = NULL;
+  }
+  for (; i < 16; i++)
+    priv->RefPicSetStCurrAfter[i] = NULL;
+
+  for (i = 0; i < priv->NumPocStFoll; i++) {
+    dpb_pic = dpb_get_ref_picture (decoder, priv->PocStFoll[i], TRUE);
+    if (dpb_pic) {
+      gst_vaapi_picture_h265_set_reference (dpb_pic,
+          GST_VAAPI_PICTURE_FLAG_SHORT_TERM_REFERENCE |
+          GST_VAAPI_PICTURE_FLAG_RPS_ST_FOLL);
+      priv->RefPicSetStFoll[i] = dpb_pic;
+    } else
+      priv->RefPicSetStFoll[i] = NULL;
+  }
+  for (; i < 16; i++)
+    priv->RefPicSetStFoll[i] = NULL;
+
+  /* Mark all dpb pics not beloging to RefPicSet*[] as unused for ref */
+  for (i = 0; i < priv->dpb_count; i++) {
+    dpb_pic = priv->dpb[i]->buffer;
+    if (dpb_pic &&
+        !has_entry_in_rps (dpb_pic, priv->RefPicSetLtCurr, priv->NumPocLtCurr)
+        && !has_entry_in_rps (dpb_pic, priv->RefPicSetLtFoll,
+            priv->NumPocLtFoll)
+        && !has_entry_in_rps (dpb_pic, priv->RefPicSetStCurrAfter,
+            priv->NumPocStCurrAfter)
+        && !has_entry_in_rps (dpb_pic, priv->RefPicSetStCurrBefore,
+            priv->NumPocStCurrBefore)
+        && !has_entry_in_rps (dpb_pic, priv->RefPicSetStFoll,
+            priv->NumPocStFoll))
+      gst_vaapi_picture_h265_set_reference (dpb_pic, 0);
+  }
+
+}
+
+/* Decoding process for reference picture set (8.3.2) */
+static gboolean
+decode_ref_pic_set (GstVaapiDecoderH265 * decoder,
+    GstVaapiPictureH265 * picture, GstVaapiParserInfoH265 * pi)
+{
+  guint i, j, k;
+  gint32 CurrDeltaPocMsbPresentFlag[16] = { 0, };
+  gint32 FollDeltaPocMsbPresentFlag[16] = { 0, };
+  GstVaapiDecoderH265Private *const priv = &decoder->priv;
+  GstH265SliceHdr *const slice_hdr = &pi->data.slice_hdr;
+  GstH265SPS *const sps = get_sps (decoder);
+  const gint32 MaxPicOrderCntLsb =
+      1 << (sps->log2_max_pic_order_cnt_lsb_minus4 + 4);
+
+  /* if it is an irap pic, set all ref pics in dpb as unused for ref */
+  if (nal_is_irap (pi->nalu.type) && picture->NoRaslOutputFlag) {
+    for (i = 0; i < priv->dpb_count; i++) {
+      GstVaapiFrameStore *const fs = priv->dpb[i];
+      gst_vaapi_picture_h265_set_reference (fs->buffer, 0);
+    }
+  }
+
+  /* Reset everything for IDR */
+  if (nal_is_idr (pi->nalu.type)) {
+    memset (priv->PocStCurrBefore, 0, sizeof (guint) * 16);
+    memset (priv->PocStCurrAfter, 0, sizeof (guint) * 16);
+    memset (priv->PocStFoll, 0, sizeof (guint) * 16);
+    memset (priv->PocLtCurr, 0, sizeof (guint) * 16);
+    memset (priv->PocLtFoll, 0, sizeof (guint) * 16);
+    priv->NumPocStCurrBefore = priv->NumPocStCurrAfter = priv->NumPocStFoll = 0;
+    priv->NumPocLtCurr = priv->NumPocLtFoll = 0;
+  } else {
+    GstH265ShortTermRefPicSet *stRefPic = NULL;
+    gint32 num_lt_pics, pocLt, PocLsbLt[16] = { 0, }
+    , UsedByCurrPicLt[16] = {
+    0,};
+    gint32 DeltaPocMsbCycleLt[16] = { 0, };
+    gint numtotalcurr = 0;
+
+    /* this is based on CurrRpsIdx described in spec */
+    if (!slice_hdr->short_term_ref_pic_set_sps_flag)
+      stRefPic = &slice_hdr->short_term_ref_pic_sets;
+    else if (sps->num_short_term_ref_pic_sets)
+      stRefPic =
+          &sps->short_term_ref_pic_set[slice_hdr->short_term_ref_pic_set_idx];
+
+    g_assert (stRefPic != NULL);
+
+    for (i = 0, j = 0, k = 0; i < stRefPic->NumNegativePics; i++) {
+      if (stRefPic->UsedByCurrPicS0[i]) {
+        priv->PocStCurrBefore[j++] = picture->poc + stRefPic->DeltaPocS0[i];
+        numtotalcurr++;
+      } else
+        priv->PocStFoll[k++] = picture->poc + stRefPic->DeltaPocS0[i];
+    }
+    priv->NumPocStCurrBefore = j;
+    for (i = 0, j = 0; i < stRefPic->NumPositivePics; i++) {
+      if (stRefPic->UsedByCurrPicS1[i]) {
+        priv->PocStCurrAfter[j++] = picture->poc + stRefPic->DeltaPocS1[i];
+        numtotalcurr++;
+      } else
+        priv->PocStFoll[k++] = picture->poc + stRefPic->DeltaPocS1[i];
+    }
+    priv->NumPocStCurrAfter = j;
+    priv->NumPocStFoll = k;
+    num_lt_pics = slice_hdr->num_long_term_sps + slice_hdr->num_long_term_pics;
+    /* The variables PocLsbLt[i] and UsedByCurrPicLt[i] are derived as follows: */
+    for (i = 0; i < num_lt_pics; i++) {
+      if (i < slice_hdr->num_long_term_sps) {
+        PocLsbLt[i] = sps->lt_ref_pic_poc_lsb_sps[slice_hdr->lt_idx_sps[i]];
+        UsedByCurrPicLt[i] =
+            sps->used_by_curr_pic_lt_sps_flag[slice_hdr->lt_idx_sps[i]];
+      } else {
+        PocLsbLt[i] = slice_hdr->poc_lsb_lt[i];
+        UsedByCurrPicLt[i] = slice_hdr->used_by_curr_pic_lt_flag[i];
+      }
+      if (UsedByCurrPicLt[i])
+        numtotalcurr++;
+    }
+
+    priv->NumPocTotalCurr = numtotalcurr;
+
+    /* The variable DeltaPocMsbCycleLt[i] is derived as follows: (7-38) */
+    for (i = 0; i < num_lt_pics; i++) {
+      if (i == 0 || i == slice_hdr->num_long_term_sps)
+        DeltaPocMsbCycleLt[i] = slice_hdr->delta_poc_msb_cycle_lt[i];
+      else
+        DeltaPocMsbCycleLt[i] =
+            slice_hdr->delta_poc_msb_cycle_lt[i] + DeltaPocMsbCycleLt[i - 1];
+    }
+
+    /* (8-5) */
+    for (i = 0, j = 0, k = 0; i < num_lt_pics; i++) {
+      pocLt = PocLsbLt[i];
+      if (slice_hdr->delta_poc_msb_present_flag[i])
+        pocLt +=
+            picture->poc - DeltaPocMsbCycleLt[i] * MaxPicOrderCntLsb -
+            slice_hdr->pic_order_cnt_lsb;
+      if (UsedByCurrPicLt[i]) {
+        priv->PocLtCurr[j] = pocLt;
+        CurrDeltaPocMsbPresentFlag[j++] =
+            slice_hdr->delta_poc_msb_present_flag[i];
+      } else {
+        priv->PocLtFoll[k] = pocLt;
+        FollDeltaPocMsbPresentFlag[k++] =
+            slice_hdr->delta_poc_msb_present_flag[i];
+      }
+    }
+    priv->NumPocLtCurr = j;
+    priv->NumPocLtFoll = k;
+
+  }
+
+  /* the derivation process for the RPS and the picture marking */
+  derive_and_mark_rps (decoder, picture, pi, CurrDeltaPocMsbPresentFlag,
+      FollDeltaPocMsbPresentFlag);
+
+  return TRUE;
+}
+
+static GstVaapiDecoderStatus
+decode_picture (GstVaapiDecoderH265 * decoder, GstVaapiDecoderUnit * unit)
+{
+  GstVaapiDecoderH265Private *const priv = &decoder->priv;
+  GstVaapiParserInfoH265 *pi = unit->parsed_info;
+  GstH265SliceHdr *const slice_hdr = &pi->data.slice_hdr;
+  GstH265PPS *const pps = ensure_pps (decoder, slice_hdr->pps);
+  GstH265SPS *const sps = ensure_sps (decoder, slice_hdr->pps->sps);
+  GstVaapiPictureH265 *picture;
+  GstVaapiDecoderStatus status;
+
+  g_return_val_if_fail (pps != NULL, GST_VAAPI_DECODER_STATUS_ERROR_UNKNOWN);
+  g_return_val_if_fail (sps != NULL, GST_VAAPI_DECODER_STATUS_ERROR_UNKNOWN);
+
+  status = ensure_context (decoder, sps);
+  if (status != GST_VAAPI_DECODER_STATUS_SUCCESS)
+    return status;
+
+  priv->decoder_state = 0;
+
+  /* Create new picture */
+  picture = gst_vaapi_picture_h265_new (decoder);
+  if (!picture) {
+    GST_ERROR ("failed to allocate picture");
+    return GST_VAAPI_DECODER_STATUS_ERROR_ALLOCATION_FAILED;
+  }
+
+  gst_vaapi_picture_replace (&priv->current_picture, picture);
+  gst_vaapi_picture_unref (picture);
+
+  /* Update cropping rectangle */
+  if (sps->conformance_window_flag) {
+    GstVaapiRectangle crop_rect;
+    crop_rect.x = sps->crop_rect_x;
+    crop_rect.y = sps->crop_rect_y;
+    crop_rect.width = sps->crop_rect_width;
+    crop_rect.height = sps->crop_rect_height;
+    gst_vaapi_picture_set_crop_rect (&picture->base, &crop_rect);
+  }
+
+  status = ensure_quant_matrix (decoder, picture);
+  if (status != GST_VAAPI_DECODER_STATUS_SUCCESS) {
+    GST_ERROR ("failed to reset quantizer matrix");
+    return status;
+  }
+
+  if (!init_picture (decoder, picture, pi))
+    return GST_VAAPI_DECODER_STATUS_ERROR_UNKNOWN;
+
+  /* Drop all RASL pictures having NoRaslOutputFlag is TRUE for the
+   * associated IRAP picture */
+  if (nal_is_rasl (pi->nalu.type) && priv->associated_irap_NoRaslOutputFlag) {
+    gst_vaapi_picture_replace (&priv->current_picture, NULL);
+    return (GstVaapiDecoderStatus) GST_VAAPI_DECODER_STATUS_DROP_FRAME;
+  }
+
+  if (!decode_ref_pic_set (decoder, picture, pi))
+    return GST_VAAPI_DECODER_STATUS_ERROR_UNKNOWN;
+
+  if (!dpb_init (decoder, picture, pi))
+    return GST_VAAPI_DECODER_STATUS_ERROR_UNKNOWN;
+
+  if (!fill_picture (decoder, picture))
+    return GST_VAAPI_DECODER_STATUS_ERROR_UNKNOWN;
+
+  priv->decoder_state = pi->state;
+  return GST_VAAPI_DECODER_STATUS_SUCCESS;
+}
+
+static inline guint
+get_slice_data_byte_offset (GstH265SliceHdr * slice_hdr, guint nal_header_bytes)
+{
+  guint epb_count;
+
+  epb_count = slice_hdr->n_emulation_prevention_bytes;
+  return nal_header_bytes + (slice_hdr->header_size + 7) / 8 - epb_count;
+}
+
+static gboolean
+fill_pred_weight_table (GstVaapiDecoderH265 * decoder,
+    GstVaapiSlice * slice, GstH265SliceHdr * slice_hdr)
+{
+  VASliceParameterBufferHEVC *const slice_param = slice->param;
+  GstH265PPS *const pps = get_pps (decoder);
+  GstH265SPS *const sps = get_sps (decoder);
+  GstH265PredWeightTable *const w = &slice_hdr->pred_weight_table;
+  gint chroma_weight, chroma_log2_weight_denom;
+  gint i, j;
+
+  slice_param->luma_log2_weight_denom = 0;
+  slice_param->delta_chroma_log2_weight_denom = 0;
+
+  if ((pps->weighted_pred_flag && GST_H265_IS_P_SLICE (slice_hdr)) ||
+      (pps->weighted_bipred_flag && GST_H265_IS_B_SLICE (slice_hdr))) {
+
+    slice_param->luma_log2_weight_denom = w->luma_log2_weight_denom;
+    if (!sps->chroma_format_idc)
+      slice_param->delta_chroma_log2_weight_denom =
+          w->delta_chroma_log2_weight_denom;
+
+    chroma_log2_weight_denom =
+        slice_param->luma_log2_weight_denom +
+        slice_param->delta_chroma_log2_weight_denom;
+
+    for (i = 0; i <= slice_param->num_ref_idx_l0_active_minus1; i++) {
+      if (slice_hdr->pred_weight_table.luma_weight_l0_flag[i]) {
+        slice_param->delta_luma_weight_l0[i] = w->delta_luma_weight_l0[i];
+        slice_param->luma_offset_l0[i] = w->luma_offset_l0[i];
+      }
+      if (slice_hdr->pred_weight_table.chroma_weight_l0_flag[i]) {
+        for (j = 0; j < 2; j++) {
+          slice_param->delta_chroma_weight_l0[i][j] =
+              w->delta_chroma_weight_l0[i][j];
+          /* Find  ChromaWeightL0 */
+          chroma_weight =
+              (1 << chroma_log2_weight_denom) + w->delta_chroma_weight_l0[i][j];
+          /* 7-44 */
+          slice_param->ChromaOffsetL0[i][j] = CLAMP (
+              (w->delta_chroma_offset_l0[i][j] -
+                  ((128 * chroma_weight) >> chroma_log2_weight_denom)), -128,
+              127);
+        }
+      }
+    }
+
+    if (GST_H265_IS_B_SLICE (slice_hdr)) {
+      for (i = 0; i <= slice_param->num_ref_idx_l1_active_minus1; i++) {
+        if (slice_hdr->pred_weight_table.luma_weight_l1_flag[i]) {
+          slice_param->delta_luma_weight_l1[i] = w->delta_luma_weight_l1[i];
+          slice_param->luma_offset_l1[i] = w->luma_offset_l1[i];
+        }
+        if (slice_hdr->pred_weight_table.chroma_weight_l1_flag[i]) {
+          for (j = 0; j < 2; j++) {
+            slice_param->delta_chroma_weight_l1[i][j] =
+                w->delta_chroma_weight_l1[i][j];
+            /* Find  ChromaWeightL1 */
+            chroma_weight =
+                (1 << chroma_log2_weight_denom) +
+                w->delta_chroma_weight_l1[i][j];
+            slice_param->ChromaOffsetL1[i][j] =
+                CLAMP ((w->delta_chroma_offset_l1[i][j] -
+                    ((128 * chroma_weight) >> chroma_log2_weight_denom)), -128,
+                127);
+          }
+        }
+      }
+    }
+  }
+  /* Fixme: Optimize */
+  else {
+    for (i = 0; i < 15; i++) {
+      slice_param->delta_luma_weight_l0[i] = 0;
+      slice_param->luma_offset_l0[i] = 0;
+      slice_param->delta_luma_weight_l1[i] = 0;
+      slice_param->luma_offset_l1[i] = 0;
+    }
+    for (i = 0; i < 15; i++) {
+      for (j = 0; j < 2; j++) {
+        slice_param->delta_chroma_weight_l0[i][j] = 0;
+        slice_param->ChromaOffsetL0[i][j] = 0;
+        slice_param->delta_chroma_weight_l1[i][j] = 0;
+        slice_param->ChromaOffsetL1[i][j] = 0;
+      }
+    }
+  }
+  return TRUE;
+}
+
+static gboolean
+fill_RefPicList (GstVaapiDecoderH265 * decoder,
+    GstVaapiPictureH265 * picture, GstVaapiSlice * slice,
+    GstH265SliceHdr * slice_hdr)
+{
+  GstVaapiDecoderH265Private *const priv = &decoder->priv;
+  VASliceParameterBufferHEVC *const slice_param = slice->param;
+  GstVaapiPicture *const base_picture = &picture->base;
+  VAPictureParameterBufferHEVC *const pic_param = base_picture->param;
+  guint i, num_ref_lists = 0, j;
+
+  slice_param->num_ref_idx_l0_active_minus1 = 0;
+  slice_param->num_ref_idx_l1_active_minus1 = 0;
+  for (j = 0; j < 2; j++)
+    for (i = 0; i < 15; i++)
+      slice_param->RefPicList[j][i] = 0xFF;
+
+  if (GST_H265_IS_B_SLICE (slice_hdr))
+    num_ref_lists = 2;
+  else if (GST_H265_IS_I_SLICE (slice_hdr))
+    num_ref_lists = 0;
+  else
+    num_ref_lists = 1;
+
+  if (num_ref_lists < 1)
+    return TRUE;
+
+  slice_param->num_ref_idx_l0_active_minus1 =
+      slice_hdr->num_ref_idx_l0_active_minus1;
+  slice_param->num_ref_idx_l1_active_minus1 =
+      slice_hdr->num_ref_idx_l1_active_minus1;
+
+  for (i = 0; i < priv->RefPicList0_count; i++)
+    slice_param->RefPicList[0][i] =
+        get_index_for_RefPicListX (pic_param->ReferenceFrames,
+        priv->RefPicList0[i]);
+  for (; i < 15; i++)
+    slice_param->RefPicList[0][i] = 0xFF;
+
+  if (num_ref_lists < 2)
+    return TRUE;
+
+  for (i = 0; i < priv->RefPicList1_count; i++)
+    slice_param->RefPicList[1][i] =
+        get_index_for_RefPicListX (pic_param->ReferenceFrames,
+        priv->RefPicList1[i]);
+  for (; i < 15; i++)
+    slice_param->RefPicList[1][i] = 0xFF;
+
+  return TRUE;
+}
+
+static gboolean
+fill_slice (GstVaapiDecoderH265 * decoder,
+    GstVaapiPictureH265 * picture, GstVaapiSlice * slice,
+    GstVaapiParserInfoH265 * pi, GstVaapiDecoderUnit * unit)
+{
+  GstVaapiDecoderH265Private *const priv = &decoder->priv;
+  VASliceParameterBufferHEVC *const slice_param = slice->param;
+  GstH265SliceHdr *slice_hdr = &pi->data.slice_hdr;
+
+  /* Fill in VASliceParameterBufferH265 */
+  slice_param->LongSliceFlags.value = 0;
+  slice_param->slice_data_byte_offset =
+      get_slice_data_byte_offset (slice_hdr, pi->nalu.header_bytes);
+
+  slice_param->slice_segment_address = slice_hdr->segment_address;
+
+#define COPY_LFF(f) \
+    slice_param->LongSliceFlags.fields.f = (slice_hdr)->f
+
+  if (GST_VAAPI_PICTURE_FLAG_IS_SET (picture, GST_VAAPI_PICTURE_FLAG_AU_END))
+    slice_param->LongSliceFlags.fields.LastSliceOfPic = 1;
+  else
+    slice_param->LongSliceFlags.fields.LastSliceOfPic = 0;
+
+  COPY_LFF (dependent_slice_segment_flag);
+
+  /* use most recent independent slice segment header syntax elements
+   * for filling the missing fields in dependent slice segment header */
+  if (slice_hdr->dependent_slice_segment_flag)
+    slice_hdr = &priv->prev_independent_slice_pi->data.slice_hdr;
+
+  COPY_LFF (mvd_l1_zero_flag);
+  COPY_LFF (cabac_init_flag);
+  COPY_LFF (collocated_from_l0_flag);
+  slice_param->LongSliceFlags.fields.color_plane_id =
+      slice_hdr->colour_plane_id;
+  slice_param->LongSliceFlags.fields.slice_type = slice_hdr->type;
+  slice_param->LongSliceFlags.fields.slice_sao_luma_flag =
+      slice_hdr->sao_luma_flag;
+  slice_param->LongSliceFlags.fields.slice_sao_chroma_flag =
+      slice_hdr->sao_chroma_flag;
+  slice_param->LongSliceFlags.fields.slice_temporal_mvp_enabled_flag =
+      slice_hdr->temporal_mvp_enabled_flag;
+  slice_param->LongSliceFlags.fields.slice_deblocking_filter_disabled_flag =
+      slice_hdr->deblocking_filter_disabled_flag;
+  slice_param->LongSliceFlags.
+      fields.slice_loop_filter_across_slices_enabled_flag =
+      slice_hdr->loop_filter_across_slices_enabled_flag;
+
+  if (!slice_hdr->temporal_mvp_enabled_flag)
+    slice_param->collocated_ref_idx = 0xFF;
+  else
+    slice_param->collocated_ref_idx = slice_hdr->collocated_ref_idx;
+
+  slice_param->num_ref_idx_l0_active_minus1 =
+      slice_hdr->num_ref_idx_l0_active_minus1;
+  slice_param->num_ref_idx_l1_active_minus1 =
+      slice_hdr->num_ref_idx_l1_active_minus1;
+  slice_param->slice_qp_delta = slice_hdr->qp_delta;
+  slice_param->slice_cb_qp_offset = slice_hdr->cb_qp_offset;
+  slice_param->slice_cr_qp_offset = slice_hdr->cr_qp_offset;
+  slice_param->slice_beta_offset_div2 = slice_hdr->beta_offset_div2;
+  slice_param->slice_tc_offset_div2 = slice_hdr->tc_offset_div2;
+  slice_param->five_minus_max_num_merge_cand =
+      slice_hdr->five_minus_max_num_merge_cand;
+
+  if (!fill_RefPicList (decoder, picture, slice, slice_hdr))
+    return FALSE;
+
+  if (!fill_pred_weight_table (decoder, slice, slice_hdr))
+    return FALSE;
+
+  return TRUE;
+}
+
+static GstVaapiDecoderStatus
+decode_slice (GstVaapiDecoderH265 * decoder, GstVaapiDecoderUnit * unit)
+{
+  GstVaapiDecoderH265Private *const priv = &decoder->priv;
+  GstVaapiParserInfoH265 *const pi = unit->parsed_info;
+  GstVaapiPictureH265 *const picture = priv->current_picture;
+  GstH265SliceHdr *const slice_hdr = &pi->data.slice_hdr;
+  GstVaapiSlice *slice;
+  GstBuffer *const buffer =
+      GST_VAAPI_DECODER_CODEC_FRAME (decoder)->input_buffer;
+  GstMapInfo map_info;
+
+  GST_DEBUG ("slice (%u bytes)", pi->nalu.size);
+  if (!is_valid_state (pi->state, GST_H265_VIDEO_STATE_VALID_PICTURE_HEADERS)) {
+    GST_WARNING ("failed to receive enough headers to decode slice");
+    return GST_VAAPI_DECODER_STATUS_SUCCESS;
+  }
+
+  if (!ensure_pps (decoder, slice_hdr->pps)) {
+    GST_ERROR ("failed to activate PPS");
+    return GST_VAAPI_DECODER_STATUS_ERROR_UNKNOWN;
+  }
+
+  if (!ensure_sps (decoder, slice_hdr->pps->sps)) {
+    GST_ERROR ("failed to activate SPS");
+    return GST_VAAPI_DECODER_STATUS_ERROR_UNKNOWN;
+  }
+
+  if (!gst_buffer_map (buffer, &map_info, GST_MAP_READ)) {
+    GST_ERROR ("failed to map buffer");
+    return GST_VAAPI_DECODER_STATUS_ERROR_UNKNOWN;
+  }
+
+  /* Check wether this is the first/last slice in the current access unit */
+  if (pi->flags & GST_VAAPI_DECODER_UNIT_FLAG_AU_START)
+    GST_VAAPI_PICTURE_FLAG_SET (picture, GST_VAAPI_PICTURE_FLAG_AU_START);
+
+  if (pi->flags & GST_VAAPI_DECODER_UNIT_FLAG_AU_END)
+    GST_VAAPI_PICTURE_FLAG_SET (picture, GST_VAAPI_PICTURE_FLAG_AU_END);
+
+  slice = GST_VAAPI_SLICE_NEW (HEVC, decoder,
+      (map_info.data + unit->offset + pi->nalu.offset), pi->nalu.size);
+
+  gst_buffer_unmap (buffer, &map_info);
+  if (!slice) {
+    GST_ERROR ("failed to allocate slice");
+    return GST_VAAPI_DECODER_STATUS_ERROR_ALLOCATION_FAILED;
+  }
+
+  init_picture_refs (decoder, picture, slice_hdr);
+
+  if (!fill_slice (decoder, picture, slice, pi, unit)) {
+    gst_vaapi_mini_object_unref (GST_VAAPI_MINI_OBJECT (slice));
+    return GST_VAAPI_DECODER_STATUS_ERROR_UNKNOWN;
+  }
+
+  gst_vaapi_picture_add_slice (GST_VAAPI_PICTURE_CAST (picture), slice);
+  picture->last_slice_hdr = slice_hdr;
+  priv->decoder_state |= GST_H265_VIDEO_STATE_GOT_SLICE;
+  return GST_VAAPI_DECODER_STATUS_SUCCESS;
+}
+
+static inline gint
+scan_for_start_code (GstAdapter * adapter, guint ofs, guint size, guint32 * scp)
+{
+  return (gint) gst_adapter_masked_scan_uint32_peek (adapter,
+      0xffffff00, 0x00000100, ofs, size, scp);
+}
+
+static GstVaapiDecoderStatus
+decode_unit (GstVaapiDecoderH265 * decoder, GstVaapiDecoderUnit * unit)
+{
+  GstVaapiDecoderH265Private *const priv = &decoder->priv;
+  GstVaapiParserInfoH265 *const pi = unit->parsed_info;
+  GstVaapiDecoderStatus status;
+  priv->decoder_state |= pi->state;
+  switch (pi->nalu.type) {
+    case GST_H265_NAL_VPS:
+      status = decode_vps (decoder, unit);
+      break;
+    case GST_H265_NAL_SPS:
+      status = decode_sps (decoder, unit);
+      break;
+    case GST_H265_NAL_PPS:
+      status = decode_pps (decoder, unit);
+      break;
+    case GST_H265_NAL_SLICE_TRAIL_N:
+    case GST_H265_NAL_SLICE_TRAIL_R:
+    case GST_H265_NAL_SLICE_TSA_N:
+    case GST_H265_NAL_SLICE_TSA_R:
+    case GST_H265_NAL_SLICE_STSA_N:
+    case GST_H265_NAL_SLICE_STSA_R:
+    case GST_H265_NAL_SLICE_RADL_N:
+    case GST_H265_NAL_SLICE_RADL_R:
+    case GST_H265_NAL_SLICE_RASL_N:
+    case GST_H265_NAL_SLICE_RASL_R:
+    case GST_H265_NAL_SLICE_BLA_W_LP:
+    case GST_H265_NAL_SLICE_BLA_W_RADL:
+    case GST_H265_NAL_SLICE_BLA_N_LP:
+    case GST_H265_NAL_SLICE_IDR_W_RADL:
+    case GST_H265_NAL_SLICE_IDR_N_LP:
+    case GST_H265_NAL_SLICE_CRA_NUT:
+      /* slice decoding will get started only after completing all the
+         initialization routines for each picture which is hanlding in
+         start_frame() call back, so the new_bitstream and prev_nal_is_eos
+         flags will have effects starting from the next frame onwards */
+      priv->new_bitstream = FALSE;
+      priv->prev_nal_is_eos = FALSE;
+      status = decode_slice (decoder, unit);
+      break;
+    case GST_H265_NAL_EOB:
+      priv->new_bitstream = TRUE;
+      GST_DEBUG
+          ("Next AU(if there is any) will be the begining of new bitstream");
+      status = decode_sequence_end (decoder);
+      break;
+    case GST_H265_NAL_EOS:
+      priv->prev_nal_is_eos = TRUE;
+      status = decode_sequence_end (decoder);
+      break;
+    case GST_H265_NAL_SUFFIX_SEI:
+    case GST_H265_NAL_PREFIX_SEI:
+      status = decode_sei (decoder, unit);
+      break;
+    default:
+      GST_WARNING ("unsupported NAL unit type %d", pi->nalu.type);
+      status = GST_VAAPI_DECODER_STATUS_ERROR_BITSTREAM_PARSER;
+      break;
+  }
+  return status;
+}
+
+static GstVaapiDecoderStatus
+gst_vaapi_decoder_h265_decode_codec_data (GstVaapiDecoder *
+    base_decoder, const guchar * buf, guint buf_size)
+{
+  GstVaapiDecoderH265 *const decoder =
+      GST_VAAPI_DECODER_H265_CAST (base_decoder);
+  GstVaapiDecoderH265Private *const priv = &decoder->priv;
+  GstVaapiDecoderStatus status;
+  GstVaapiDecoderUnit unit;
+  GstVaapiParserInfoH265 *pi = NULL;
+  GstH265ParserResult result;
+  guint num_nal_arrays, num_nals;
+  guint i, j, ofs;
+
+  unit.parsed_info = NULL;
+  if (buf_size < 23)
+    return GST_VAAPI_DECODER_STATUS_ERROR_NO_DATA;
+  if (buf[0] != 1) {
+    GST_ERROR ("failed to decode codec-data, not in hvcC format");
+    return GST_VAAPI_DECODER_STATUS_ERROR_BITSTREAM_PARSER;
+  }
+
+  priv->nal_length_size = (buf[21] & 0x03) + 1;
+  GST_DEBUG ("nal length size %u", priv->nal_length_size);
+  num_nal_arrays = buf[22];
+  ofs = 23;
+  for (i = 0; i < num_nal_arrays; i++) {
+    num_nals = GST_READ_UINT16_BE (buf + ofs + 1);
+    for (j = 0; j < num_nals; j++) {
+      pi = gst_vaapi_parser_info_h265_new ();
+      if (!pi)
+        return GST_VAAPI_DECODER_STATUS_ERROR_ALLOCATION_FAILED;
+      unit.parsed_info = pi;
+      result = gst_h265_parser_identify_nalu_hevc (priv->parser,
+          buf, ofs + 3, buf_size, 2, &pi->nalu);
+      if (result != GST_H265_PARSER_OK) {
+        status = get_status (result);
+        goto cleanup;
+      }
+
+      switch (pi->nalu.type) {
+        case GST_H265_NAL_VPS:
+          status = parse_vps (decoder, &unit);
+          if (status != GST_VAAPI_DECODER_STATUS_SUCCESS)
+            goto cleanup;
+          status = decode_vps (decoder, &unit);
+          if (status != GST_VAAPI_DECODER_STATUS_SUCCESS)
+            goto cleanup;
+          break;
+        case GST_H265_NAL_SPS:
+          status = parse_sps (decoder, &unit);
+          if (status != GST_VAAPI_DECODER_STATUS_SUCCESS)
+            goto cleanup;
+          status = decode_sps (decoder, &unit);
+          if (status != GST_VAAPI_DECODER_STATUS_SUCCESS)
+            goto cleanup;
+          break;
+        case GST_H265_NAL_PPS:
+          status = parse_pps (decoder, &unit);
+          if (status != GST_VAAPI_DECODER_STATUS_SUCCESS)
+            goto cleanup;
+          status = decode_pps (decoder, &unit);
+          if (status != GST_VAAPI_DECODER_STATUS_SUCCESS)
+            goto cleanup;
+          break;
+      }
+      gst_vaapi_parser_info_h265_replace (&pi, NULL);
+    }
+  }
+
+  priv->is_hvcC = TRUE;
+  status = GST_VAAPI_DECODER_STATUS_SUCCESS;
+cleanup:
+  gst_vaapi_parser_info_h265_replace (&pi, NULL);
+  return status;
+}
+
+static GstVaapiDecoderStatus
+ensure_decoder (GstVaapiDecoderH265 * decoder)
+{
+  GstVaapiDecoderH265Private *const priv = &decoder->priv;
+  GstVaapiDecoderStatus status;
+
+  if (!priv->is_opened) {
+    priv->is_opened = gst_vaapi_decoder_h265_open (decoder);
+    if (!priv->is_opened)
+      return GST_VAAPI_DECODER_STATUS_ERROR_UNSUPPORTED_CODEC;
+    status =
+        gst_vaapi_decoder_decode_codec_data (GST_VAAPI_DECODER_CAST (decoder));
+    if (status != GST_VAAPI_DECODER_STATUS_SUCCESS)
+      return status;
+  }
+  return GST_VAAPI_DECODER_STATUS_SUCCESS;
+}
+
+static GstVaapiDecoderStatus
+gst_vaapi_decoder_h265_parse (GstVaapiDecoder * base_decoder,
+    GstAdapter * adapter, gboolean at_eos, GstVaapiDecoderUnit * unit)
+{
+  GstVaapiDecoderH265 *const decoder =
+      GST_VAAPI_DECODER_H265_CAST (base_decoder);
+  GstVaapiDecoderH265Private *const priv = &decoder->priv;
+  GstVaapiParserState *const ps = GST_VAAPI_PARSER_STATE (base_decoder);
+  GstVaapiParserInfoH265 *pi;
+  GstVaapiDecoderStatus status;
+  GstH265ParserResult result;
+  guchar *buf;
+  guint i, size, buf_size, nalu_size, flags;
+  guint32 start_code;
+  gint ofs, ofs2;
+  gboolean at_au_end = FALSE;
+
+  status = ensure_decoder (decoder);
+  if (status != GST_VAAPI_DECODER_STATUS_SUCCESS)
+    return status;
+
+  switch (priv->stream_alignment) {
+    case GST_VAAPI_STREAM_ALIGN_H265_NALU:
+    case GST_VAAPI_STREAM_ALIGN_H265_AU:
+      size = gst_adapter_available_fast (adapter);
+      break;
+    default:
+      size = gst_adapter_available (adapter);
+      break;
+  }
+
+  if (priv->is_hvcC) {
+    if (size < priv->nal_length_size)
+      return GST_VAAPI_DECODER_STATUS_ERROR_NO_DATA;
+    buf = (guchar *) & start_code;
+    g_assert (priv->nal_length_size <= sizeof (start_code));
+    gst_adapter_copy (adapter, buf, 0, priv->nal_length_size);
+    nalu_size = 0;
+    for (i = 0; i < priv->nal_length_size; i++)
+      nalu_size = (nalu_size << 8) | buf[i];
+    buf_size = priv->nal_length_size + nalu_size;
+    if (size < buf_size)
+      return GST_VAAPI_DECODER_STATUS_ERROR_NO_DATA;
+    else if (priv->stream_alignment == GST_VAAPI_STREAM_ALIGN_H265_AU)
+      at_au_end = (buf_size == size);
+  } else {
+    if (size < 4)
+      return GST_VAAPI_DECODER_STATUS_ERROR_NO_DATA;
+    if (priv->stream_alignment == GST_VAAPI_STREAM_ALIGN_H265_NALU)
+      buf_size = size;
+    else {
+      ofs = scan_for_start_code (adapter, 0, size, NULL);
+      if (ofs < 0)
+        return GST_VAAPI_DECODER_STATUS_ERROR_NO_DATA;
+      if (ofs > 0) {
+        gst_adapter_flush (adapter, ofs);
+        size -= ofs;
+      }
+
+      ofs2 = ps->input_offset2 - ofs - 4;
+      if (ofs2 < 4)
+        ofs2 = 4;
+      ofs = G_UNLIKELY (size < ofs2 + 4) ? -1 :
+          scan_for_start_code (adapter, ofs2, size - ofs2, NULL);
+      if (ofs < 0) {
+        // Assume the whole NAL unit is present if end-of-stream
+        // or stream buffers aligned on access unit boundaries
+        if (priv->stream_alignment == GST_VAAPI_STREAM_ALIGN_H265_AU)
+          at_au_end = TRUE;
+        else if (!at_eos) {
+          ps->input_offset2 = size;
+          return GST_VAAPI_DECODER_STATUS_ERROR_NO_DATA;
+        }
+        ofs = size;
+      }
+      buf_size = ofs;
+    }
+  }
+  ps->input_offset2 = 0;
+  buf = (guchar *) gst_adapter_map (adapter, buf_size);
+  if (!buf)
+    return GST_VAAPI_DECODER_STATUS_ERROR_NO_DATA;
+  unit->size = buf_size;
+  pi = gst_vaapi_parser_info_h265_new ();
+  if (!pi)
+    return GST_VAAPI_DECODER_STATUS_ERROR_ALLOCATION_FAILED;
+  gst_vaapi_decoder_unit_set_parsed_info (unit,
+      pi, (GDestroyNotify) gst_vaapi_mini_object_unref);
+  if (priv->is_hvcC)
+    result = gst_h265_parser_identify_nalu_hevc (priv->parser,
+        buf, 0, buf_size, priv->nal_length_size, &pi->nalu);
+  else
+    result = gst_h265_parser_identify_nalu_unchecked (priv->parser,
+        buf, 0, buf_size, &pi->nalu);
+  status = get_status (result);
+  if (status != GST_VAAPI_DECODER_STATUS_SUCCESS)
+    return status;
+  switch (pi->nalu.type) {
+    case GST_H265_NAL_VPS:
+      status = parse_vps (decoder, unit);
+      break;
+    case GST_H265_NAL_SPS:
+      status = parse_sps (decoder, unit);
+      break;
+    case GST_H265_NAL_PPS:
+      status = parse_pps (decoder, unit);
+      break;
+    case GST_H265_NAL_PREFIX_SEI:
+    case GST_H265_NAL_SUFFIX_SEI:
+      status = parse_sei (decoder, unit);
+      break;
+    case GST_H265_NAL_SLICE_TRAIL_N:
+    case GST_H265_NAL_SLICE_TRAIL_R:
+    case GST_H265_NAL_SLICE_TSA_N:
+    case GST_H265_NAL_SLICE_TSA_R:
+    case GST_H265_NAL_SLICE_STSA_N:
+    case GST_H265_NAL_SLICE_STSA_R:
+    case GST_H265_NAL_SLICE_RADL_N:
+    case GST_H265_NAL_SLICE_RADL_R:
+    case GST_H265_NAL_SLICE_RASL_N:
+    case GST_H265_NAL_SLICE_RASL_R:
+    case GST_H265_NAL_SLICE_BLA_W_LP:
+    case GST_H265_NAL_SLICE_BLA_W_RADL:
+    case GST_H265_NAL_SLICE_BLA_N_LP:
+    case GST_H265_NAL_SLICE_IDR_W_RADL:
+    case GST_H265_NAL_SLICE_IDR_N_LP:
+    case GST_H265_NAL_SLICE_CRA_NUT:
+      status = parse_slice (decoder, unit);
+      break;
+    default:
+      status = GST_VAAPI_DECODER_STATUS_SUCCESS;
+      break;
+  }
+  if (status != GST_VAAPI_DECODER_STATUS_SUCCESS)
+    return status;
+  flags = 0;
+  if (at_au_end) {
+    flags |= GST_VAAPI_DECODER_UNIT_FLAG_FRAME_END |
+        GST_VAAPI_DECODER_UNIT_FLAG_AU_END;
+  }
+
+  switch (pi->nalu.type) {
+    case GST_H265_NAL_AUD:
+      flags |= GST_VAAPI_DECODER_UNIT_FLAG_AU_START;
+      flags |= GST_VAAPI_DECODER_UNIT_FLAG_FRAME_START;
+      /* fall-through */
+    case GST_H265_NAL_FD:
+      flags |= GST_VAAPI_DECODER_UNIT_FLAG_SKIP;
+      break;
+    case GST_H265_NAL_EOB:
+      flags |= GST_VAAPI_DECODER_UNIT_FLAG_STREAM_END;
+      /* fall-through */
+    case GST_H265_NAL_SUFFIX_SEI:
+    case GST_H265_NAL_EOS:
+      flags |= GST_VAAPI_DECODER_UNIT_FLAG_FRAME_END;
+      flags |= GST_VAAPI_DECODER_UNIT_FLAG_AU_END;
+      break;
+    case GST_H265_NAL_VPS:
+    case GST_H265_NAL_SPS:
+    case GST_H265_NAL_PPS:
+    case GST_H265_NAL_PREFIX_SEI:
+      flags |= GST_VAAPI_DECODER_UNIT_FLAG_AU_START;
+      flags |= GST_VAAPI_DECODER_UNIT_FLAG_FRAME_START;
+      break;
+    case GST_H265_NAL_SLICE_TRAIL_N:
+    case GST_H265_NAL_SLICE_TRAIL_R:
+    case GST_H265_NAL_SLICE_TSA_N:
+    case GST_H265_NAL_SLICE_TSA_R:
+    case GST_H265_NAL_SLICE_STSA_N:
+    case GST_H265_NAL_SLICE_STSA_R:
+    case GST_H265_NAL_SLICE_RADL_N:
+    case GST_H265_NAL_SLICE_RADL_R:
+    case GST_H265_NAL_SLICE_RASL_N:
+    case GST_H265_NAL_SLICE_RASL_R:
+    case GST_H265_NAL_SLICE_BLA_W_LP:
+    case GST_H265_NAL_SLICE_BLA_W_RADL:
+    case GST_H265_NAL_SLICE_BLA_N_LP:
+    case GST_H265_NAL_SLICE_IDR_W_RADL:
+    case GST_H265_NAL_SLICE_IDR_N_LP:
+    case GST_H265_NAL_SLICE_CRA_NUT:
+      flags |= GST_VAAPI_DECODER_UNIT_FLAG_SLICE;
+      if (priv->prev_pi &&
+          (priv->prev_pi->flags & GST_VAAPI_DECODER_UNIT_FLAG_AU_END)) {
+        flags |= GST_VAAPI_DECODER_UNIT_FLAG_AU_START |
+            GST_VAAPI_DECODER_UNIT_FLAG_FRAME_START;
+      } else if (is_new_picture (pi, priv->prev_slice_pi)) {
+        flags |= GST_VAAPI_DECODER_UNIT_FLAG_FRAME_START;
+        if (is_new_access_unit (pi, priv->prev_slice_pi))
+          flags |= GST_VAAPI_DECODER_UNIT_FLAG_AU_START;
+      }
+      gst_vaapi_parser_info_h265_replace (&priv->prev_slice_pi, pi);
+      if (!pi->data.slice_hdr.dependent_slice_segment_flag)
+        gst_vaapi_parser_info_h265_replace (&priv->prev_independent_slice_pi,
+            pi);
+      break;
+    default:
+      /* Fix */
+      break;
+  }
+  if ((flags & GST_VAAPI_DECODER_UNIT_FLAGS_AU) && priv->prev_slice_pi)
+    priv->prev_slice_pi->flags |= GST_VAAPI_DECODER_UNIT_FLAG_AU_END;
+  GST_VAAPI_DECODER_UNIT_FLAG_SET (unit, flags);
+  pi->nalu.data = NULL;
+  pi->state = priv->parser_state;
+  pi->flags = flags;
+  gst_vaapi_parser_info_h265_replace (&priv->prev_pi, pi);
+  return GST_VAAPI_DECODER_STATUS_SUCCESS;
+}
+
+static GstVaapiDecoderStatus
+gst_vaapi_decoder_h265_decode (GstVaapiDecoder * base_decoder,
+    GstVaapiDecoderUnit * unit)
+{
+  GstVaapiDecoderH265 *const decoder =
+      GST_VAAPI_DECODER_H265_CAST (base_decoder);
+  GstVaapiDecoderStatus status;
+
+  status = ensure_decoder (decoder);
+  if (status != GST_VAAPI_DECODER_STATUS_SUCCESS)
+    return status;
+  return decode_unit (decoder, unit);
+}
+
+static GstVaapiDecoderStatus
+gst_vaapi_decoder_h265_start_frame (GstVaapiDecoder * base_decoder,
+    GstVaapiDecoderUnit * unit)
+{
+  GstVaapiDecoderH265 *const decoder =
+      GST_VAAPI_DECODER_H265_CAST (base_decoder);
+
+  return decode_picture (decoder, unit);
+}
+
+static GstVaapiDecoderStatus
+gst_vaapi_decoder_h265_end_frame (GstVaapiDecoder * base_decoder)
+{
+  GstVaapiDecoderH265 *const decoder =
+      GST_VAAPI_DECODER_H265_CAST (base_decoder);
+
+  return decode_current_picture (decoder);
+}
+
+static GstVaapiDecoderStatus
+gst_vaapi_decoder_h265_flush (GstVaapiDecoder * base_decoder)
+{
+  GstVaapiDecoderH265 *const decoder =
+      GST_VAAPI_DECODER_H265_CAST (base_decoder);
+
+  dpb_flush (decoder);
+  return GST_VAAPI_DECODER_STATUS_SUCCESS;
+}
+
+static void
+gst_vaapi_decoder_h265_class_init (GstVaapiDecoderH265Class * klass)
+{
+  GstVaapiMiniObjectClass *const object_class =
+      GST_VAAPI_MINI_OBJECT_CLASS (klass);
+  GstVaapiDecoderClass *const decoder_class = GST_VAAPI_DECODER_CLASS (klass);
+
+  object_class->size = sizeof (GstVaapiDecoderH265);
+  object_class->finalize = (GDestroyNotify) gst_vaapi_decoder_finalize;
+  decoder_class->create = gst_vaapi_decoder_h265_create;
+  decoder_class->destroy = gst_vaapi_decoder_h265_destroy;
+  decoder_class->parse = gst_vaapi_decoder_h265_parse;
+  decoder_class->decode = gst_vaapi_decoder_h265_decode;
+  decoder_class->start_frame = gst_vaapi_decoder_h265_start_frame;
+  decoder_class->end_frame = gst_vaapi_decoder_h265_end_frame;
+  decoder_class->flush = gst_vaapi_decoder_h265_flush;
+  decoder_class->decode_codec_data = gst_vaapi_decoder_h265_decode_codec_data;
+}
+
+static inline const GstVaapiDecoderClass *
+gst_vaapi_decoder_h265_class (void)
+{
+  static GstVaapiDecoderH265Class g_class;
+  static gsize g_class_init = FALSE;
+
+  if (g_once_init_enter (&g_class_init)) {
+    gst_vaapi_decoder_h265_class_init (&g_class);
+    g_once_init_leave (&g_class_init, TRUE);
+  }
+  return GST_VAAPI_DECODER_CLASS (&g_class);
+}
+
+/**
+ * gst_vaapi_decoder_h265_set_alignment:
+ * @decoder: a #GstVaapiDecoderH265
+ * @alignment: the #GstVaapiStreamAlignH265
+ *
+ * Specifies how stream buffers are aligned / fed, i.e. the boundaries
+ * of each buffer that is supplied to the decoder. This could be no
+ * specific alignment, NAL unit boundaries, or access unit boundaries.
+ */
+void
+gst_vaapi_decoder_h265_set_alignment (GstVaapiDecoderH265 * decoder,
+    GstVaapiStreamAlignH265 alignment)
+{
+  g_return_if_fail (decoder != NULL);
+  decoder->priv.stream_alignment = alignment;
+}
+
+/**
+ * gst_vaapi_decoder_h265_new:
+ * @display: a #GstVaapiDisplay
+ * @caps: a #GstCaps holding codec information
+ *
+ * Creates a new #GstVaapiDecoder for MPEG-2 decoding.  The @caps can
+ * hold extra information like codec-data and pictured coded size.
+ *
+ * Return value: the newly allocated #GstVaapiDecoder object
+ */
+GstVaapiDecoder *
+gst_vaapi_decoder_h265_new (GstVaapiDisplay * display, GstCaps * caps)
+{
+  return gst_vaapi_decoder_new (gst_vaapi_decoder_h265_class (), display, caps);
+}
diff -Nru gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapidecoder_h265.h gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapidecoder_h265.h
--- gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapidecoder_h265.h	1970-01-01 00:00:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapidecoder_h265.h	2015-07-15 12:47:43.000000000 +0000
@@ -0,0 +1,61 @@
+/*
+ *  gstvaapidecoder_h265.h - H.265 decoder
+ *
+ *  Copyright (C) 2015 Intel Corporation
+ *    Author: Sreerenj Balachandran <sreerenj.balachandran@intel.com>
+ *    Author: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public License
+ *  as published by the Free Software Foundation; either version 2.1
+ *  of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free
+ *  Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ *  Boston, MA 02110-1301 USA
+ */
+
+#ifndef GST_VAAPI_DECODER_H265_H
+#define GST_VAAPI_DECODER_H265_H
+
+#include <gst/vaapi/gstvaapidecoder.h>
+
+G_BEGIN_DECLS
+
+#define GST_VAAPI_DECODER_H265(decoder) \
+    ((GstVaapiDecoderH265 *)(decoder))
+
+typedef struct _GstVaapiDecoderH265             GstVaapiDecoderH265;
+
+/**
+ * GstVaapiStreamAlignH265:
+ * @GST_VAAPI_STREAM_ALIGN_H265_NONE: Generic H.265 stream buffers
+ * @GST_VAAPI_STREAM_ALIGN_H265_NALU: H.265 stream buffers aligned NAL
+ *   unit boundaries
+ * @GST_VAAPI_STREAM_ALIGN_H265_AU: H.265 stream buffers aligned on
+ *   access unit boundaries
+ *
+ * Set of possible buffer alignments for H.265 streams.
+ */
+typedef enum {
+    GST_VAAPI_STREAM_ALIGN_H265_NONE,
+    GST_VAAPI_STREAM_ALIGN_H265_NALU,
+    GST_VAAPI_STREAM_ALIGN_H265_AU
+} GstVaapiStreamAlignH265;
+
+GstVaapiDecoder *
+gst_vaapi_decoder_h265_new(GstVaapiDisplay *display, GstCaps *caps);
+
+void
+gst_vaapi_decoder_h265_set_alignment(GstVaapiDecoderH265 *decoder,
+    GstVaapiStreamAlignH265 alignment);
+
+G_END_DECLS
+
+#endif /* GST_VAAPI_DECODER_H265_H */
diff -Nru gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapidecoder_jpeg.c gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapidecoder_jpeg.c
--- gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapidecoder_jpeg.c	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapidecoder_jpeg.c	2015-07-15 12:47:43.000000000 +0000
@@ -241,7 +241,7 @@
 
 drop_frame:
     priv->decoder_state = 0;
-    return GST_VAAPI_DECODER_STATUS_DROP_FRAME;
+    return (GstVaapiDecoderStatus) GST_VAAPI_DECODER_STATUS_DROP_FRAME;
 }
 
 static gboolean
diff -Nru gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapidecoder_mpeg2.c gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapidecoder_mpeg2.c
--- gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapidecoder_mpeg2.c	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapidecoder_mpeg2.c	2015-07-15 12:47:43.000000000 +0000
@@ -128,11 +128,16 @@
     GstClockTime pts;
 
     if (!GST_CLOCK_TIME_IS_VALID(tsg->gop_pts))
-        tsg->gop_pts = 0;
+        tsg->gop_pts = pts_get_duration(tsg, pic_tsn);
 
     pts = pic_pts;
     if (!GST_CLOCK_TIME_IS_VALID (pts))
        pts = tsg->gop_pts + pts_get_duration(tsg, tsg->ovl_tsn * 1024 + pic_tsn);
+    else if (pts == tsg->gop_pts) {
+        /* The picture following the GOP header shall be an I-frame.
+           So we can compensate for the GOP start time from here */
+        tsg->gop_pts -= pts_get_duration(tsg, pic_tsn);
+    }
 
     if (!GST_CLOCK_TIME_IS_VALID(tsg->max_pts) || tsg->max_pts < pts)
         tsg->max_pts = pts;
@@ -308,6 +313,8 @@
     gst_vaapi_parser_info_mpeg2_replace(&priv->quant_matrix, NULL);
     gst_vaapi_parser_info_mpeg2_replace(&priv->slice_hdr, NULL);
 
+    priv->state = 0;
+
     gst_vaapi_dpb_replace(&priv->dpb, NULL);
 }
 
@@ -550,7 +557,7 @@
 
 drop_frame:
     priv->state &= GST_MPEG_VIDEO_STATE_VALID_SEQ_HEADERS;
-    return GST_VAAPI_DECODER_STATUS_DROP_FRAME;
+    return (GstVaapiDecoderStatus) GST_VAAPI_DECODER_STATUS_DROP_FRAME;
 }
 
 static GstVaapiDecoderStatus
@@ -774,7 +781,8 @@
 {
     GstVaapiDecoderMpeg2Private * const priv = &decoder->priv;
 
-    gst_vaapi_dpb_flush(priv->dpb);
+    if (priv->dpb)
+        gst_vaapi_dpb_flush(priv->dpb);
     return GST_VAAPI_DECODER_STATUS_SUCCESS;
 }
 
@@ -1103,6 +1111,9 @@
                     GST_MPEG_VIDEO_STATE_GOT_PIC_HDR|
                     GST_MPEG_VIDEO_STATE_GOT_PIC_EXT);
 
+    if (!is_valid_state(decoder, GST_MPEG_VIDEO_STATE_VALID_PIC_HEADERS))
+        return GST_VAAPI_DECODER_STATUS_SUCCESS;
+
     if (!gst_vaapi_parser_info_mpeg2_ensure(&priv->slice_hdr)) {
         GST_ERROR("failed to allocate parser info for slice header");
         return GST_VAAPI_DECODER_STATUS_ERROR_ALLOCATION_FAILED;
@@ -1135,8 +1146,6 @@
         GST_VAAPI_DECODER_CODEC_FRAME(decoder)->input_buffer;
     GstMapInfo map_info;
 
-    GST_DEBUG("slice %d (%u bytes)", slice_hdr->mb_row, unit->size);
-
     if (!is_valid_state(decoder, GST_MPEG_VIDEO_STATE_VALID_PIC_HEADERS))
         return GST_VAAPI_DECODER_STATUS_SUCCESS;
 
@@ -1145,6 +1154,8 @@
         return GST_VAAPI_DECODER_STATUS_ERROR_UNKNOWN;
     }
 
+    GST_DEBUG("slice %d (%u bytes)", slice_hdr->mb_row, unit->size);
+
     slice = GST_VAAPI_SLICE_NEW(MPEG2, decoder,
         (map_info.data + unit->offset), unit->size);
     gst_buffer_unmap(buffer, &map_info);
@@ -1537,7 +1548,8 @@
         GST_VAAPI_DECODER_MPEG2_CAST(base_decoder);
     GstVaapiDecoderMpeg2Private * const priv = &decoder->priv;
 
-    gst_vaapi_dpb_flush(priv->dpb);
+    if (priv->dpb)
+      gst_vaapi_dpb_flush(priv->dpb);
     return GST_VAAPI_DECODER_STATUS_SUCCESS;
 }
 
diff -Nru gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapidecoder_mpeg4.c gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapidecoder_mpeg4.c
--- gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapidecoder_mpeg4.c	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapidecoder_mpeg4.c	2015-07-15 12:47:43.000000000 +0000
@@ -518,7 +518,7 @@
         parser_result = gst_mpeg4_parse_video_object_plane(vop_hdr, sprite_trajectory, vol_hdr, buf, buf_size);
         /* Need to skip this frame if VOP was not coded */
         if (GST_MPEG4_PARSER_OK == parser_result && !vop_hdr->coded)
-            return GST_VAAPI_DECODER_STATUS_DROP_FRAME;
+            return (GstVaapiDecoderStatus) GST_VAAPI_DECODER_STATUS_DROP_FRAME;
     }
 
     if (parser_result != GST_MPEG4_PARSER_OK) {
@@ -818,9 +818,6 @@
     GstMpeg4Packet *tos = &packet;
     GstVaapiDecoderStatus status;
 
-    if (tos->size < 0)
-        return GST_VAAPI_DECODER_STATUS_ERROR_NO_DATA;
-
     // packet.size is the size from current marker to the next.
     if (tos->type == GST_MPEG4_VISUAL_OBJ_SEQ_START) {
         status = decode_sequence(decoder, packet.data + packet.offset, packet.size);
diff -Nru gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapidecoder_objects.c gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapidecoder_objects.c
--- gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapidecoder_objects.c	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapidecoder_objects.c	2015-07-15 12:47:43.000000000 +0000
@@ -114,6 +114,7 @@
             GST_VAAPI_PICTURE_FLAG_REFERENCE |
             GST_VAAPI_PICTURE_FLAG_INTERLACED |
             GST_VAAPI_PICTURE_FLAG_FF | GST_VAAPI_PICTURE_FLAG_TFF |
+            GST_VAAPI_PICTURE_FLAG_ONEFIELD |
             GST_VAAPI_PICTURE_FLAG_RFF | GST_VAAPI_PICTURE_FLAG_MVC));
 
     picture->structure = parent_picture->structure;
@@ -194,6 +195,21 @@
   if (!object)
     return NULL;
   return GST_VAAPI_PICTURE_CAST (object);
+}
+
+GstVaapiPicture *
+gst_vaapi_picture_new_clone (GstVaapiPicture * picture)
+{
+  GstVaapiDecoder *const decoder = GET_DECODER (picture);
+  GstVaapiCodecObject *object;
+
+  object = gst_vaapi_codec_object_new (gst_vaapi_codec_object_get_class
+      (&picture->parent_instance), GST_VAAPI_CODEC_BASE (decoder), NULL,
+      picture->param_size, picture, 0,
+      GST_VAAPI_CREATE_PICTURE_FLAG_CLONE);
+  if (!object)
+    return NULL;
+  return GST_VAAPI_PICTURE_CAST (object);
 }
 
 void
diff -Nru gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapidecoder_objects.h gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapidecoder_objects.h
--- gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapidecoder_objects.h	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapidecoder_objects.h	2015-07-15 12:47:43.000000000 +0000
@@ -179,6 +179,10 @@
 gst_vaapi_picture_new_field (GstVaapiPicture * picture);
 
 G_GNUC_INTERNAL
+GstVaapiPicture *
+gst_vaapi_picture_new_clone (GstVaapiPicture * picture);
+
+G_GNUC_INTERNAL
 void
 gst_vaapi_picture_add_slice (GstVaapiPicture * picture, GstVaapiSlice * slice);
 
diff -Nru gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapidecoder_priv.h gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapidecoder_priv.h
--- gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapidecoder_priv.h	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapidecoder_priv.h	2015-07-15 12:47:43.000000000 +0000
@@ -275,10 +275,6 @@
 
 G_GNUC_INTERNAL
 GstVaapiDecoderStatus
-gst_vaapi_decoder_check_status (GstVaapiDecoder * decoder);
-
-G_GNUC_INTERNAL
-GstVaapiDecoderStatus
 gst_vaapi_decoder_decode_codec_data (GstVaapiDecoder * decoder);
 
 G_END_DECLS
diff -Nru gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapidecoder_vc1.c gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapidecoder_vc1.c
--- gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapidecoder_vc1.c	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapidecoder_vc1.c	2015-07-15 12:47:43.000000000 +0000
@@ -63,6 +63,7 @@
     GstVaapiDpb                *dpb;
     gint32                      next_poc;
     guint8                     *rbdu_buffer;
+    guint8                      rndctrl;
     guint                       rbdu_buffer_size;
     guint                       is_opened               : 1;
     guint                       is_first_field          : 1;
@@ -173,6 +174,7 @@
     GstVaapiDecoderVC1Private * const priv = &decoder->priv;
 
     priv->profile = (GstVaapiProfile)0;
+    priv->rndctrl = 0;
     return TRUE;
 }
 
@@ -668,7 +670,6 @@
     pic_param->cbp_table                                            = pic->cbptab;
     pic_param->mb_mode_table                                        = 0; /* XXX: interlaced frame */
     pic_param->range_reduction_frame                                = pic->rangeredfrm;
-    pic_param->rounding_control                                     = 0; /* advanced profile only */
     pic_param->post_processing                                      = 0; /* advanced profile only */
     pic_param->picture_resolution_index                             = pic->respic;
     pic_param->luma_scale                                           = pic->lumscale;
@@ -686,6 +687,16 @@
     pic_param->transform_fields.bits.mb_level_transform_type_flag   = pic->ttmbf;
     pic_param->transform_fields.bits.frame_level_transform_type     = pic->ttfrm;
     pic_param->transform_fields.bits.transform_ac_codingset_idx2    = pic->transacfrm2;
+
+    /* Refer to 8.3.7 Rounding control for Simple and Main Profile  */
+    if (frame_hdr->ptype == GST_VC1_PICTURE_TYPE_I ||
+        frame_hdr->ptype == GST_VC1_PICTURE_TYPE_BI)
+        priv->rndctrl = 1;
+    else if (frame_hdr->ptype == GST_VC1_PICTURE_TYPE_P)
+        priv->rndctrl ^= 1;
+
+    pic_param->rounding_control = priv->rndctrl;
+
     return TRUE;
 }
 
@@ -1060,6 +1071,13 @@
     case GST_VC1_END_OF_SEQ:
         status = decode_sequence_end(decoder);
         break;
+    case GST_VC1_FIELD_USER:
+    case GST_VC1_FRAME_USER:
+    case GST_VC1_ENTRY_POINT_USER:
+    case GST_VC1_SEQUENCE_USER:
+        /* Let's just ignore them */
+        status = GST_VAAPI_DECODER_STATUS_SUCCESS;
+        break;
     default:
         GST_WARNING("unsupported BDU type %d", ebdu->type);
         status = GST_VAAPI_DECODER_STATUS_ERROR_BITSTREAM_PARSER;
@@ -1106,6 +1124,7 @@
     gint width, height;
     guint32 format;
     gint version;
+    const gchar *s;
 
     priv->has_codec_data = TRUE;
 
@@ -1118,7 +1137,10 @@
 
     caps = GST_VAAPI_DECODER_CODEC_STATE(decoder)->caps;
     structure = gst_caps_get_structure(caps, 0);
-    if (!gst_structure_get_fourcc(structure, "format", &format)) {
+    s = gst_structure_get_string(structure, "format");
+    if (s && strlen(s) == 4) {
+        format = GST_MAKE_FOURCC(s[0], s[1], s[2], s[3]);
+    } else {
         /* Try to determine format from "wmvversion" property */
         if (gst_structure_get_int(structure, "wmvversion", &version))
             format = (version >= 1 && version <= 3) ?
diff -Nru gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapidisplay.c gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapidisplay.c
--- gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapidisplay.c	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapidisplay.c	2015-07-15 12:47:43.000000000 +0000
@@ -163,6 +163,10 @@
     {GST_VAAPI_DISPLAY_TYPE_GLX,
         "VA/GLX display", "glx"},
 #endif
+#if USE_EGL
+    {GST_VAAPI_DISPLAY_TYPE_EGL,
+        "VA/EGL display", "egl"},
+#endif
 #if USE_WAYLAND
     {GST_VAAPI_DISPLAY_TYPE_WAYLAND,
         "VA/Wayland display", "wayland"},
@@ -201,6 +205,10 @@
       if (type2 == GST_VAAPI_DISPLAY_TYPE_X11)
         return TRUE;
       break;
+    case GST_VAAPI_DISPLAY_TYPE_X11:
+      if (type2 == GST_VAAPI_DISPLAY_TYPE_EGL)
+        return TRUE;
+      break;
     default:
       break;
   }
@@ -557,6 +565,7 @@
           g_array_append_val (priv->decoders, config);
           break;
         case GST_VAAPI_ENTRYPOINT_SLICE_ENCODE:
+        case GST_VAAPI_ENTRYPOINT_PICTURE_ENCODE:
           g_array_append_val (priv->encoders, config);
           break;
       }
@@ -2133,8 +2142,9 @@
 {
   GstVaapiDisplayClass *klass;
 
-  g_return_val_if_fail (display != NULL, NULL);
+  g_return_val_if_fail (display != NULL, FALSE);
 
   klass = GST_VAAPI_DISPLAY_GET_CLASS (display);
-  return (klass->display_type == GST_VAAPI_DISPLAY_TYPE_GLX);
+  return (klass->display_type == GST_VAAPI_DISPLAY_TYPE_GLX ||
+          klass->display_type == GST_VAAPI_DISPLAY_TYPE_EGL);
 }
diff -Nru gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapidisplay_drm.c gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapidisplay_drm.c
--- gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapidisplay_drm.c	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapidisplay_drm.c	2015-07-15 12:47:43.000000000 +0000
@@ -382,6 +382,7 @@
   GstVaapiDisplay *display;
   guint types[2], i, num_types = 0;
 
+  g_mutex_lock (&g_drm_device_type_lock);
   if (device_path)
     types[num_types++] = 0;
   else if (g_drm_device_type)
@@ -391,7 +392,6 @@
     types[num_types++] = DRM_DEVICE_LEGACY;
   }
 
-  g_mutex_lock (&g_drm_device_type_lock);
   for (i = 0; i < num_types; i++) {
     g_drm_device_type = types[i];
     display = gst_vaapi_display_new (gst_vaapi_display_drm_class (),
diff -Nru gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapidisplay_egl.c gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapidisplay_egl.c
--- gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapidisplay_egl.c	1970-01-01 00:00:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapidisplay_egl.c	2015-07-15 12:47:43.000000000 +0000
@@ -0,0 +1,617 @@
+/*
+ *  gstvaapidisplay_egl.c - VA/EGL display abstraction
+ *
+ *  Copyright (C) 2014 Intel Corporation
+ *    Author: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public License
+ *  as published by the Free Software Foundation; either version 2.1
+ *  of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free
+ *  Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ *  Boston, MA 02110-1301 USA
+ */
+
+#include "sysdeps.h"
+#include <gmodule.h>
+#include "gstvaapidisplay_egl.h"
+#include "gstvaapidisplay_egl_priv.h"
+#include "gstvaapiwindow.h"
+#include "gstvaapiwindow_egl.h"
+#include "gstvaapiwindow_priv.h"
+#include "gstvaapitexture_egl.h"
+
+GST_DEBUG_CATEGORY (gst_debug_vaapidisplay_egl);
+
+/* ------------------------------------------------------------------------- */
+/* --- Display backend loader                                            --- */
+/* ------------------------------------------------------------------------- */
+
+typedef struct _GstVaapiDisplayLoader GstVaapiDisplayLoader;
+typedef struct _GstVaapiDisplayLoaderInfo GstVaapiDisplayLoaderInfo;
+
+typedef GstVaapiDisplay *(*GstVaapiDisplayCreateFunc) (const gchar * name);
+typedef GstVaapiDisplay *(*GstVaapiDisplayCreateFromNativeFunc) (gpointer dpy);
+
+struct _GstVaapiDisplayLoader
+{
+  GstVaapiMiniObject parent_instance;
+
+  GModule *module;
+  GPtrArray *module_names;
+  GstVaapiDisplayCreateFunc create_display;
+  GstVaapiDisplayCreateFromNativeFunc create_display_from_native;
+};
+
+struct _GstVaapiDisplayLoaderInfo
+{
+  const gchar *name;
+  GstVaapiDisplayType type;
+  const gchar *create_display;
+  const gchar *create_display_from_native;
+};
+
+static GMutex g_loader_lock;
+static GstVaapiDisplayLoader *g_loader;
+
+/* *INDENT-OFF* */
+static const GstVaapiDisplayLoaderInfo g_loader_info[] = {
+#if USE_WAYLAND
+  { "wayland",
+    GST_VAAPI_DISPLAY_TYPE_WAYLAND,
+    "gst_vaapi_display_wayland_new",
+    "gst_vaapi_display_wayland_new_with_display",
+  },
+#endif
+#if USE_X11
+  { "x11",
+    GST_VAAPI_DISPLAY_TYPE_X11,
+    "gst_vaapi_display_x11_new",
+    "gst_vaapi_display_x11_new_with_display",
+  },
+#endif
+  {NULL,}
+};
+/* *INDENT-ON* */
+
+static void
+gst_vaapi_display_loader_finalize (GstVaapiDisplayLoader * loader)
+{
+  if (!loader)
+    return;
+
+  if (loader->module) {
+    g_module_close (loader->module);
+    loader->module = NULL;
+  }
+
+  if (loader->module_names) {
+    g_ptr_array_unref (loader->module_names);
+    loader->module_names = NULL;
+  }
+}
+
+static inline const GstVaapiMiniObjectClass *
+gst_vaapi_display_loader_class (void)
+{
+  static const GstVaapiMiniObjectClass g_class = {
+    .size = sizeof (GstVaapiDisplayLoader),
+    .finalize = (GDestroyNotify) gst_vaapi_display_loader_finalize,
+  };
+  return &g_class;
+}
+
+static inline GstVaapiDisplayLoader *
+gst_vaapi_display_loader_new (void)
+{
+  return (GstVaapiDisplayLoader *)
+      gst_vaapi_mini_object_new0 (gst_vaapi_display_loader_class ());
+}
+
+static gboolean
+gst_vaapi_display_loader_reset_module_names (GstVaapiDisplayLoader * loader,
+    const GstVaapiDisplayLoaderInfo * loader_info)
+{
+  gchar *module_name;
+
+  if (loader->module_names)
+    g_ptr_array_unref (loader->module_names);
+  loader->module_names = g_ptr_array_new_full (3, (GDestroyNotify) g_free);
+  if (!loader->module_names)
+    return FALSE;
+
+  module_name =
+      g_strdup_printf ("libgstvaapi-%s-%s.la", loader_info->name,
+      GST_API_VERSION_S);
+  if (module_name)
+    g_ptr_array_add (loader->module_names, module_name);
+
+  module_name =
+      g_strdup_printf ("libgstvaapi-%s-%s.so", loader_info->name,
+      GST_API_VERSION_S);
+  if (module_name)
+    g_ptr_array_add (loader->module_names, module_name);
+
+  module_name =
+      g_strdup_printf ("libgstvaapi-%s-%s.so.%s", loader_info->name,
+      GST_API_VERSION_S, GST_VAAPI_MAJOR_VERSION_S);
+  if (module_name)
+    g_ptr_array_add (loader->module_names, module_name);
+
+  return loader->module_names->len > 0;
+}
+
+static gboolean
+gst_vaapi_display_loader_try_load_module (GstVaapiDisplayLoader * loader,
+    const GstVaapiDisplayLoaderInfo * loader_info)
+{
+  guint i;
+
+  if (!gst_vaapi_display_loader_reset_module_names (loader, loader_info))
+    return FALSE;
+
+  if (loader->module) {
+    g_module_close (loader->module);
+    loader->module = NULL;
+  }
+
+  for (i = 0; i < loader->module_names->len; i++) {
+    const gchar *const module_name =
+        g_ptr_array_index (loader->module_names, i);
+
+    loader->module = g_module_open (module_name,
+        G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL);
+    if (loader->module)
+      return TRUE;
+  }
+  return FALSE;
+}
+
+static gboolean
+gst_vaapi_display_loader_try_load (GstVaapiDisplayLoader * loader,
+    const GstVaapiDisplayLoaderInfo * loader_info)
+{
+  guint has_errors = 0;
+
+  if (!gst_vaapi_display_loader_try_load_module (loader, loader_info))
+    return FALSE;
+  GST_DEBUG ("loaded backend: %s", g_module_name (loader->module));
+
+  has_errors |= !g_module_symbol (loader->module,
+      loader_info->create_display, (gpointer *) & loader->create_display);
+  has_errors |= !g_module_symbol (loader->module,
+      loader_info->create_display_from_native,
+      (gpointer *) & loader->create_display_from_native);
+
+  return has_errors == 0;
+}
+
+static GstVaapiDisplay *
+gst_vaapi_display_loader_try_load_any (GstVaapiDisplayLoader * loader)
+{
+  GstVaapiDisplay *display;
+  const GstVaapiDisplayLoaderInfo *loader_info;
+
+  for (loader_info = g_loader_info; loader_info->name != NULL; loader_info++) {
+    if (!gst_vaapi_display_loader_try_load (loader, loader_info))
+      continue;
+
+    display = loader->create_display (NULL);
+    if (display) {
+      GST_INFO ("selected backend: %s", loader_info->name);
+      return display;
+    }
+  }
+  return NULL;
+}
+
+#define gst_vaapi_display_loader_ref(loader) \
+  ((GstVaapiDisplayLoader *) gst_vaapi_mini_object_ref (GST_VAAPI_MINI_OBJECT (loader)))
+#define gst_vaapi_display_loader_unref(loader) \
+  gst_vaapi_mini_object_unref (GST_VAAPI_MINI_OBJECT (loader))
+#define gst_vaapi_display_loader_replace(old_loader_ptr, new_loader) \
+  gst_vaapi_mini_object_replace ((GstVaapiMiniObject **)(old_loader_ptr), \
+      GST_VAAPI_MINI_OBJECT (new_loader))
+
+static GstVaapiDisplayLoader *
+gst_vaapi_display_loader_acquire_global (void)
+{
+  GstVaapiDisplayLoader *loader;
+
+  g_mutex_lock (&g_loader_lock);
+  loader = g_loader ? gst_vaapi_display_loader_ref (g_loader) :
+      gst_vaapi_display_loader_new ();
+  g_loader = loader;
+  g_mutex_unlock (&g_loader_lock);
+  return loader;
+}
+
+static void
+gst_vaapi_display_loader_release_global (void)
+{
+  g_mutex_lock (&g_loader_lock);
+  gst_vaapi_display_loader_replace (&g_loader, NULL);
+  g_mutex_unlock (&g_loader_lock);
+}
+
+static const GstVaapiDisplayLoaderInfo *
+gst_vaapi_display_loader_map_lookup_type (GstVaapiDisplayType type)
+{
+  const GstVaapiDisplayLoaderInfo *loader_info;
+
+  for (loader_info = g_loader_info; loader_info->name != NULL; loader_info++) {
+    if (loader_info->type == type)
+      return loader_info;
+  }
+  return NULL;
+}
+
+/* ------------------------------------------------------------------------- */
+/* --- EGL backend implementation                                        --- */
+/* ------------------------------------------------------------------------- */
+
+typedef struct
+{
+  gpointer display;
+  guint display_type;
+  guint gles_version;
+} InitParams;
+
+static gboolean
+reset_context (GstVaapiDisplayEGL * display, EGLContext gl_context)
+{
+  EglConfig *config;
+  EglContext *ctx;
+
+  egl_object_replace (&display->egl_context, NULL);
+
+  if (gl_context != EGL_NO_CONTEXT)
+    ctx = egl_context_new_wrapped (display->egl_display, gl_context);
+  else {
+    config = egl_config_new (display->egl_display, display->gles_version,
+        GST_VIDEO_FORMAT_RGB);
+    if (!config)
+      return FALSE;
+
+    ctx = egl_context_new (display->egl_display, config, NULL);
+    egl_object_unref (config);
+  }
+  if (!ctx)
+    return FALSE;
+
+  egl_object_replace (&display->egl_context, ctx);
+  egl_object_unref (ctx);
+  return TRUE;
+}
+
+static inline gboolean
+ensure_context (GstVaapiDisplayEGL * display)
+{
+  return display->egl_context || reset_context (display, EGL_NO_CONTEXT);
+}
+
+static inline gboolean
+ensure_context_is_wrapped (GstVaapiDisplayEGL * display, EGLContext gl_context)
+{
+  return (display->egl_context &&
+      display->egl_context->base.handle.p == gl_context) ||
+      reset_context (display, gl_context);
+}
+
+static gboolean
+gst_vaapi_display_egl_bind_display (GstVaapiDisplayEGL * display,
+    const InitParams * params)
+{
+  GstVaapiDisplay *native_display;
+  GstVaapiDisplayLoader *loader;
+  const GstVaapiDisplayLoaderInfo *loader_info;
+  EglDisplay *egl_display;
+
+  loader = gst_vaapi_display_loader_acquire_global ();
+  if (params->display) {
+    loader_info =
+        gst_vaapi_display_loader_map_lookup_type (params->display_type);
+    if (!loader_info)
+      goto error_unsupported_display_type;
+
+    loader = gst_vaapi_display_loader_new ();
+    if (!loader || !gst_vaapi_display_loader_try_load (loader, loader_info))
+      goto error_init_loader;
+
+    native_display = loader->create_display_from_native (params->display);
+  } else {
+    gst_vaapi_display_loader_ref (loader);
+    native_display = gst_vaapi_display_loader_try_load_any (loader);
+  }
+  gst_vaapi_display_loader_replace (&display->loader, loader);
+  gst_vaapi_display_loader_unref (loader);
+  if (!native_display)
+    return FALSE;
+
+  gst_vaapi_display_replace (&display->display, native_display);
+  gst_vaapi_display_unref (native_display);
+
+  egl_display = egl_display_new (GST_VAAPI_DISPLAY_NATIVE (display->display));
+  if (!egl_display)
+    return FALSE;
+
+  egl_object_replace (&display->egl_display, egl_display);
+  egl_object_unref (egl_display);
+  display->gles_version = params->gles_version;
+  return TRUE;
+
+  /* ERRORS */
+error_unsupported_display_type:
+  GST_ERROR ("unsupported display type (%d)", params->display_type);
+  return FALSE;
+error_init_loader:
+  GST_ERROR ("failed to initialize display backend loader");
+  gst_vaapi_display_loader_replace (&loader, NULL);
+  return FALSE;
+}
+
+static void
+gst_vaapi_display_egl_close_display (GstVaapiDisplayEGL * display)
+{
+  gst_vaapi_display_replace (&display->display, NULL);
+  gst_vaapi_display_loader_replace (&display->loader, NULL);
+  gst_vaapi_display_loader_release_global ();
+}
+
+static void
+gst_vaapi_display_egl_lock (GstVaapiDisplayEGL * display)
+{
+  GstVaapiDisplayClass *const klass =
+      GST_VAAPI_DISPLAY_GET_CLASS (display->display);
+
+  if (klass->lock)
+    klass->lock (display->display);
+}
+
+static void
+gst_vaapi_display_egl_unlock (GstVaapiDisplayEGL * display)
+{
+  GstVaapiDisplayClass *const klass =
+      GST_VAAPI_DISPLAY_GET_CLASS (display->display);
+
+  if (klass->unlock)
+    klass->unlock (display->display);
+}
+
+static void
+gst_vaapi_display_egl_sync (GstVaapiDisplayEGL * display)
+{
+  GstVaapiDisplayClass *const klass =
+      GST_VAAPI_DISPLAY_GET_CLASS (display->display);
+
+  if (klass->sync)
+    klass->sync (display->display);
+  else if (klass->flush)
+    klass->flush (display->display);
+}
+
+static void
+gst_vaapi_display_egl_flush (GstVaapiDisplayEGL * display)
+{
+  GstVaapiDisplayClass *const klass =
+      GST_VAAPI_DISPLAY_GET_CLASS (display->display);
+
+  if (klass->flush)
+    klass->flush (display->display);
+}
+
+static gboolean
+gst_vaapi_display_egl_get_display_info (GstVaapiDisplayEGL * display,
+    GstVaapiDisplayInfo * info)
+{
+  GstVaapiDisplayClass *const klass =
+      GST_VAAPI_DISPLAY_GET_CLASS (display->display);
+
+  if (klass->get_display && !klass->get_display (display->display, info))
+    return FALSE;
+  return TRUE;
+}
+
+static void
+gst_vaapi_display_egl_get_size (GstVaapiDisplayEGL * display,
+    guint * width_ptr, guint * height_ptr)
+{
+  GstVaapiDisplayClass *const klass =
+      GST_VAAPI_DISPLAY_GET_CLASS (display->display);
+
+  if (klass->get_size)
+    klass->get_size (display->display, width_ptr, height_ptr);
+}
+
+static void
+gst_vaapi_display_egl_get_size_mm (GstVaapiDisplayEGL * display,
+    guint * width_ptr, guint * height_ptr)
+{
+  GstVaapiDisplayClass *const klass =
+      GST_VAAPI_DISPLAY_GET_CLASS (display->display);
+
+  if (klass->get_size_mm)
+    klass->get_size_mm (display->display, width_ptr, height_ptr);
+}
+
+static guintptr
+gst_vaapi_display_egl_get_visual_id (GstVaapiDisplayEGL * display,
+    GstVaapiWindow * window)
+{
+  if (!ensure_context (display))
+    return 0;
+  return display->egl_context->config->visual_id;
+}
+
+static GstVaapiWindow *
+gst_vaapi_display_egl_create_window (GstVaapiDisplay * display, GstVaapiID id,
+    guint width, guint height)
+{
+  if (id != GST_VAAPI_ID_INVALID)
+    return NULL;
+  return gst_vaapi_window_egl_new (display, width, height);
+}
+
+static GstVaapiTexture *
+gst_vaapi_display_egl_create_texture (GstVaapiDisplay * display, GstVaapiID id,
+    guint target, guint format, guint width, guint height)
+{
+  return id != GST_VAAPI_ID_INVALID ?
+      gst_vaapi_texture_egl_new_wrapped (display, id, target, format,
+          width, height) :
+      gst_vaapi_texture_egl_new (display, target, format, width, height);
+}
+
+static void
+gst_vaapi_display_egl_class_init (GstVaapiDisplayEGLClass * klass)
+{
+  GstVaapiMiniObjectClass *const object_class =
+      GST_VAAPI_MINI_OBJECT_CLASS (klass);
+  GstVaapiDisplayClass *const dpy_class = GST_VAAPI_DISPLAY_CLASS (klass);
+
+  GST_DEBUG_CATEGORY_INIT (gst_debug_vaapidisplay_egl, "vaapidisplay_egl", 0,
+      "VA/EGL backend");
+
+  gst_vaapi_display_class_init (dpy_class);
+
+  object_class->size = sizeof (GstVaapiDisplayEGL);
+  dpy_class->display_type = GST_VAAPI_DISPLAY_TYPE_EGL;
+  dpy_class->bind_display = (GstVaapiDisplayBindFunc)
+      gst_vaapi_display_egl_bind_display;
+  dpy_class->close_display = (GstVaapiDisplayCloseFunc)
+      gst_vaapi_display_egl_close_display;
+  dpy_class->lock = (GstVaapiDisplayLockFunc)
+      gst_vaapi_display_egl_lock;
+  dpy_class->unlock = (GstVaapiDisplayUnlockFunc)
+      gst_vaapi_display_egl_unlock;
+  dpy_class->sync = (GstVaapiDisplaySyncFunc)
+      gst_vaapi_display_egl_sync;
+  dpy_class->flush = (GstVaapiDisplayFlushFunc)
+      gst_vaapi_display_egl_flush;
+  dpy_class->get_display = (GstVaapiDisplayGetInfoFunc)
+      gst_vaapi_display_egl_get_display_info;
+  dpy_class->get_size = (GstVaapiDisplayGetSizeFunc)
+      gst_vaapi_display_egl_get_size;
+  dpy_class->get_size_mm = (GstVaapiDisplayGetSizeMFunc)
+      gst_vaapi_display_egl_get_size_mm;
+  dpy_class->get_visual_id = (GstVaapiDisplayGetVisualIdFunc)
+      gst_vaapi_display_egl_get_visual_id;
+  dpy_class->create_window = (GstVaapiDisplayCreateWindowFunc)
+      gst_vaapi_display_egl_create_window;
+  dpy_class->create_texture = (GstVaapiDisplayCreateTextureFunc)
+      gst_vaapi_display_egl_create_texture;
+}
+
+static inline const GstVaapiDisplayClass *
+gst_vaapi_display_egl_class (void)
+{
+  static GstVaapiDisplayEGLClass g_class;
+  static gsize g_class_init = FALSE;
+
+  if (g_once_init_enter (&g_class_init)) {
+    gst_vaapi_display_egl_class_init (&g_class);
+    g_once_init_leave (&g_class_init, TRUE);
+  }
+  return GST_VAAPI_DISPLAY_CLASS (&g_class);
+}
+
+/**
+ * gst_vaapi_display_egl_new:
+ * @display: a #GstVaapiDisplay, or %NULL to pick any one
+ * @gles_version: the OpenGL ES version API to use
+ *
+ * Creates a new #GstVaapiDisplay object suitable in EGL context. If
+ * the native @display is %NULL, then any type of display is picked,
+ * i.e. one that can be successfully opened. The @gles_version will
+ * further ensure the OpenGL ES API to use, or zero to indicate
+ * "desktop" OpenGL.
+ *
+ * Return value: a newly allocated #GstVaapiDisplay object
+ */
+GstVaapiDisplay *
+gst_vaapi_display_egl_new (GstVaapiDisplay * display, guint gles_version)
+{
+  InitParams params;
+
+  if (display) {
+    params.display = GST_VAAPI_DISPLAY_NATIVE (display);
+    params.display_type = GST_VAAPI_DISPLAY_VADISPLAY_TYPE (display);
+  } else {
+    params.display = NULL;
+    params.display_type = GST_VAAPI_DISPLAY_TYPE_ANY;
+  }
+  params.gles_version = gles_version;
+  return gst_vaapi_display_new (gst_vaapi_display_egl_class (),
+      GST_VAAPI_DISPLAY_INIT_FROM_NATIVE_DISPLAY, &params);
+}
+
+/**
+ * gst_vaapi_display_egl_new_with_native_display:
+ * @native_display: an EGLDisplay object
+ * @display_type: the display type of @native_display
+ * @gles_version: the OpenGL ES version API to use
+ *
+ * Creates a #GstVaapiDisplay based on the native display supplied in
+ * as @native_display. The caller still owns the display and must call
+ * native display close function when all #GstVaapiDisplay references
+ * are released. Doing so too early can yield undefined behaviour.
+ *
+ * The @gles_version will further ensure the OpenGL ES API to use, or
+ * zero to indicate "desktop" OpenGL.
+ *
+ * Return value: a newly allocated #GstVaapiDisplay object
+ */
+GstVaapiDisplay *
+gst_vaapi_display_egl_new_with_native_display (gpointer native_display,
+    GstVaapiDisplayType display_type, guint gles_version)
+{
+  InitParams params;
+
+  g_return_val_if_fail (native_display != NULL, NULL);
+
+  params.display = native_display;
+  params.display_type = display_type;
+  params.gles_version = gles_version;
+  return gst_vaapi_display_new (gst_vaapi_display_egl_class (),
+      GST_VAAPI_DISPLAY_INIT_FROM_NATIVE_DISPLAY, &params);
+}
+
+EglContext *
+gst_vaapi_display_egl_get_context (GstVaapiDisplayEGL * display)
+{
+  return ensure_context (display) ? display->egl_context : NULL;
+}
+
+EGLDisplay
+gst_vaapi_display_egl_get_gl_display (GstVaapiDisplayEGL * display)
+{
+  g_return_val_if_fail (GST_VAAPI_IS_DISPLAY_EGL (display), EGL_NO_DISPLAY);
+
+  return display->egl_display->base.handle.p;
+}
+
+EGLContext
+gst_vaapi_display_egl_get_gl_context (GstVaapiDisplayEGL * display)
+{
+  g_return_val_if_fail (GST_VAAPI_IS_DISPLAY_EGL (display), EGL_NO_CONTEXT);
+
+  return ensure_context (display) ? display->egl_context->base.handle.p :
+      EGL_NO_CONTEXT;
+}
+
+gboolean
+gst_vaapi_display_egl_set_gl_context (GstVaapiDisplayEGL * display,
+    EGLContext gl_context)
+{
+  g_return_val_if_fail (GST_VAAPI_IS_DISPLAY_EGL (display), FALSE);
+
+  return ensure_context_is_wrapped (display, gl_context);
+}
diff -Nru gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapidisplay_egl.h gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapidisplay_egl.h
--- gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapidisplay_egl.h	1970-01-01 00:00:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapidisplay_egl.h	2015-07-15 12:47:43.000000000 +0000
@@ -0,0 +1,55 @@
+/*
+ *  gstvaapidisplay_egl.h - VA/EGL display abstraction
+ *
+ *  Copyright (C) 2014 Intel Corporation
+ *    Author: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public License
+ *  as published by the Free Software Foundation; either version 2.1
+ *  of the License, or (at your option) egl later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT EGL WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free
+ *  Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ *  Boston, MA 02110-1301 USA
+ */
+
+#ifndef GST_VAAPI_DISPLAY_EGL_H
+#define GST_VAAPI_DISPLAY_EGL_H
+
+#include <EGL/egl.h>
+#include <gst/vaapi/gstvaapidisplay.h>
+
+G_BEGIN_DECLS
+
+typedef struct _GstVaapiDisplayEGL GstVaapiDisplayEGL;
+
+#define GST_VAAPI_DISPLAY_EGL(obj) \
+  ((GstVaapiDisplayEGL *)(obj))
+
+GstVaapiDisplay *
+gst_vaapi_display_egl_new (GstVaapiDisplay * display, guint gles_version);
+
+GstVaapiDisplay *
+gst_vaapi_display_egl_new_with_native_display (gpointer native_display,
+    GstVaapiDisplayType display_type, guint gles_version);
+
+EGLDisplay
+gst_vaapi_display_egl_get_gl_display (GstVaapiDisplayEGL * display);
+
+EGLContext
+gst_vaapi_display_egl_get_gl_context (GstVaapiDisplayEGL * display);
+
+gboolean
+gst_vaapi_display_egl_set_gl_context (GstVaapiDisplayEGL * display,
+    EGLContext gl_context);
+
+G_END_DECLS
+
+#endif /* GST_VAAPI_DISPLAY_EGL_H */
diff -Nru gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapidisplay_egl_priv.h gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapidisplay_egl_priv.h
--- gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapidisplay_egl_priv.h	1970-01-01 00:00:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapidisplay_egl_priv.h	2015-07-15 12:47:43.000000000 +0000
@@ -0,0 +1,101 @@
+/*
+ *  gstvaapidisplay_egl_priv.h - Internal VA/EGL interface
+ *
+ *  Copyright (C) 2014 Splitted-Desktop Systems
+ *    Author: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public License
+ *  as published by the Free Software Foundation; either version 2.1
+ *  of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free
+ *  Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ *  Boston, MA 02110-1301 USA
+ */
+
+#ifndef GST_VAAPI_DISPLAY_EGL_PRIV_H
+#define GST_VAAPI_DISPLAY_EGL_PRIV_H
+
+#include <gst/vaapi/gstvaapiwindow.h>
+#include "gstvaapidisplay_egl.h"
+#include "gstvaapidisplay_priv.h"
+#include "gstvaapiutils_egl.h"
+
+G_BEGIN_DECLS
+
+#define GST_VAAPI_IS_DISPLAY_EGL(display) \
+  ((display) != NULL && \
+   GST_VAAPI_DISPLAY_GET_CLASS_TYPE (display) == GST_VAAPI_DISPLAY_TYPE_EGL)
+
+#define GST_VAAPI_DISPLAY_EGL_CLASS(klass) \
+  ((GstVaapiDisplayEGLClass *)(klass))
+
+#define GST_VAAPI_DISPLAY_EGL_GET_CLASS(obj) \
+  GST_VAAPI_DISPLAY_EGL_CLASS (GST_VAAPI_DISPLAY_GET_CLASS (obj))
+
+/**
+ * GST_VAAPI_DISPLAY_EGL_DISPLAY:
+ * @display: a #GstVaapiDisplay
+ *
+ * Macro that evaluates to #EglDisplay wrapper for @display.
+ * This is an internal macro that does not do any run-time type check.
+ */
+#undef  GST_VAAPI_DISPLAY_EGL_DISPLAY
+#define GST_VAAPI_DISPLAY_EGL_DISPLAY(display) \
+  (GST_VAAPI_DISPLAY_EGL (display)->egl_display)
+
+/**
+ * GST_VAAPI_DISPLAY_EGL_CONTEXT:
+ * @display: a #GstVaapiDisplay
+ *
+ * Macro that evaluates to #EglContext wrapper for @display.
+ * This is an internal macro that does not do any run-time type check.
+ */
+#undef  GST_VAAPI_DISPLAY_EGL_CONTEXT
+#define GST_VAAPI_DISPLAY_EGL_CONTEXT(display) \
+  gst_vaapi_display_egl_get_context (GST_VAAPI_DISPLAY_EGL (display))
+
+typedef struct _GstVaapiDisplayEGLClass GstVaapiDisplayEGLClass;
+
+/**
+ * GstVaapiDisplayEGL:
+ *
+ * VA/EGL display wrapper.
+ */
+struct _GstVaapiDisplayEGL
+{
+  /*< private >*/
+  GstVaapiDisplay parent_instance;
+
+  gpointer loader;
+  GstVaapiDisplay *display;
+  EglDisplay *egl_display;
+  EglContext *egl_context;
+  guint gles_version;
+};
+
+/**
+ * GstVaapiDisplayEGLClass:
+ *
+ * VA/EGL display wrapper clas.
+ */
+struct _GstVaapiDisplayEGLClass
+{
+  /*< private >*/
+  GstVaapiDisplayClass parent_class;
+};
+
+G_GNUC_INTERNAL
+EglContext *
+gst_vaapi_display_egl_get_context (GstVaapiDisplayEGL * display);
+
+G_END_DECLS
+
+#endif /* GST_VAAPI_DISPLAY_EGL_PRIV_H */
diff -Nru gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapidisplay_glx.c gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapidisplay_glx.c
--- gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapidisplay_glx.c	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapidisplay_glx.c	2015-07-15 12:47:43.000000000 +0000
@@ -41,8 +41,6 @@
 #define DEBUG 1
 #include "gstvaapidebug.h"
 
-static const guint g_display_types = 1U << GST_VAAPI_DISPLAY_TYPE_GLX;
-
 static GstVaapiWindow *
 gst_vaapi_display_glx_create_window (GstVaapiDisplay * display, GstVaapiID id,
     guint width, guint height)
diff -Nru gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapidisplay.h gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapidisplay.h
--- gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapidisplay.h	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapidisplay.h	2015-07-15 12:47:43.000000000 +0000
@@ -91,6 +91,7 @@
  * @GST_VAAPI_DISPLAY_TYPE_GLX: VA/GLX display.
  * @GST_VAAPI_DISPLAY_TYPE_WAYLAND: VA/Wayland display.
  * @GST_VAAPI_DISPLAY_TYPE_DRM: VA/DRM display.
+ * @GST_VAAPI_DISPLAY_TYPE_EGL: VA/EGL display.
  */
 typedef enum
 {
@@ -99,6 +100,7 @@
   GST_VAAPI_DISPLAY_TYPE_GLX,
   GST_VAAPI_DISPLAY_TYPE_WAYLAND,
   GST_VAAPI_DISPLAY_TYPE_DRM,
+  GST_VAAPI_DISPLAY_TYPE_EGL,
 } GstVaapiDisplayType;
 
 #define GST_VAAPI_TYPE_DISPLAY_TYPE \
diff -Nru gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapidisplay_wayland.c gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapidisplay_wayland.c
--- gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapidisplay_wayland.c	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapidisplay_wayland.c	2015-07-15 12:47:43.000000000 +0000
@@ -246,6 +246,11 @@
     priv->compositor = NULL;
   }
 
+  if (priv->registry) {
+    wl_registry_destroy (priv->registry);
+    priv->registry = NULL;
+  }
+
   if (priv->wl_display) {
     if (!priv->use_foreign_display)
       wl_display_disconnect (priv->wl_display);
diff -Nru gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapiencoder.c gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapiencoder.c
--- gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapiencoder.c	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapiencoder.c	2015-07-15 12:47:43.000000000 +0000
@@ -512,14 +512,22 @@
 {
   GstVaapiProfile profile;
   VAProfile va_profile;
+  VAEntrypoint va_entrypoint;
+  const GstVaapiEncoderClassData *const cdata =
+      GST_VAAPI_ENCODER_GET_CLASS (encoder)->class_data;
 
   profile = get_profile (encoder);
   if (!profile)
     return FALSE;
-
   va_profile = gst_vaapi_profile_get_va_profile (profile);
+
+  if (cdata->codec != GST_VAAPI_CODEC_JPEG)
+    va_entrypoint = VAEntrypointEncSlice;
+  else
+    va_entrypoint = VAEntrypointEncPicture;
+
   return gst_vaapi_get_config_attribute (encoder->display, va_profile,
-      VAEntrypointEncSlice, type, out_value_ptr);
+      va_entrypoint, type, out_value_ptr);
 }
 
 /* Determines the set of supported packed headers */
@@ -539,6 +547,15 @@
 
   encoder->got_packed_headers = TRUE;
   encoder->packed_headers = cdata->packed_headers & value;
+
+  if (cdata->codec == GST_VAAPI_CODEC_JPEG) {
+#if !VA_CHECK_VERSION(0,37,1)
+    encoder->packed_headers = VA_ENC_PACKED_HEADER_RAW_DATA;
+    GST_DEBUG ("Hard coding the packed header flag value to VA_ENC_PACKED_HEADER_RAW_DATA,"
+        "This is a work around for the driver bug");
+#endif
+  }
+
   return encoder->packed_headers;
 }
 
@@ -550,10 +567,16 @@
   GstVaapiConfigInfoEncoder *const config = &cip->config.encoder;
   const GstVideoFormat format =
     GST_VIDEO_INFO_FORMAT (GST_VAAPI_ENCODER_VIDEO_INFO (encoder));
+  const GstVaapiEncoderClassData *const cdata =
+      GST_VAAPI_ENCODER_GET_CLASS (encoder)->class_data;
 
   cip->usage = GST_VAAPI_CONTEXT_USAGE_ENCODE;
   cip->profile = encoder->profile;
   cip->entrypoint = GST_VAAPI_ENTRYPOINT_SLICE_ENCODE;
+  if (cdata->codec != GST_VAAPI_CODEC_JPEG)
+    cip->entrypoint = GST_VAAPI_ENTRYPOINT_SLICE_ENCODE;
+  else
+    cip->entrypoint = GST_VAAPI_ENTRYPOINT_PICTURE_ENCODE;
   cip->chroma_type = gst_vaapi_video_format_get_chroma_type (format);
   cip->width = GST_VAAPI_ENCODER_WIDTH (encoder);
   cip->height = GST_VAAPI_ENCODER_HEIGHT (encoder);
@@ -562,6 +585,13 @@
   if (!cip->chroma_type  && (format != GST_VIDEO_FORMAT_ENCODED))
     goto error_unsupported_format;
 
+  if (cip->chroma_type != GST_VAAPI_CHROMA_TYPE_YUV420 &&
+      format != GST_VIDEO_FORMAT_ENCODED) {
+    GST_ERROR ("We are only supporting YUV:4:2:0 for encoding,"
+        "please try to use vaapipostproc to convert the input format!");
+    goto error_unsupported_format;
+  }
+  
   memset (config, 0, sizeof (*config));
   config->rc_mode = GST_VAAPI_ENCODER_RATE_CONTROL (encoder);
   config->packed_headers = get_packed_headers (encoder);
@@ -840,7 +870,7 @@
     goto error_operation_failed;
 
   rate_control_mask = get_rate_control_mask (encoder);
-  if (!(rate_control_mask & (1U << rate_control)))
+  if (rate_control_mask && !(rate_control_mask & (1U << rate_control)))
     goto error_unsupported_rate_control;
 
   encoder->rate_control = rate_control;
diff -Nru gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapiencoder.h gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapiencoder.h
--- gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapiencoder.h	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapiencoder.h	2015-07-15 12:47:43.000000000 +0000
@@ -37,9 +37,9 @@
 /**
  * GstVaapiEncoderStatus:
  * @GST_VAAPI_ENCODER_STATUS_SUCCESS: Success.
- * @GST_VAAPI_ENCODER_STATUS_ERROR_NO_SURFACE: No surface left to encode.
- * @GST_VAAPI_ENCODER_STATUS_ERROR_NO_BUFFER: No coded buffer left to
- *   hold the encoded picture.
+ * @GST_VAAPI_ENCODER_STATUS_NO_SURFACE: No surface left to encode.
+ * @GST_VAAPI_ENCODER_STATUS_NO_BUFFER: No coded buffer left to hold
+ *   the encoded picture.
  * @GST_VAAPI_ENCODER_STATUS_ERROR_UNKNOWN: Unknown error.
  * @GST_VAAPI_ENCODER_STATUS_ERROR_ALLOCATION_FAILED: No memory left.
  * @GST_VAAPI_ENCODER_STATUS_ERROR_OPERATION_FAILED: The requested
diff -Nru gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapiencoder_h264.c gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapiencoder_h264.c
--- gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapiencoder_h264.c	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapiencoder_h264.c	2015-07-15 12:47:43.000000000 +0000
@@ -21,6 +21,11 @@
  *  Boston, MA 02110-1301 USA
  */
 
+/* GValueArray has deprecated without providing an alternative in glib >= 2.32
+ * See https://bugzilla.gnome.org/show_bug.cgi?id=667228
+ */
+#define GLIB_DISABLE_DEPRECATION_WARNINGS
+
 #include "sysdeps.h"
 #include <va/va.h>
 #include <va/va_enc_h264.h>
@@ -37,8 +42,12 @@
 #define DEBUG 1
 #include "gstvaapidebug.h"
 
+
 /* Define the maximum number of views supported */
-#define MAX_NUM_VIEWS 2
+#define MAX_NUM_VIEWS 10
+
+/* Define the maximum value for view-id */
+#define MAX_VIEW_ID 1023
 
 /* Define the maximum IDR period */
 #define MAX_IDR_PERIOD 512
@@ -72,13 +81,22 @@
   (VA_ENC_PACKED_HEADER_SEQUENCE |              \
    VA_ENC_PACKED_HEADER_PICTURE  |              \
    VA_ENC_PACKED_HEADER_SLICE    |              \
-   VA_ENC_PACKED_HEADER_RAW_DATA)
+   VA_ENC_PACKED_HEADER_RAW_DATA |              \
+   VA_ENC_PACKED_HEADER_MISC)
 
 #define GST_H264_NAL_REF_IDC_NONE        0
 #define GST_H264_NAL_REF_IDC_LOW         1
 #define GST_H264_NAL_REF_IDC_MEDIUM      2
 #define GST_H264_NAL_REF_IDC_HIGH        3
 
+/* only for internal usage, values won't be equal to actual payload type */
+typedef enum
+{
+  GST_VAAPI_H264_SEI_UNKNOWN = 0,
+  GST_VAAPI_H264_SEI_BUF_PERIOD = (1 << 0),
+  GST_VAAPI_H264_SEI_PIC_TIMING = (1 << 1)
+} GstVaapiH264SeiPayloadType;
+
 typedef struct
 {
   GstVaapiSurfaceProxy *pic;
@@ -106,6 +124,7 @@
   GQueue reorder_frame_list;
   guint reorder_state;
   guint frame_index;
+  guint frame_count; /* monotonically increasing with in every idr period */
   guint cur_frame_num;
   guint cur_present_index;
 } GstVaapiH264ViewReorderPool;
@@ -482,7 +501,6 @@
 
     /* nal_hrd_parameters_present_flag */
     nal_hrd_parameters_present_flag = seq_param->bits_per_second > 0;
-    nal_hrd_parameters_present_flag = FALSE;    /* XXX: disabled for now */
     WRITE_UINT32 (bs, nal_hrd_parameters_present_flag, 1);
     if (nal_hrd_parameters_present_flag) {
       /* hrd_parameters */
@@ -518,7 +536,7 @@
       WRITE_UINT32 (bs, 0, 1);
     }
     /* pic_struct_present_flag */
-    WRITE_UINT32 (bs, 0, 1);
+    WRITE_UINT32 (bs, 1, 1);
     /* bs_restriction_flag */
     WRITE_UINT32 (bs, 0, 1);
   }
@@ -549,7 +567,7 @@
 static gboolean
 bs_write_subset_sps (GstBitWriter * bs,
     const VAEncSequenceParameterBufferH264 * seq_param, GstVaapiProfile profile,
-    guint num_views, const VAEncMiscParameterHRD * hrd_params)
+    guint num_views, guint16 *view_ids, const VAEncMiscParameterHRD * hrd_params)
 {
   guint32 i, j, k;
 
@@ -569,7 +587,7 @@
     WRITE_UE (bs, num_views_minus1);
 
     for (i = 0; i <= num_views_minus1; i++)
-      WRITE_UE (bs, i);
+      WRITE_UE (bs, view_ids[i]);
 
     for (i = 1; i <= num_views_minus1; i++) {
       guint32 num_anchor_refs_l0 = 0;
@@ -759,12 +777,102 @@
 
   /* MVC */
   gboolean is_mvc;
-  guint32 view_idx;
+  guint32 view_idx; /* View Order Index (VOIdx) */
   guint32 num_views;
+  guint16 view_ids[MAX_NUM_VIEWS];
   GstVaapiH264ViewRefPool ref_pools[MAX_NUM_VIEWS];
   GstVaapiH264ViewReorderPool reorder_pools[MAX_NUM_VIEWS];
 };
 
+/* Write a SEI buffering period payload */
+static gboolean
+bs_write_sei_buf_period (GstBitWriter * bs,
+    GstVaapiEncoderH264 * encoder, GstVaapiEncPicture * picture)
+{
+  guint initial_cpb_removal_delay = 0;
+  guint initial_cpb_removal_delay_offset = 0;
+  guint8 initial_cpb_removal_delay_length = 24;
+
+  /* sequence_parameter_set_id */
+  WRITE_UE (bs, encoder->view_idx);
+  /* NalHrdBpPresentFlag == TRUE */
+  /* cpb_cnt_minus1 == 0 */
+
+  /* decoding should start when the CPB fullness reaches half of cpb size
+   * initial_cpb_remvoal_delay = (((cpb_length / 2) * 90000) / 1000) */
+  initial_cpb_removal_delay = encoder->cpb_length * 45;
+
+  /* initial_cpb_remvoal_dealy */
+  WRITE_UINT32 (bs, initial_cpb_removal_delay, initial_cpb_removal_delay_length);
+
+  /* initial_cpb_removal_delay_offset */
+  WRITE_UINT32 (bs, initial_cpb_removal_delay_offset,
+    initial_cpb_removal_delay_length);
+
+  /* VclHrdBpPresentFlag == FALSE */
+  return TRUE;
+
+  /* ERRORS */
+bs_error:
+  {
+    GST_WARNING ("failed to write Buffering Period SEI message");
+    return FALSE;
+  }
+}
+
+/* Write a SEI picture timing payload */
+static gboolean
+bs_write_sei_pic_timing (GstBitWriter * bs,
+    GstVaapiEncoderH264 * encoder, GstVaapiEncPicture * picture)
+{
+  GstVaapiH264ViewReorderPool *reorder_pool = NULL;
+  guint cpb_removal_delay;
+  guint dpb_output_delay;
+  guint8 cpb_removal_delay_length = 24;
+  guint8 dpb_output_delay_length = 24;
+  guint pic_struct = 0;
+  guint clock_timestamp_flag = 0;
+
+  reorder_pool = &encoder->reorder_pools[encoder->view_idx];
+  if (GST_VAAPI_ENC_PICTURE_IS_IDR (picture))
+    reorder_pool->frame_count = 0;
+  else
+    reorder_pool->frame_count++;
+
+  /* clock-tick = no_units_in_tick/time_scale (C-1)
+   * time_scale = FPS_N * 2  (E.2.1)
+   * num_units_in_tick = FPS_D (E.2.1)
+   * frame_duration = clock-tick * 2
+   * so removal time for one frame is 2 clock-ticks.
+   * but adding a tolerance of one frame duration,
+   * which is 2 more clock-ticks */
+  cpb_removal_delay = (reorder_pool->frame_count * 2 + 2);
+
+  if (picture->type == GST_VAAPI_PICTURE_TYPE_B)
+    dpb_output_delay = 0;
+  else
+    dpb_output_delay = picture->poc - reorder_pool->frame_count * 2;
+
+  /* CpbDpbDelaysPresentFlag == 1 */
+  WRITE_UINT32 (bs, cpb_removal_delay, cpb_removal_delay_length);
+  WRITE_UINT32 (bs, dpb_output_delay, dpb_output_delay_length);
+
+  /* pic_struct_present_flag == 1 */
+  /* pic_struct */
+  WRITE_UINT32 (bs, pic_struct, 4);
+  /* clock_timestamp_flag */
+  WRITE_UINT32 (bs, clock_timestamp_flag, 1);
+
+  return TRUE;
+
+  /* ERRORS */
+bs_error:
+  {
+    GST_WARNING ("failed to write Picture Timing SEI message");
+    return FALSE;
+  }
+}
+
 /* Write a Slice NAL unit */
 static gboolean
 bs_write_slice (GstBitWriter * bs,
@@ -1311,7 +1419,7 @@
   WRITE_UINT32 (&bs, 0x00000001, 32);   /* start code */
   bs_write_nal_header (&bs, GST_H264_NAL_REF_IDC_HIGH, GST_H264_NAL_SUBSET_SPS);
 
-  bs_write_subset_sps (&bs, seq_param, encoder->profile, encoder->num_views,
+  bs_write_subset_sps (&bs, seq_param, encoder->profile, encoder->num_views, encoder->view_ids,
       &hrd_params);
 
   g_assert (GST_BIT_WRITER_BIT_SIZE (&bs) % 8 == 0);
@@ -1392,6 +1500,102 @@
 }
 
 static gboolean
+add_packed_sei_header (GstVaapiEncoderH264 * encoder,
+    GstVaapiEncPicture * picture,
+    GstVaapiH264SeiPayloadType payloadtype)
+{
+  GstVaapiEncPackedHeader *packed_sei;
+  GstBitWriter bs, bs_buf_period, bs_pic_timing;
+  VAEncPackedHeaderParameterBuffer packed_sei_param = { 0 };
+  guint32 data_bit_size;
+  guint8 buf_period_payload_size = 0, pic_timing_payload_size = 0;
+  guint8 *data, *buf_period_payload, *pic_timing_payload;
+  gboolean need_buf_period, need_pic_timing;
+
+  gst_bit_writer_init (&bs_buf_period, 128 * 8);
+  gst_bit_writer_init (&bs_pic_timing, 128 * 8);
+  gst_bit_writer_init (&bs, 128 * 8);
+
+  need_buf_period = GST_VAAPI_H264_SEI_BUF_PERIOD & payloadtype;
+  need_pic_timing = GST_VAAPI_H264_SEI_PIC_TIMING & payloadtype;
+
+  if (need_buf_period) {
+    /* Write a Buffering Period SEI message */
+    bs_write_sei_buf_period (&bs_buf_period, encoder, picture);
+    /* Write byte alignment bits */
+    if (GST_BIT_WRITER_BIT_SIZE (&bs_buf_period) % 8 != 0)
+      bs_write_trailing_bits(&bs_buf_period);
+    buf_period_payload_size =
+      (GST_BIT_WRITER_BIT_SIZE (&bs_buf_period)) / 8;
+    buf_period_payload = GST_BIT_WRITER_DATA (&bs_buf_period);
+  }
+
+  if (need_pic_timing) {
+    /* Write a Picture Timing SEI message */
+    if (GST_VAAPI_H264_SEI_PIC_TIMING & payloadtype)
+      bs_write_sei_pic_timing (&bs_pic_timing, encoder, picture);
+    /* Write byte alignment bits */
+    if (GST_BIT_WRITER_BIT_SIZE (&bs_pic_timing) % 8 != 0)
+      bs_write_trailing_bits(&bs_pic_timing);
+    pic_timing_payload_size =
+      (GST_BIT_WRITER_BIT_SIZE (&bs_pic_timing)) / 8;
+    pic_timing_payload = GST_BIT_WRITER_DATA (&bs_pic_timing);
+  }
+
+  /* Write the SEI message */
+  WRITE_UINT32 (&bs, 0x00000001, 32);   /* start code */
+  bs_write_nal_header (&bs, GST_H264_NAL_REF_IDC_NONE, GST_H264_NAL_SEI);
+
+  if (need_buf_period) {
+    WRITE_UINT32 (&bs, GST_H264_SEI_BUF_PERIOD, 8);
+    WRITE_UINT32 (&bs, buf_period_payload_size, 8);
+    /* Add buffering period sei message */
+    gst_bit_writer_put_bytes (&bs, buf_period_payload, buf_period_payload_size);
+  }
+
+  if (need_pic_timing) {
+    WRITE_UINT32 (&bs, GST_H264_SEI_PIC_TIMING, 8);
+    WRITE_UINT32 (&bs, pic_timing_payload_size, 8);
+    /* Add picture timing sei message */
+    gst_bit_writer_put_bytes (&bs, pic_timing_payload, pic_timing_payload_size);
+  }
+
+  /* rbsp_trailing_bits */
+  bs_write_trailing_bits (&bs);
+
+  g_assert (GST_BIT_WRITER_BIT_SIZE (&bs) % 8 == 0);
+  data_bit_size = GST_BIT_WRITER_BIT_SIZE (&bs);
+  data = GST_BIT_WRITER_DATA (&bs);
+
+  packed_sei_param.type = VAEncPackedHeaderH264_SEI;
+  packed_sei_param.bit_length = data_bit_size;
+  packed_sei_param.has_emulation_bytes = 0;
+
+  packed_sei = gst_vaapi_enc_packed_header_new (GST_VAAPI_ENCODER (encoder),
+      &packed_sei_param, sizeof (packed_sei_param),
+      data, (data_bit_size + 7) / 8);
+  g_assert (packed_sei);
+
+  gst_vaapi_enc_picture_add_packed_header (picture, packed_sei);
+  gst_vaapi_codec_object_replace (&packed_sei, NULL);
+
+  gst_bit_writer_clear (&bs_buf_period, TRUE);
+  gst_bit_writer_clear (&bs_pic_timing, TRUE);
+  gst_bit_writer_clear (&bs, TRUE);
+  return TRUE;
+
+  /* ERRORS */
+bs_error:
+  {
+    GST_WARNING ("failed to write SEI NAL unit");
+    gst_bit_writer_clear (&bs_buf_period, TRUE);
+    gst_bit_writer_clear (&bs_pic_timing, TRUE);
+    gst_bit_writer_clear (&bs, TRUE);
+    return FALSE;
+  }
+}
+
+static gboolean
 get_nal_hdr_attributes (GstVaapiEncPicture * picture,
     guint8 * nal_ref_idc, guint8 * nal_unit_type)
 {
@@ -1491,7 +1695,7 @@
   /* pack nal_unit_header_mvc_extension() for the non base view */
   if (encoder->is_mvc && encoder->view_idx) {
     bs_write_nal_header (&bs, nal_ref_idc, GST_H264_NAL_SLICE_EXT);
-    bs_write_nal_header_mvc_extension (&bs, picture, encoder->view_idx);
+    bs_write_nal_header_mvc_extension (&bs, picture, encoder->view_ids[encoder->view_idx]);
   } else
     bs_write_nal_header (&bs, nal_ref_idc, nal_unit_type);
 
@@ -1760,7 +1964,7 @@
   pic_param->coded_buf = GST_VAAPI_OBJECT_ID (codedbuf);
 
   pic_param->pic_parameter_set_id = encoder->view_idx;
-  pic_param->seq_parameter_set_id = encoder->view_idx;
+  pic_param->seq_parameter_set_id = encoder->view_idx ? 1 : 0;
   pic_param->last_picture = 0;  /* means last encoding picture */
   pic_param->frame_num = picture->frame_num;
   pic_param->pic_init_qp = encoder->init_qp;
@@ -1828,7 +2032,7 @@
     slice_param->num_macroblocks = cur_slice_mbs;
     slice_param->macroblock_info = VA_INVALID_ID;
     slice_param->slice_type = h264_get_slice_type (picture->type);
-    g_assert (slice_param->slice_type != -1);
+    g_assert ((gint8) slice_param->slice_type != -1);
     slice_param->pic_parameter_set_id = encoder->view_idx;
     slice_param->idr_pic_id = encoder->idr_num;
     slice_param->pic_order_cnt_lsb = picture->poc;
@@ -1959,11 +2163,11 @@
 
   /* add subset sps for non-base view and sps for base view */
   if (encoder->is_mvc && encoder->view_idx) {
-    if ((GST_VAAPI_ENCODER_PACKED_HEADERS (encoder) & VAEncPackedHeaderH264_SPS)
+    if ((GST_VAAPI_ENCODER_PACKED_HEADERS (encoder) & VA_ENC_PACKED_HEADER_SEQUENCE)
         && !add_packed_sequence_header_mvc (encoder, picture, sequence))
       goto error_create_packed_seq_hdr;
   } else {
-    if ((GST_VAAPI_ENCODER_PACKED_HEADERS (encoder) & VAEncPackedHeaderH264_SPS)
+    if ((GST_VAAPI_ENCODER_PACKED_HEADERS (encoder) & VA_ENC_PACKED_HEADER_SEQUENCE)
         && !add_packed_sequence_header (encoder, picture, sequence))
       goto error_create_packed_seq_hdr;
   }
@@ -2025,8 +2229,31 @@
     rate_control->basic_unit_size = 0;
     gst_vaapi_enc_picture_add_misc_param (picture, misc);
     gst_vaapi_codec_object_replace (&misc, NULL);
+
+    if (!encoder->view_idx) {
+      if ((GST_VAAPI_ENC_PICTURE_IS_IDR (picture)) &&
+          (GST_VAAPI_ENCODER_PACKED_HEADERS (encoder) &
+              VA_ENC_PACKED_HEADER_MISC) &&
+           !add_packed_sei_header (encoder, picture,
+              GST_VAAPI_H264_SEI_BUF_PERIOD | GST_VAAPI_H264_SEI_PIC_TIMING))
+        goto error_create_packed_sei_hdr;
+
+      else if (!GST_VAAPI_ENC_PICTURE_IS_IDR (picture) &&
+               (GST_VAAPI_ENCODER_PACKED_HEADERS (encoder) &
+                  VA_ENC_PACKED_HEADER_MISC) &&
+               !add_packed_sei_header (encoder, picture,
+                  GST_VAAPI_H264_SEI_PIC_TIMING))
+        goto error_create_packed_sei_hdr;
+    }
+
   }
   return TRUE;
+
+error_create_packed_sei_hdr:
+  {
+    GST_ERROR ("failed to create packed SEI header");
+    return FALSE;
+  }
 }
 
 /* Generates and submits PPS header accordingly into the bitstream */
@@ -2044,7 +2271,7 @@
     return FALSE;
 
   if (picture->type == GST_VAAPI_PICTURE_TYPE_I &&
-      (GST_VAAPI_ENCODER_PACKED_HEADERS (encoder) & VAEncPackedHeaderH264_PPS)
+      (GST_VAAPI_ENCODER_PACKED_HEADERS (encoder) & VA_ENC_PACKED_HEADER_PICTURE)
       && !add_packed_picture_header (encoder, picture)) {
     GST_ERROR ("set picture packed header failed");
     return FALSE;
@@ -2404,9 +2631,9 @@
   /* encoding views alternatively for MVC */
   if (encoder->is_mvc) {
     if (frame)
-      encoder->view_idx = frame->system_frame_number % MAX_NUM_VIEWS;
+      encoder->view_idx = frame->system_frame_number % encoder->num_views;
     else
-      encoder->view_idx = (encoder->view_idx + 1) % MAX_NUM_VIEWS;
+      encoder->view_idx = (encoder->view_idx + 1) % encoder->num_views;
   }
   reorder_pool = &encoder->reorder_pools[encoder->view_idx];
 
@@ -2584,6 +2811,7 @@
   encoder->is_mvc = FALSE;
   encoder->num_views = 1;
   encoder->view_idx = 0;
+  memset (encoder->view_ids, 0, sizeof (encoder->view_ids));
 
   /* re-ordering  list initialize */
   for (i = 0; i < MAX_NUM_VIEWS; i++) {
@@ -2677,6 +2905,25 @@
     case GST_VAAPI_ENCODER_H264_PROP_NUM_VIEWS:
       encoder->num_views = g_value_get_uint (value);
       break;
+    case GST_VAAPI_ENCODER_H264_PROP_VIEW_IDS:
+      {
+        guint i;
+        GValueArray *view_ids = g_value_get_boxed (value);
+
+        if (view_ids == NULL) {
+          for (i = 0; i < encoder->num_views; i++)
+            encoder->view_ids[i] = i;
+        }
+        else {
+          g_assert (view_ids->n_values <= encoder->num_views);
+
+          for (i = 0; i < encoder->num_views; i++) {
+            GValue *val = g_value_array_get_nth (view_ids, i);
+            encoder->view_ids[i] = g_value_get_uint (val);
+          }
+        }
+      break;
+    }
     default:
       return GST_VAAPI_ENCODER_STATUS_ERROR_INVALID_PARAMETER;
   }
@@ -2828,6 +3075,19 @@
           "Number of Views",
           "Number of Views for MVC encoding",
           1, MAX_NUM_VIEWS, 1, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+  /**
+   * GstVaapiEncoderH264:view-ids:
+   *
+   * The view ids for MVC encoding .
+   */
+  GST_VAAPI_ENCODER_PROPERTIES_APPEND (props,
+      GST_VAAPI_ENCODER_H264_PROP_VIEW_IDS,
+      g_param_spec_value_array ("view-ids",
+          "View IDs", "Set of View Ids used for MVC encoding",
+          g_param_spec_uint ("view-id-value", "View id value",
+              "view id values used for mvc encoding", 0, MAX_VIEW_ID, 0,
+              G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS),
+          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
   return props;
 }
diff -Nru gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapiencoder_h264.h gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapiencoder_h264.h
--- gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapiencoder_h264.h	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapiencoder_h264.h	2015-07-15 12:47:43.000000000 +0000
@@ -47,6 +47,7 @@
  * @GST_VAAPI_ENCODER_H264_PROP_CPB_LENGTH: Length of the CPB buffer
  *   in milliseconds (uint).
  * @GST_VAAPI_ENCODER_H264_PROP_NUM_VIEWS: Number of views per frame.
+ * @GST_VAAPI_ENCODER_H264_PROP_VIEW_IDS: View IDs
  *
  * The set of H.264 encoder specific configurable properties.
  */
@@ -59,6 +60,7 @@
   GST_VAAPI_ENCODER_H264_PROP_DCT8X8 = -6,
   GST_VAAPI_ENCODER_H264_PROP_CPB_LENGTH = -7,
   GST_VAAPI_ENCODER_H264_PROP_NUM_VIEWS = -8,
+  GST_VAAPI_ENCODER_H264_PROP_VIEW_IDS = -9
 } GstVaapiEncoderH264Prop;
 
 GstVaapiEncoder *
diff -Nru gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapiencoder_h265.c gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapiencoder_h265.c
--- gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapiencoder_h265.c	1970-01-01 00:00:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapiencoder_h265.c	2015-07-15 12:47:43.000000000 +0000
@@ -0,0 +1,2579 @@
+/*
+ *  gstvaapiencoder_h265.c - H.265 encoder
+ *
+ *  Copyright (C) 2015 Intel Corporation
+ *    Author: Sreerenj Balachandran <sreerenj.balachandran@intel.com>
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public License
+ *  as published by the Free Software Foundation; either version 2.1
+ *  of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free
+ *  Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ *  Boston, MA 02110-1301 USA
+ */
+
+/* GValueArray has deprecated without providing an alternative in glib >= 2.32
+ * See https://bugzilla.gnome.org/show_bug.cgi?id=667228
+ */
+#define GLIB_DISABLE_DEPRECATION_WARNINGS
+
+#include "sysdeps.h"
+#include <math.h>
+#include <va/va.h>
+#include <va/va_enc_hevc.h>
+#include <gst/base/gstbitwriter.h>
+#include <gst/codecparsers/gsth265parser.h>
+#include "gstvaapicompat.h"
+#include "gstvaapiencoder_priv.h"
+#include "gstvaapiencoder_h265.h"
+#include "gstvaapiutils_h265.h"
+#include "gstvaapiutils_h265_priv.h"
+#include "gstvaapicodedbufferproxy_priv.h"
+#include "gstvaapisurface.h"
+
+#define DEBUG 1
+#include "gstvaapidebug.h"
+
+/* Define the maximum IDR period */
+#define MAX_IDR_PERIOD 512
+
+/* Define default rate control mode ("constant-qp") */
+#define DEFAULT_RATECONTROL GST_VAAPI_RATECONTROL_CQP
+
+/* Supported set of VA rate controls, within this implementation */
+#define SUPPORTED_RATECONTROLS                          \
+  (GST_VAAPI_RATECONTROL_MASK (CQP))
+
+/* Supported set of tuning options, within this implementation */
+#define SUPPORTED_TUNE_OPTIONS                          \
+  (GST_VAAPI_ENCODER_TUNE_MASK (NONE))
+
+/* Supported set of VA packed headers, within this implementation */
+#define SUPPORTED_PACKED_HEADERS                \
+  (VA_ENC_PACKED_HEADER_SEQUENCE |              \
+   VA_ENC_PACKED_HEADER_PICTURE  |              \
+   VA_ENC_PACKED_HEADER_SLICE)
+
+typedef struct
+{
+  GstVaapiSurfaceProxy *pic;
+  guint poc;
+} GstVaapiEncoderH265Ref;
+
+typedef enum
+{
+  GST_VAAPI_ENC_H265_REORD_NONE = 0,
+  GST_VAAPI_ENC_H265_REORD_DUMP_FRAMES = 1,
+  GST_VAAPI_ENC_H265_REORD_WAIT_FRAMES = 2
+} GstVaapiEncH265ReorderState;
+
+typedef struct _GstVaapiH265RefPool
+{
+  GQueue ref_list;
+  guint max_ref_frames;
+  guint max_reflist0_count;
+  guint max_reflist1_count;
+} GstVaapiH265RefPool;
+
+typedef struct _GstVaapiH265ReorderPool
+{
+  GQueue reorder_frame_list;
+  guint reorder_state;
+  guint frame_index;
+  guint cur_present_index;
+} GstVaapiH265ReorderPool;
+
+/* ------------------------------------------------------------------------- */
+/* --- H.265 Encoder                                                     --- */
+/* ------------------------------------------------------------------------- */
+
+#define GST_VAAPI_ENCODER_H265_CAST(encoder) \
+    ((GstVaapiEncoderH265 *)(encoder))
+
+struct _GstVaapiEncoderH265
+{
+  GstVaapiEncoder parent_instance;
+
+  GstVaapiProfile profile;
+  GstVaapiTierH265 tier;
+  GstVaapiLevelH265 level;
+  guint8 profile_idc;
+  guint8 max_profile_idc;
+  guint8 hw_max_profile_idc;
+  guint8 level_idc;
+  guint32 idr_period;
+  guint32 init_qp;
+  guint32 min_qp;
+  guint32 num_slices;
+  guint32 num_bframes;
+  guint32 ctu_width;            /* CTU == Coding Tree Unit */
+  guint32 ctu_height;
+  guint32 luma_width;
+  guint32 luma_height;
+  GstClockTime cts_offset;
+  gboolean config_changed;
+
+  /* maximum required size of the decoded picture buffer */
+  guint32 max_dec_pic_buffering;
+  /* maximum allowed number of pictures that can precede any picture in
+   * the CVS in decoding order and follow that picture in output order */
+  guint32 max_num_reorder_pics;
+
+  /* frame, poc */
+  guint32 max_pic_order_cnt;
+  guint32 log2_max_pic_order_cnt;
+  guint32 idr_num;
+
+  GstBuffer *vps_data;
+  GstBuffer *sps_data;
+  GstBuffer *pps_data;
+
+  guint bitrate_bits;           // bitrate (bits)
+
+  /* Crop rectangle */
+  guint conformance_window_flag:1;
+  guint32 conf_win_left_offset;
+  guint32 conf_win_right_offset;
+  guint32 conf_win_top_offset;
+  guint32 conf_win_bottom_offset;
+
+  GstVaapiH265RefPool ref_pool;
+  GstVaapiH265ReorderPool reorder_pool;
+  guint first_slice_segment_in_pic_flag:1;
+  guint sps_temporal_mvp_enabled_flag:1;
+  guint sample_adaptive_offset_enabled_flag:1;
+};
+
+static inline gboolean
+_poc_greater_than (guint poc1, guint poc2, guint max_poc)
+{
+  return (((poc1 - poc2) & (max_poc - 1)) < max_poc / 2);
+}
+
+/* Get slice_type value for H.265 specification */
+static guint8
+h265_get_slice_type (GstVaapiPictureType type)
+{
+  switch (type) {
+    case GST_VAAPI_PICTURE_TYPE_I:
+      return GST_H265_I_SLICE;
+    case GST_VAAPI_PICTURE_TYPE_P:
+      return GST_H265_P_SLICE;
+    case GST_VAAPI_PICTURE_TYPE_B:
+      return GST_H265_B_SLICE;
+    default:
+      break;
+  }
+  return -1;
+}
+
+/* Get log2_max_pic_order_cnt value for H.265 specification */
+static guint
+h265_get_log2_max_pic_order_cnt (guint num)
+{
+  guint ret = 0;
+
+  while (num) {
+    ++ret;
+    num >>= 1;
+  }
+  if (ret <= 4)
+    ret = 4;
+  else if (ret > 10)
+    ret = 10;
+  /* must be greater than 4 */
+  return ret;
+}
+
+/* ------------------------------------------------------------------------- */
+/* --- H.265 Bitstream Writer                                            --- */
+/* ------------------------------------------------------------------------- */
+
+#define WRITE_UINT32(bs, val, nbits) do {                       \
+    if (!gst_bit_writer_put_bits_uint32 (bs, val, nbits)) {     \
+      GST_WARNING ("failed to write uint32, nbits: %d", nbits); \
+      goto bs_error;                                            \
+    }                                                           \
+  } while (0)
+
+#define WRITE_UE(bs, val) do {                  \
+    if (!bs_write_ue (bs, val)) {               \
+      GST_WARNING ("failed to write ue(v)");    \
+      goto bs_error;                            \
+    }                                           \
+  } while (0)
+
+#define WRITE_SE(bs, val) do {                  \
+    if (!bs_write_se (bs, val)) {               \
+      GST_WARNING ("failed to write se(v)");    \
+      goto bs_error;                            \
+    }                                           \
+  } while (0)
+
+/* Write an unsigned integer Exp-Golomb-coded syntax element. i.e. ue(v) */
+static gboolean
+bs_write_ue (GstBitWriter * bs, guint32 value)
+{
+  guint32 size_in_bits = 0;
+  guint32 tmp_value = ++value;
+
+  while (tmp_value) {
+    ++size_in_bits;
+    tmp_value >>= 1;
+  }
+  if (size_in_bits > 1
+      && !gst_bit_writer_put_bits_uint32 (bs, 0, size_in_bits - 1))
+    return FALSE;
+  if (!gst_bit_writer_put_bits_uint32 (bs, value, size_in_bits))
+    return FALSE;
+  return TRUE;
+}
+
+/* Write a signed integer Exp-Golomb-coded syntax element. i.e. se(v) */
+static gboolean
+bs_write_se (GstBitWriter * bs, gint32 value)
+{
+  guint32 new_val;
+
+  if (value <= 0)
+    new_val = -(value << 1);
+  else
+    new_val = (value << 1) - 1;
+
+  if (!bs_write_ue (bs, new_val))
+    return FALSE;
+  return TRUE;
+}
+
+/* Write the NAL unit header */
+static gboolean
+bs_write_nal_header (GstBitWriter * bs, guint32 nal_unit_type)
+{
+  guint8 nuh_layer_id = 0;
+  guint8 nuh_temporal_id_plus1 = 1;
+
+  WRITE_UINT32 (bs, 0, 1);
+  WRITE_UINT32 (bs, nal_unit_type, 6);
+  WRITE_UINT32 (bs, nuh_layer_id, 6);
+  WRITE_UINT32 (bs, nuh_temporal_id_plus1, 3);
+
+  return TRUE;
+
+  /* ERRORS */
+bs_error:
+  {
+    GST_WARNING ("failed to write NAL unit header");
+    return FALSE;
+  }
+}
+
+/* Write the NAL unit trailing bits */
+static gboolean
+bs_write_trailing_bits (GstBitWriter * bs)
+{
+  if (!gst_bit_writer_put_bits_uint32 (bs, 1, 1))
+    goto bs_error;
+  gst_bit_writer_align_bytes_unchecked (bs, 0);
+  return TRUE;
+
+  /* ERRORS */
+bs_error:
+  {
+    GST_WARNING ("failed to write NAL unit trailing bits");
+    return FALSE;
+  }
+}
+
+/* Write profile_tier_level()  */
+static gboolean
+bs_write_profile_tier_level (GstBitWriter * bs,
+    const VAEncSequenceParameterBufferHEVC * seq_param)
+{
+  guint i;
+  /* general_profile_space */
+  WRITE_UINT32 (bs, 0, 2);
+  /* general_tier_flag */
+  WRITE_UINT32 (bs, seq_param->general_tier_flag, 1);
+  /* general_profile_idc */
+  WRITE_UINT32 (bs, seq_param->general_profile_idc, 5);
+  /* general_profile_compatibility_flag[32] */
+  for (i = 0; i < 32; i++) {
+    if (i == 1 || i == 2)
+      WRITE_UINT32 (bs, 1, 1);
+    else
+      WRITE_UINT32 (bs, 0, 1);
+  }
+  /* general_progressive_source_flag */
+  WRITE_UINT32 (bs, 1, 1);
+  /* general_interlaced_source_flag */
+  WRITE_UINT32 (bs, 0, 1);
+  /* general_non_packed_constraint_flag */
+  WRITE_UINT32 (bs, 0, 1);
+  /* general_frame_only_constraint_flag */
+  WRITE_UINT32 (bs, 1, 1);
+  /* general_reserved_zero_44bits */
+  for (i = 0; i < 44; i++)
+    WRITE_UINT32 (bs, 0, 1);
+  /* general_level_idc */
+  WRITE_UINT32 (bs, seq_param->general_level_idc, 8);
+
+  return TRUE;
+
+  /* ERRORS */
+bs_error:
+  {
+    GST_WARNING ("failed to write Profile Tier Level");
+    return FALSE;
+  }
+}
+
+/* Write an VPS NAL unit */
+static gboolean
+bs_write_vps_data (GstBitWriter * bs, GstVaapiEncoderH265 * encoder,
+    GstVaapiEncPicture * picture,
+    const VAEncSequenceParameterBufferHEVC * seq_param, GstVaapiProfile profile)
+{
+  guint32 video_parameter_set_id = 0;
+  guint32 vps_max_layers_minus1 = 0;
+  guint32 vps_max_sub_layers_minus1 = 0;
+  guint32 vps_temporal_id_nesting_flag = 1;
+  guint32 vps_sub_layer_ordering_info_present_flag = 0;
+  guint32 vps_max_latency_increase_plus1 = 0;
+  guint32 vps_max_layer_id = 0;
+  guint32 vps_num_layer_sets_minus1 = 0;
+  guint32 vps_timing_info_present_flag = 0;
+  guint32 vps_extension_flag = 0;
+
+  /* video_parameter_set_id */
+  WRITE_UINT32 (bs, video_parameter_set_id, 4);
+  /* vps_reserved_three_2bits */
+  WRITE_UINT32 (bs, 3, 2);
+  /* vps_max_layers_minus1 */
+  WRITE_UINT32 (bs, vps_max_layers_minus1, 6);
+  /* vps_max_sub_layers_minus1 */
+  WRITE_UINT32 (bs, vps_max_sub_layers_minus1, 3);
+  /* vps_temporal_id_nesting_flag */
+  WRITE_UINT32 (bs, vps_temporal_id_nesting_flag, 1);
+  /* vps_reserved_0xffff_16bits */
+  WRITE_UINT32 (bs, 0xffff, 16);
+
+  /* profile_tier_level */
+  bs_write_profile_tier_level (bs, seq_param);
+
+  /* vps_sub_layer_ordering_info_present_flag */
+  WRITE_UINT32 (bs, vps_sub_layer_ordering_info_present_flag, 1);
+  /* vps_max_dec_pic_buffering_minus1 */
+  WRITE_UE (bs, encoder->max_dec_pic_buffering - 1);
+  /* vps_max_num_reorder_pics */
+  WRITE_UE (bs, encoder->max_num_reorder_pics);
+  /* vps_max_latency_increase_plus1 */
+  WRITE_UE (bs, vps_max_latency_increase_plus1);
+  /* vps_max_layer_id */
+  WRITE_UINT32 (bs, vps_max_layer_id, 6);
+  /* vps_num_layer_sets_minus1 */
+  WRITE_UE (bs, vps_num_layer_sets_minus1);
+  /* vps_timing_info_present_flag */
+  WRITE_UINT32 (bs, vps_timing_info_present_flag, 1);
+  /* vps_extension_flag */
+  WRITE_UINT32 (bs, vps_extension_flag, 1);
+
+  return TRUE;
+
+  /* ERRORS */
+bs_error:
+  {
+    GST_WARNING ("failed to write VPS NAL unit");
+    return FALSE;
+  }
+}
+
+static gboolean
+bs_write_vps (GstBitWriter * bs, GstVaapiEncoderH265 * encoder,
+    GstVaapiEncPicture * picture,
+    const VAEncSequenceParameterBufferHEVC * seq_param, GstVaapiProfile profile)
+{
+  if (!bs_write_vps_data (bs, encoder, picture, seq_param, profile))
+    return FALSE;
+
+  /* rbsp_trailing_bits */
+  bs_write_trailing_bits (bs);
+
+  return FALSE;
+}
+
+/* Write an SPS NAL unit */
+static gboolean
+bs_write_sps_data (GstBitWriter * bs, GstVaapiEncoderH265 * encoder,
+    GstVaapiEncPicture * picture,
+    const VAEncSequenceParameterBufferHEVC * seq_param, GstVaapiProfile profile)
+{
+  guint32 video_parameter_set_id = 0;
+  guint32 max_sub_layers_minus1 = 0;
+  guint32 temporal_id_nesting_flag = 1;
+  guint32 seq_parameter_set_id = 0;
+  guint32 sps_sub_layer_ordering_info_present_flag = 0;
+  guint32 sps_max_latency_increase_plus1 = 0;
+  guint32 num_short_term_ref_pic_sets = 0;
+  guint32 long_term_ref_pics_present_flag = 0;
+  guint32 sps_extension_flag = 0;
+
+  /* video_parameter_set_id */
+  WRITE_UINT32 (bs, video_parameter_set_id, 4);
+  /* max_sub_layers_minus1 */
+  WRITE_UINT32 (bs, max_sub_layers_minus1, 3);
+  /* temporal_id_nesting_flag */
+  WRITE_UINT32 (bs, temporal_id_nesting_flag, 1);
+
+  /* profile_tier_level */
+  bs_write_profile_tier_level (bs, seq_param);
+
+  /* seq_parameter_set_id */
+  WRITE_UE (bs, seq_parameter_set_id);
+  /* chroma_format_idc  = 1, 4:2:0 */
+  WRITE_UE (bs, seq_param->seq_fields.bits.chroma_format_idc);
+  /* pic_width_in_luma_samples */
+  WRITE_UE (bs, seq_param->pic_width_in_luma_samples);
+  /* pic_height_in_luma_samples */
+  WRITE_UE (bs, seq_param->pic_height_in_luma_samples);
+
+  /* conformance_window_flag */
+  WRITE_UINT32 (bs, encoder->conformance_window_flag, 1);
+  if (encoder->conformance_window_flag) {
+    WRITE_UE (bs, encoder->conf_win_left_offset);
+    WRITE_UE (bs, encoder->conf_win_right_offset);
+    WRITE_UE (bs, encoder->conf_win_top_offset);
+    WRITE_UE (bs, encoder->conf_win_bottom_offset);
+  }
+
+  /* bit_depth_luma_minus8 */
+  WRITE_UE (bs, seq_param->seq_fields.bits.bit_depth_luma_minus8);
+  /* bit_depth_chroma_minus8 */
+  WRITE_UE (bs, seq_param->seq_fields.bits.bit_depth_chroma_minus8);
+  /* log2_max_pic_order_cnt_lsb_minus4  */
+  WRITE_UE (bs, encoder->log2_max_pic_order_cnt - 4);
+
+  /* sps_sub_layer_ordering_info_present_flag */
+  WRITE_UINT32 (bs, sps_sub_layer_ordering_info_present_flag, 1);
+  /* sps_max_dec_pic_buffering_minus1 */
+  WRITE_UE (bs, encoder->max_dec_pic_buffering - 1);
+  /* sps_max_num_reorder_pics */
+  WRITE_UE (bs, encoder->max_num_reorder_pics);
+  /* sps_max_latency_increase_plus1 */
+  WRITE_UE (bs, sps_max_latency_increase_plus1);
+
+  /* log2_min_luma_coding_block_size_minus3 */
+  WRITE_UE (bs, seq_param->log2_min_luma_coding_block_size_minus3);
+  /* log2_diff_max_min_luma_coding_block_size */
+  WRITE_UE (bs, seq_param->log2_diff_max_min_luma_coding_block_size);
+  /* log2_min_transform_block_size_minus2 */
+  WRITE_UE (bs, seq_param->log2_min_transform_block_size_minus2);
+  /* log2_diff_max_min_transform_block_size */
+  WRITE_UE (bs, seq_param->log2_diff_max_min_transform_block_size);
+  /* max_transform_hierarchy_depth_inter */
+  WRITE_UE (bs, seq_param->max_transform_hierarchy_depth_inter);
+  /*max_transform_hierarchy_depth_intra */
+  WRITE_UE (bs, seq_param->max_transform_hierarchy_depth_intra);
+
+  /* scaling_list_enabled_flag */
+  WRITE_UINT32 (bs, seq_param->seq_fields.bits.scaling_list_enabled_flag, 1);
+  /* amp_enabled_flag */
+  WRITE_UINT32 (bs, seq_param->seq_fields.bits.amp_enabled_flag, 1);
+  /* sample_adaptive_offset_enabled_flag */
+  WRITE_UINT32 (bs,
+      seq_param->seq_fields.bits.sample_adaptive_offset_enabled_flag, 1);
+  /* pcm_enabled_flag */
+  WRITE_UINT32 (bs, seq_param->seq_fields.bits.pcm_enabled_flag, 1);
+
+  /* num_short_term_ref_pic_sets  */
+  WRITE_UE (bs, num_short_term_ref_pic_sets);
+
+  /* long_term_ref_pics_present_flag */
+  WRITE_UINT32 (bs, long_term_ref_pics_present_flag, 1);
+
+  /* sps_temporal_mvp_enabled_flag */
+  WRITE_UINT32 (bs, seq_param->seq_fields.bits.sps_temporal_mvp_enabled_flag,
+      1);
+  /* strong_intra_smoothing_enabled_flag */
+  WRITE_UINT32 (bs,
+      seq_param->seq_fields.bits.strong_intra_smoothing_enabled_flag, 1);
+
+  /* vui_parameters_present_flag */
+  WRITE_UINT32 (bs, seq_param->vui_parameters_present_flag, 1);
+
+  /*--------------- Write VUI Parameters--------------- */
+  if (seq_param->vui_parameters_present_flag) {
+    gboolean vui_hrd_parameters_present_flag;
+    /* aspect_ratio_info_present_flag */
+    WRITE_UINT32 (bs,
+        seq_param->vui_fields.bits.aspect_ratio_info_present_flag, 1);
+    if (seq_param->vui_fields.bits.aspect_ratio_info_present_flag) {
+      WRITE_UINT32 (bs, seq_param->aspect_ratio_idc, 8);
+      if (seq_param->aspect_ratio_idc == 0xFF) {
+        WRITE_UINT32 (bs, seq_param->sar_width, 16);
+        WRITE_UINT32 (bs, seq_param->sar_height, 16);
+      }
+    }
+    /* overscan_info_present_flag */
+    WRITE_UINT32 (bs, 0, 1);
+    /* video_signal_type_present_flag */
+    WRITE_UINT32 (bs, 0, 1);
+    /* chroma_loc_info_present_flag */
+    WRITE_UINT32 (bs, 0, 1);
+    /* neutral_chroma_indication_flag */
+    WRITE_UINT32 (bs, seq_param->vui_fields.bits.neutral_chroma_indication_flag,
+        1);
+    /* field_seq_flag */
+    WRITE_UINT32 (bs, seq_param->vui_fields.bits.field_seq_flag, 1);
+    /* frame_field_info_present_flag */
+    WRITE_UINT32 (bs, 0, 1);
+    /* default_display_window_flag */
+    WRITE_UINT32 (bs, 0, 1);
+
+    /* timing_info_present_flag */
+    WRITE_UINT32 (bs, seq_param->vui_fields.bits.vui_timing_info_present_flag,
+        1);
+    if (seq_param->vui_fields.bits.vui_timing_info_present_flag) {
+      /* vui_num_units_in_tick */
+      WRITE_UINT32 (bs, seq_param->vui_num_units_in_tick, 32);
+      /* vui_time_scale */
+      WRITE_UINT32 (bs, seq_param->vui_time_scale, 32);
+      /* vui_poc_proportional_to_timing_flag */
+      WRITE_UINT32 (bs, 0, 1);
+
+      /* vui_hrd_parameters_present_flag */
+      vui_hrd_parameters_present_flag = seq_param->bits_per_second > 0;
+      vui_hrd_parameters_present_flag = FALSE;  /* XXX: disabled for now */
+      WRITE_UINT32 (bs, vui_hrd_parameters_present_flag, 1);
+    }
+    /* bitstream_restriction_flag */
+    WRITE_UINT32 (bs, seq_param->vui_fields.bits.bitstream_restriction_flag, 1);
+  }
+  /* sps_extension_flag */
+  WRITE_UINT32 (bs, sps_extension_flag, 1);
+
+  return TRUE;
+
+  /* ERRORS */
+bs_error:
+  {
+    GST_WARNING ("failed to write SPS NAL unit");
+    return FALSE;
+  }
+}
+
+static gboolean
+bs_write_sps (GstBitWriter * bs, GstVaapiEncoderH265 * encoder,
+    GstVaapiEncPicture * picture,
+    const VAEncSequenceParameterBufferHEVC * seq_param, GstVaapiProfile profile)
+{
+  if (!bs_write_sps_data (bs, encoder, picture, seq_param, profile))
+    return FALSE;
+
+  /* rbsp_trailing_bits */
+  bs_write_trailing_bits (bs);
+
+  return FALSE;
+}
+
+/* Write a PPS NAL unit */
+static gboolean
+bs_write_pps (GstBitWriter * bs,
+    const VAEncPictureParameterBufferHEVC * pic_param)
+{
+  guint32 pic_parameter_set_id = 0;
+  guint32 seq_parameter_set_id = 0;
+  guint32 output_flag_present_flag = 0;
+  guint32 num_extra_slice_header_bits = 0;
+  guint32 cabac_init_present_flag = 0;
+  guint32 pps_slice_chroma_qp_offsets_present_flag = 0;
+  guint32 deblocking_filter_control_present_flag = 0;
+  guint32 lists_modification_present_flag = 0;
+  guint32 slice_segment_header_extension_present_flag = 0;
+  guint32 pps_extension_flag = 0;
+
+  /* pic_parameter_set_id */
+  WRITE_UE (bs, pic_parameter_set_id);
+  /* seq_parameter_set_id */
+  WRITE_UE (bs, seq_parameter_set_id);
+  /* dependent_slice_segments_enabled_flag */
+  WRITE_UINT32 (bs,
+      pic_param->pic_fields.bits.dependent_slice_segments_enabled_flag, 1);
+  /* output_flag_present_flag */
+  WRITE_UINT32 (bs, output_flag_present_flag, 1);
+  /* num_extra_slice_header_bits */
+  WRITE_UINT32 (bs, num_extra_slice_header_bits, 3);
+  /* sign_data_hiding_enabled_flag */
+  WRITE_UINT32 (bs, pic_param->pic_fields.bits.sign_data_hiding_enabled_flag,
+      1);
+  /* cabac_init_present_flag */
+  WRITE_UINT32 (bs, cabac_init_present_flag, 1);
+  /* num_ref_idx_l0_default_active_minus1 */
+  WRITE_UE (bs, pic_param->num_ref_idx_l0_default_active_minus1);
+  /* num_ref_idx_l1_default_active_minus1 */
+  WRITE_UE (bs, pic_param->num_ref_idx_l1_default_active_minus1);
+  /* pic_init_qp_minus26 */
+  WRITE_SE (bs, pic_param->pic_init_qp - 26);
+  /* constrained_intra_pred_flag */
+  WRITE_UINT32 (bs, pic_param->pic_fields.bits.constrained_intra_pred_flag, 1);
+  /* transform_skip_enabled_flag */
+  WRITE_UINT32 (bs, pic_param->pic_fields.bits.transform_skip_enabled_flag, 1);
+  /* cu_qp_delta_enabled_flag */
+  WRITE_UINT32 (bs, pic_param->pic_fields.bits.cu_qp_delta_enabled_flag, 1);
+  /* diff_cu_qp_delta_depth */
+  if (pic_param->pic_fields.bits.cu_qp_delta_enabled_flag)
+    WRITE_UE (bs, pic_param->diff_cu_qp_delta_depth);
+
+  /* pps_cb_qp_offset */
+  WRITE_SE (bs, pic_param->pps_cb_qp_offset);
+  /* pps_cr_qp_offset */
+  WRITE_SE (bs, pic_param->pps_cr_qp_offset);
+  /* pps_slice_chroma_qp_offsets_present_flag */
+  WRITE_UINT32 (bs, pps_slice_chroma_qp_offsets_present_flag, 1);
+  /* weighted_pred_flag */
+  WRITE_UINT32 (bs, pic_param->pic_fields.bits.weighted_pred_flag, 1);
+  /* weighted_bipred_flag */
+  WRITE_UINT32 (bs, pic_param->pic_fields.bits.weighted_bipred_flag, 1);
+  /* transquant_bypass_enabled_flag */
+  WRITE_UINT32 (bs, pic_param->pic_fields.bits.transquant_bypass_enabled_flag,
+      1);
+  /* tiles_enabled_flag */
+  WRITE_UINT32 (bs, pic_param->pic_fields.bits.tiles_enabled_flag, 1);
+  /* entropy_coding_sync_enabled_flag */
+  WRITE_UINT32 (bs, pic_param->pic_fields.bits.entropy_coding_sync_enabled_flag,
+      1);
+  /* pps_loop_filter_across_slices_enabled_flag */
+  WRITE_UINT32 (bs,
+      pic_param->pic_fields.bits.pps_loop_filter_across_slices_enabled_flag, 1);
+  /* deblocking_filter_control_present_flag */
+  WRITE_UINT32 (bs, deblocking_filter_control_present_flag, 1);
+  /* pps_scaling_list_data_present_flag */
+  WRITE_UINT32 (bs, pic_param->pic_fields.bits.scaling_list_data_present_flag,
+      1);
+  /* lists_modification_present_flag */
+  WRITE_UINT32 (bs, lists_modification_present_flag, 1);
+  /* log2_parallel_merge_level_minus2 */
+  WRITE_UE (bs, pic_param->log2_parallel_merge_level_minus2);
+  /* slice_segment_header_extension_present_flag */
+  WRITE_UINT32 (bs, slice_segment_header_extension_present_flag, 1);
+  /* pps_extension_flag */
+  WRITE_UINT32 (bs, pps_extension_flag, 1);
+
+  /* rbsp_trailing_bits */
+  bs_write_trailing_bits (bs);
+
+  return TRUE;
+
+  /* ERRORS */
+bs_error:
+  {
+    GST_WARNING ("failed to write PPS NAL unit");
+    return FALSE;
+  }
+}
+
+/* Write a Slice NAL unit */
+static gboolean
+bs_write_slice (GstBitWriter * bs,
+    const VAEncSliceParameterBufferHEVC * slice_param,
+    GstVaapiEncoderH265 * encoder, GstVaapiEncPicture * picture,
+    guint8 nal_unit_type)
+{
+  const VAEncPictureParameterBufferHEVC *const pic_param = picture->param;
+
+  guint8 no_output_of_prior_pics_flag = 0;
+  guint8 dependent_slice_segment_flag = 0;
+  guint8 short_term_ref_pic_set_sps_flag = 0;
+  guint8 num_ref_idx_active_override_flag = 0;
+  guint8 slice_deblocking_filter_disabled_flag = 0;
+
+  /* first_slice_segment_in_pic_flag */
+  WRITE_UINT32 (bs, encoder->first_slice_segment_in_pic_flag, 1);
+
+  /* Fixme: For all IRAP pics */
+  /* no_output_of_prior_pics_flag */
+  if (GST_VAAPI_ENC_PICTURE_IS_IDR (picture))
+    WRITE_UINT32 (bs, no_output_of_prior_pics_flag, 1);
+
+  /* slice_pic_parameter_set_id */
+  WRITE_UE (bs, slice_param->slice_pic_parameter_set_id);
+
+  /* slice_segment_address , bits_size = Ceil(Log2(PicSizeInCtbsY)) */
+  if (!encoder->first_slice_segment_in_pic_flag) {
+    guint pic_size_ctb = encoder->ctu_width * encoder->ctu_height;
+    guint bits_size = (guint) ceil ((log2 (pic_size_ctb)));
+    WRITE_UINT32 (bs, slice_param->slice_segment_address, bits_size);
+  }
+
+  if (!dependent_slice_segment_flag) {
+    /* slice_type */
+    WRITE_UE (bs, slice_param->slice_type);
+
+    if (!pic_param->pic_fields.bits.idr_pic_flag) {
+      /* slice_pic_order_cnt_lsb */
+      WRITE_UINT32 (bs, picture->poc, encoder->log2_max_pic_order_cnt);
+      /* short_term_ref_pic_set_sps_flag */
+      WRITE_UINT32 (bs, short_term_ref_pic_set_sps_flag, 1);
+
+    /*---------- Write short_term_ref_pic_set(0) ----------- */
+      {
+        guint num_positive_pics = 0, num_negative_pics = 0;
+        guint delta_poc_s0_minus1 = 0, delta_poc_s1_minus1 = 0;
+        guint used_by_curr_pic_s0_flag = 0, used_by_curr_pic_s1_flag = 0;
+
+        if (picture->type == GST_VAAPI_PICTURE_TYPE_P) {
+          num_negative_pics = 1;
+          num_positive_pics = 0;
+          delta_poc_s0_minus1 =
+              picture->poc - slice_param->ref_pic_list0[0].pic_order_cnt - 1;
+          used_by_curr_pic_s0_flag = 1;
+          delta_poc_s1_minus1 = 0;
+          used_by_curr_pic_s1_flag = 0;
+        }
+        if (picture->type == GST_VAAPI_PICTURE_TYPE_B) {
+          num_negative_pics = 1;
+          num_positive_pics = 1;
+          delta_poc_s0_minus1 =
+              picture->poc - slice_param->ref_pic_list0[0].pic_order_cnt - 1;
+          used_by_curr_pic_s0_flag = 1;
+          delta_poc_s1_minus1 =
+              slice_param->ref_pic_list1[0].pic_order_cnt - picture->poc - 1;
+          used_by_curr_pic_s1_flag = 1;
+        }
+
+        /* num_negative_pics */
+        WRITE_UE (bs, num_negative_pics);
+        /* num_positive_pics */
+        WRITE_UE (bs, num_positive_pics);
+        if (num_negative_pics) {
+          /* delta_poc_s0_minus1 */
+          WRITE_UE (bs, delta_poc_s0_minus1);
+          /* used_by_curr_pic_s0_flag */
+          WRITE_UINT32 (bs, used_by_curr_pic_s0_flag, 1);
+        }
+        if (num_positive_pics) {
+          /* delta_poc_s1_minus1 */
+          WRITE_UE (bs, delta_poc_s1_minus1);
+          /* used_by_curr_pic_s1_flag */
+          WRITE_UINT32 (bs, used_by_curr_pic_s1_flag, 1);
+        }
+      }
+
+      /* slice_temporal_mvp_enabled_flag */
+      if (encoder->sps_temporal_mvp_enabled_flag)
+        WRITE_UINT32 (bs,
+            slice_param->slice_fields.bits.slice_temporal_mvp_enabled_flag, 1);
+    }
+
+    if (encoder->sample_adaptive_offset_enabled_flag) {
+      WRITE_UINT32 (bs, slice_param->slice_fields.bits.slice_sao_luma_flag, 1);
+      WRITE_UINT32 (bs, slice_param->slice_fields.bits.slice_sao_chroma_flag,
+          1);
+    }
+
+    if (slice_param->slice_type == GST_H265_P_SLICE ||
+        slice_param->slice_type == GST_H265_B_SLICE) {
+      /* num_ref_idx_active_override_flag */
+      WRITE_UINT32 (bs, num_ref_idx_active_override_flag, 1);
+      /* mvd_l1_zero_flag */
+      if (slice_param->slice_type == GST_H265_B_SLICE)
+        WRITE_UINT32 (bs, slice_param->slice_fields.bits.mvd_l1_zero_flag, 1);
+
+      /* cabac_init_present_flag == FALSE */
+      /* cabac_init_flag  = FALSE */
+
+      /* collocated_from_l0_flag */
+      if (slice_param->slice_fields.bits.slice_temporal_mvp_enabled_flag) {
+        if (slice_param->slice_type == GST_H265_B_SLICE)
+          WRITE_UINT32 (bs,
+              slice_param->slice_fields.bits.collocated_from_l0_flag, 1);
+      }
+      /* five_minus_max_num_merge_cand */
+      WRITE_UE (bs, 5 - slice_param->max_num_merge_cand);
+    }
+
+    /* slice_qp_delta */
+    WRITE_SE (bs, slice_param->slice_qp_delta);
+    if (pic_param->pic_fields.bits.pps_loop_filter_across_slices_enabled_flag &&
+        (slice_param->slice_fields.bits.slice_sao_luma_flag
+            || slice_param->slice_fields.bits.slice_sao_chroma_flag
+            || !slice_deblocking_filter_disabled_flag))
+      WRITE_UINT32 (bs,
+          slice_param->slice_fields.
+          bits.slice_loop_filter_across_slices_enabled_flag, 1);
+
+  }
+
+  /* byte_alignment() */
+  {
+    /* alignment_bit_equal_to_one */
+    WRITE_UINT32 (bs, 1, 1);
+    while (GST_BIT_WRITER_BIT_SIZE (bs) % 8 != 0) {
+      /* alignment_bit_equal_to_zero */
+      WRITE_UINT32 (bs, 0, 1);
+    }
+  }
+
+  return TRUE;
+
+  /* ERRORS */
+bs_error:
+  {
+    GST_WARNING ("failed to write Slice NAL unit");
+    return FALSE;
+  }
+}
+
+static inline void
+_check_vps_sps_pps_status (GstVaapiEncoderH265 * encoder,
+    const guint8 * nal, guint32 size)
+{
+  guint8 nal_type;
+  gsize ret;
+  g_assert (size);
+
+  if (encoder->vps_data && encoder->sps_data && encoder->pps_data)
+    return;
+
+  nal_type = (nal[0] & 0x7E) >> 1;
+  switch (nal_type) {
+    case GST_H265_NAL_VPS:
+      encoder->vps_data = gst_buffer_new_allocate (NULL, size, NULL);
+      ret = gst_buffer_fill (encoder->vps_data, 0, nal, size);
+      g_assert (ret == size);
+      break;
+    case GST_H265_NAL_SPS:
+      encoder->sps_data = gst_buffer_new_allocate (NULL, size, NULL);
+      ret = gst_buffer_fill (encoder->sps_data, 0, nal, size);
+      g_assert (ret == size);
+      break;
+    case GST_H265_NAL_PPS:
+      encoder->pps_data = gst_buffer_new_allocate (NULL, size, NULL);
+      ret = gst_buffer_fill (encoder->pps_data, 0, nal, size);
+      g_assert (ret == size);
+      break;
+    default:
+      break;
+  }
+}
+
+/* Determines the largest supported profile by the underlying hardware */
+static gboolean
+ensure_hw_profile_limits (GstVaapiEncoderH265 * encoder)
+{
+  GstVaapiDisplay *const display = GST_VAAPI_ENCODER_DISPLAY (encoder);
+  GArray *profiles;
+  guint i, profile_idc, max_profile_idc;
+
+  if (encoder->hw_max_profile_idc)
+    return TRUE;
+
+  profiles = gst_vaapi_display_get_encode_profiles (display);
+  if (!profiles)
+    return FALSE;
+
+  max_profile_idc = 0;
+  for (i = 0; i < profiles->len; i++) {
+    const GstVaapiProfile profile =
+        g_array_index (profiles, GstVaapiProfile, i);
+    profile_idc = gst_vaapi_utils_h265_get_profile_idc (profile);
+    if (!profile_idc)
+      continue;
+    if (max_profile_idc < profile_idc)
+      max_profile_idc = profile_idc;
+  }
+  g_array_unref (profiles);
+
+  encoder->hw_max_profile_idc = max_profile_idc;
+  return TRUE;
+}
+
+/* Derives the profile supported by the underlying hardware */
+static gboolean
+ensure_hw_profile (GstVaapiEncoderH265 * encoder)
+{
+  GstVaapiDisplay *const display = GST_VAAPI_ENCODER_DISPLAY (encoder);
+  GstVaapiEntrypoint entrypoint = GST_VAAPI_ENTRYPOINT_SLICE_ENCODE;
+  GstVaapiProfile profile, profiles[4];
+  guint i, num_profiles = 0;
+
+  profiles[num_profiles++] = encoder->profile;
+  switch (encoder->profile) {
+    case GST_VAAPI_PROFILE_H265_MAIN_STILL_PICTURE:
+      profiles[num_profiles++] = GST_VAAPI_PROFILE_H265_MAIN;
+      // fall-through
+    case GST_VAAPI_PROFILE_H265_MAIN:
+      profiles[num_profiles++] = GST_VAAPI_PROFILE_H265_MAIN10;
+      break;
+    default:
+      break;
+  }
+
+  profile = GST_VAAPI_PROFILE_UNKNOWN;
+  for (i = 0; i < num_profiles; i++) {
+    if (gst_vaapi_display_has_encoder (display, profiles[i], entrypoint)) {
+      profile = profiles[i];
+      break;
+    }
+  }
+  if (profile == GST_VAAPI_PROFILE_UNKNOWN)
+    goto error_unsupported_profile;
+
+  GST_VAAPI_ENCODER_CAST (encoder)->profile = profile;
+  return TRUE;
+
+  /* ERRORS */
+error_unsupported_profile:
+  {
+    GST_ERROR ("unsupported HW profile (0x%08x)", encoder->profile);
+    return FALSE;
+  }
+}
+
+/* Check target decoder constraints */
+static gboolean
+ensure_profile_limits (GstVaapiEncoderH265 * encoder)
+{
+
+  if (!encoder->max_profile_idc
+      || encoder->profile_idc <= encoder->max_profile_idc)
+    return TRUE;
+
+  GST_WARNING
+      ("Needs to lower coding tools to meet target decoder constraints");
+  GST_WARNING ("Only supporting Main profile, reset profile to Main");
+
+  encoder->profile = GST_VAAPI_PROFILE_H265_MAIN;;
+  encoder->profile_idc =
+      gst_vaapi_utils_h265_get_profile_idc (encoder->profile);
+
+  return TRUE;
+}
+
+/* Derives the minimum profile from the active coding tools */
+static gboolean
+ensure_profile (GstVaapiEncoderH265 * encoder)
+{
+  GstVaapiProfile profile;
+
+  /* Always start from "Main" profile for maximum
+     compatibility */
+  profile = GST_VAAPI_PROFILE_H265_MAIN;
+
+  encoder->profile = profile;
+  encoder->profile_idc = gst_vaapi_utils_h265_get_profile_idc (profile);
+  return TRUE;
+}
+
+/* Derives the minimum tier from the active coding tools */
+static gboolean
+ensure_tier (GstVaapiEncoderH265 * encoder)
+{
+
+  encoder->tier = GST_VAAPI_TIER_H265_MAIN;
+  /*Fixme: Derive proper tier based on upstream caps or limits, coding tools etc */
+
+  return TRUE;
+}
+
+/* Derives the level from the currently set limits */
+static gboolean
+ensure_level (GstVaapiEncoderH265 * encoder)
+{
+  const GstVaapiH265LevelLimits *limits_table;
+  guint i, num_limits, PicSizeInSamplesY;
+
+  PicSizeInSamplesY = encoder->luma_width * encoder->luma_height;
+
+  limits_table = gst_vaapi_utils_h265_get_level_limits_table (&num_limits);
+  for (i = 0; i < num_limits; i++) {
+    const GstVaapiH265LevelLimits *const limits = &limits_table[i];
+    if (PicSizeInSamplesY <= limits->MaxLumaPs)
+      break;
+    /* Fixme: Add more constraint checking:tier (extracted from caps), cpb size,
+     * bitrate, num_tile_columns and num_tile_rows */
+  }
+  if (i == num_limits)
+    goto error_unsupported_level;
+
+  encoder->level = limits_table[i].level;
+  encoder->level_idc = limits_table[i].level_idc;
+  return TRUE;
+
+  /* ERRORS */
+error_unsupported_level:
+  {
+    GST_ERROR ("failed to find a suitable level matching codec config");
+    return FALSE;
+  }
+}
+
+/* Enable "high-compression" tuning options */
+static gboolean
+ensure_tuning_high_compression (GstVaapiEncoderH265 * encoder)
+{
+  guint8 profile_idc;
+
+  if (!ensure_hw_profile_limits (encoder))
+    return FALSE;
+
+  profile_idc = encoder->hw_max_profile_idc;
+  if (encoder->max_profile_idc && encoder->max_profile_idc < profile_idc)
+    profile_idc = encoder->max_profile_idc;
+
+  /* Tuning options */
+  if (!encoder->num_bframes)
+    encoder->num_bframes = 3;
+
+  return TRUE;
+}
+
+/* Ensure tuning options */
+static gboolean
+ensure_tuning (GstVaapiEncoderH265 * encoder)
+{
+  gboolean success;
+
+  switch (GST_VAAPI_ENCODER_TUNE (encoder)) {
+    case GST_VAAPI_ENCODER_TUNE_HIGH_COMPRESSION:
+      success = ensure_tuning_high_compression (encoder);
+      break;
+    default:
+      success = TRUE;
+      break;
+  }
+  return success;
+}
+
+/* Handle new GOP starts */
+static void
+reset_gop_start (GstVaapiEncoderH265 * encoder)
+{
+  GstVaapiH265ReorderPool *const reorder_pool = &encoder->reorder_pool;
+
+  reorder_pool->frame_index = 1;
+  reorder_pool->cur_present_index = 0;
+  ++encoder->idr_num;
+}
+
+/* Marks the supplied picture as a B-frame */
+static void
+set_b_frame (GstVaapiEncPicture * pic, GstVaapiEncoderH265 * encoder)
+{
+  g_assert (pic && encoder);
+  g_return_if_fail (pic->type == GST_VAAPI_PICTURE_TYPE_NONE);
+  pic->type = GST_VAAPI_PICTURE_TYPE_B;
+}
+
+/* Marks the supplied picture as a P-frame */
+static void
+set_p_frame (GstVaapiEncPicture * pic, GstVaapiEncoderH265 * encoder)
+{
+  g_return_if_fail (pic->type == GST_VAAPI_PICTURE_TYPE_NONE);
+  pic->type = GST_VAAPI_PICTURE_TYPE_P;
+}
+
+/* Marks the supplied picture as an I-frame */
+static void
+set_i_frame (GstVaapiEncPicture * pic, GstVaapiEncoderH265 * encoder)
+{
+  g_return_if_fail (pic->type == GST_VAAPI_PICTURE_TYPE_NONE);
+  pic->type = GST_VAAPI_PICTURE_TYPE_I;
+
+  g_assert (pic->frame);
+  GST_VIDEO_CODEC_FRAME_SET_SYNC_POINT (pic->frame);
+}
+
+/* Marks the supplied picture as an IDR frame */
+static void
+set_idr_frame (GstVaapiEncPicture * pic, GstVaapiEncoderH265 * encoder)
+{
+  g_return_if_fail (pic->type == GST_VAAPI_PICTURE_TYPE_NONE);
+  pic->type = GST_VAAPI_PICTURE_TYPE_I;
+  pic->poc = 0;
+  GST_VAAPI_ENC_PICTURE_FLAG_SET (pic, GST_VAAPI_ENC_PICTURE_FLAG_IDR);
+
+  g_assert (pic->frame);
+  GST_VIDEO_CODEC_FRAME_SET_SYNC_POINT (pic->frame);
+}
+
+/* Marks the supplied picture a a key-frame */
+static void
+set_key_frame (GstVaapiEncPicture * picture,
+    GstVaapiEncoderH265 * encoder, gboolean is_idr)
+{
+  if (is_idr) {
+    reset_gop_start (encoder);
+    set_idr_frame (picture, encoder);
+  } else
+    set_i_frame (picture, encoder);
+}
+
+/* Adds the supplied video parameter set header (VPS) to the list of packed
+   headers to pass down as-is to the encoder */
+static gboolean
+add_packed_vps_header (GstVaapiEncoderH265 * encoder,
+    GstVaapiEncPicture * picture, GstVaapiEncSequence * sequence)
+{
+  GstVaapiEncPackedHeader *packed_vps;
+  GstBitWriter bs;
+  VAEncPackedHeaderParameterBuffer packed_vps_param = { 0 };
+  const VAEncSequenceParameterBufferHEVC *const seq_param = sequence->param;
+  GstVaapiProfile profile = encoder->profile;
+
+  guint32 data_bit_size;
+  guint8 *data;
+
+  gst_bit_writer_init (&bs, 128 * 8);
+  WRITE_UINT32 (&bs, 0x00000001, 32);   /* start code */
+  bs_write_nal_header (&bs, GST_H265_NAL_VPS);
+
+  bs_write_vps (&bs, encoder, picture, seq_param, profile);
+
+  g_assert (GST_BIT_WRITER_BIT_SIZE (&bs) % 8 == 0);
+  data_bit_size = GST_BIT_WRITER_BIT_SIZE (&bs);
+  data = GST_BIT_WRITER_DATA (&bs);
+
+  packed_vps_param.type = VAEncPackedHeaderSequence;
+  packed_vps_param.bit_length = data_bit_size;
+  packed_vps_param.has_emulation_bytes = 0;
+
+  packed_vps = gst_vaapi_enc_packed_header_new (GST_VAAPI_ENCODER (encoder),
+      &packed_vps_param, sizeof (packed_vps_param),
+      data, (data_bit_size + 7) / 8);
+  g_assert (packed_vps);
+
+  gst_vaapi_enc_picture_add_packed_header (picture, packed_vps);
+  gst_vaapi_codec_object_replace (&packed_vps, NULL);
+
+  /* store vps data */
+  _check_vps_sps_pps_status (encoder, data + 4, data_bit_size / 8 - 4);
+  gst_bit_writer_clear (&bs, TRUE);
+  return TRUE;
+
+  /* ERRORS */
+bs_error:
+  {
+    GST_WARNING ("failed to write VPS NAL unit");
+    gst_bit_writer_clear (&bs, TRUE);
+    return FALSE;
+  }
+}
+
+/* Adds the supplied sequence header (SPS) to the list of packed
+   headers to pass down as-is to the encoder */
+static gboolean
+add_packed_sequence_header (GstVaapiEncoderH265 * encoder,
+    GstVaapiEncPicture * picture, GstVaapiEncSequence * sequence)
+{
+  GstVaapiEncPackedHeader *packed_seq;
+  GstBitWriter bs;
+  VAEncPackedHeaderParameterBuffer packed_seq_param = { 0 };
+  const VAEncSequenceParameterBufferHEVC *const seq_param = sequence->param;
+  GstVaapiProfile profile = encoder->profile;
+
+  guint32 data_bit_size;
+  guint8 *data;
+
+  gst_bit_writer_init (&bs, 128 * 8);
+  WRITE_UINT32 (&bs, 0x00000001, 32);   /* start code */
+  bs_write_nal_header (&bs, GST_H265_NAL_SPS);
+
+  bs_write_sps (&bs, encoder, picture, seq_param, profile);
+
+  g_assert (GST_BIT_WRITER_BIT_SIZE (&bs) % 8 == 0);
+  data_bit_size = GST_BIT_WRITER_BIT_SIZE (&bs);
+  data = GST_BIT_WRITER_DATA (&bs);
+
+  packed_seq_param.type = VAEncPackedHeaderSequence;
+  packed_seq_param.bit_length = data_bit_size;
+  packed_seq_param.has_emulation_bytes = 0;
+
+  packed_seq = gst_vaapi_enc_packed_header_new (GST_VAAPI_ENCODER (encoder),
+      &packed_seq_param, sizeof (packed_seq_param),
+      data, (data_bit_size + 7) / 8);
+  g_assert (packed_seq);
+
+  gst_vaapi_enc_picture_add_packed_header (picture, packed_seq);
+  gst_vaapi_codec_object_replace (&packed_seq, NULL);
+
+  /* store sps data */
+  _check_vps_sps_pps_status (encoder, data + 4, data_bit_size / 8 - 4);
+  gst_bit_writer_clear (&bs, TRUE);
+  return TRUE;
+
+  /* ERRORS */
+bs_error:
+  {
+    GST_WARNING ("failed to write SPS NAL unit");
+    gst_bit_writer_clear (&bs, TRUE);
+    return FALSE;
+  }
+}
+
+/* Adds the supplied picture header (PPS) to the list of packed
+   headers to pass down as-is to the encoder */
+static gboolean
+add_packed_picture_header (GstVaapiEncoderH265 * encoder,
+    GstVaapiEncPicture * picture)
+{
+  GstVaapiEncPackedHeader *packed_pic;
+  GstBitWriter bs;
+  VAEncPackedHeaderParameterBuffer packed_pic_param = { 0 };
+  const VAEncPictureParameterBufferHEVC *const pic_param = picture->param;
+  guint32 data_bit_size;
+  guint8 *data;
+
+  gst_bit_writer_init (&bs, 128 * 8);
+  WRITE_UINT32 (&bs, 0x00000001, 32);   /* start code */
+  bs_write_nal_header (&bs, GST_H265_NAL_PPS);
+  bs_write_pps (&bs, pic_param);
+  g_assert (GST_BIT_WRITER_BIT_SIZE (&bs) % 8 == 0);
+  data_bit_size = GST_BIT_WRITER_BIT_SIZE (&bs);
+  data = GST_BIT_WRITER_DATA (&bs);
+
+  packed_pic_param.type = VAEncPackedHeaderPicture;
+  packed_pic_param.bit_length = data_bit_size;
+  packed_pic_param.has_emulation_bytes = 0;
+
+  packed_pic = gst_vaapi_enc_packed_header_new (GST_VAAPI_ENCODER (encoder),
+      &packed_pic_param, sizeof (packed_pic_param),
+      data, (data_bit_size + 7) / 8);
+  g_assert (packed_pic);
+
+  gst_vaapi_enc_picture_add_packed_header (picture, packed_pic);
+  gst_vaapi_codec_object_replace (&packed_pic, NULL);
+
+  /* store pps data */
+  _check_vps_sps_pps_status (encoder, data + 4, data_bit_size / 8 - 4);
+  gst_bit_writer_clear (&bs, TRUE);
+  return TRUE;
+
+  /* ERRORS */
+bs_error:
+  {
+    GST_WARNING ("failed to write PPS NAL unit");
+    gst_bit_writer_clear (&bs, TRUE);
+    return FALSE;
+  }
+}
+
+static gboolean
+get_nal_unit_type (GstVaapiEncPicture * picture, guint8 * nal_unit_type)
+{
+  switch (picture->type) {
+    case GST_VAAPI_PICTURE_TYPE_I:
+      if (GST_VAAPI_ENC_PICTURE_IS_IDR (picture))
+        *nal_unit_type = GST_H265_NAL_SLICE_IDR_W_RADL;
+      else
+        *nal_unit_type = GST_H265_NAL_SLICE_TRAIL_R;
+      break;
+    case GST_VAAPI_PICTURE_TYPE_P:
+      *nal_unit_type = GST_H265_NAL_SLICE_TRAIL_R;
+      break;
+    case GST_VAAPI_PICTURE_TYPE_B:
+      *nal_unit_type = GST_H265_NAL_SLICE_TRAIL_N;
+      break;
+    default:
+      return FALSE;
+  }
+  return TRUE;
+}
+
+/* Adds the supplied slice header to the list of packed
+   headers to pass down as-is to the encoder */
+static gboolean
+add_packed_slice_header (GstVaapiEncoderH265 * encoder,
+    GstVaapiEncPicture * picture, GstVaapiEncSlice * slice)
+{
+  GstVaapiEncPackedHeader *packed_slice;
+  GstBitWriter bs;
+  VAEncPackedHeaderParameterBuffer packed_slice_param = { 0 };
+  const VAEncSliceParameterBufferHEVC *const slice_param = slice->param;
+  guint32 data_bit_size;
+  guint8 *data;
+  guint8 nal_unit_type;
+
+  gst_bit_writer_init (&bs, 128 * 8);
+  WRITE_UINT32 (&bs, 0x00000001, 32);   /* start code */
+
+  if (!get_nal_unit_type (picture, &nal_unit_type))
+    goto bs_error;
+  bs_write_nal_header (&bs, nal_unit_type);
+
+  bs_write_slice (&bs, slice_param, encoder, picture, nal_unit_type);
+  data_bit_size = GST_BIT_WRITER_BIT_SIZE (&bs);
+  data = GST_BIT_WRITER_DATA (&bs);
+
+  packed_slice_param.type = VAEncPackedHeaderSlice;
+  packed_slice_param.bit_length = data_bit_size;
+  packed_slice_param.has_emulation_bytes = 0;
+
+  packed_slice = gst_vaapi_enc_packed_header_new (GST_VAAPI_ENCODER (encoder),
+      &packed_slice_param, sizeof (packed_slice_param),
+      data, (data_bit_size + 7) / 8);
+  g_assert (packed_slice);
+
+  gst_vaapi_enc_slice_add_packed_header (slice, packed_slice);
+  gst_vaapi_codec_object_replace (&packed_slice, NULL);
+
+  gst_bit_writer_clear (&bs, TRUE);
+  return TRUE;
+
+  /* ERRORS */
+bs_error:
+  {
+    GST_WARNING ("failed to write Slice NAL unit header");
+    gst_bit_writer_clear (&bs, TRUE);
+    return FALSE;
+  }
+}
+
+/* Reference picture management */
+static void
+reference_pic_free (GstVaapiEncoderH265 * encoder, GstVaapiEncoderH265Ref * ref)
+{
+  if (!ref)
+    return;
+  if (ref->pic)
+    gst_vaapi_encoder_release_surface (GST_VAAPI_ENCODER (encoder), ref->pic);
+  g_slice_free (GstVaapiEncoderH265Ref, ref);
+}
+
+static inline GstVaapiEncoderH265Ref *
+reference_pic_create (GstVaapiEncoderH265 * encoder,
+    GstVaapiEncPicture * picture, GstVaapiSurfaceProxy * surface)
+{
+  GstVaapiEncoderH265Ref *const ref = g_slice_new0 (GstVaapiEncoderH265Ref);
+
+  ref->pic = surface;
+  ref->poc = picture->poc;
+  return ref;
+}
+
+static gboolean
+reference_list_update (GstVaapiEncoderH265 * encoder,
+    GstVaapiEncPicture * picture, GstVaapiSurfaceProxy * surface)
+{
+  GstVaapiEncoderH265Ref *ref;
+  GstVaapiH265RefPool *const ref_pool = &encoder->ref_pool;
+
+  if (GST_VAAPI_PICTURE_TYPE_B == picture->type) {
+    gst_vaapi_encoder_release_surface (GST_VAAPI_ENCODER (encoder), surface);
+    return TRUE;
+  }
+
+  if (GST_VAAPI_ENC_PICTURE_IS_IDR (picture)) {
+    while (!g_queue_is_empty (&ref_pool->ref_list))
+      reference_pic_free (encoder, g_queue_pop_head (&ref_pool->ref_list));
+  } else if (g_queue_get_length (&ref_pool->ref_list) >=
+      ref_pool->max_ref_frames) {
+    reference_pic_free (encoder, g_queue_pop_head (&ref_pool->ref_list));
+  }
+  ref = reference_pic_create (encoder, picture, surface);
+  g_queue_push_tail (&ref_pool->ref_list, ref);
+  g_assert (g_queue_get_length (&ref_pool->ref_list) <=
+      ref_pool->max_ref_frames);
+  return TRUE;
+}
+
+static gboolean
+reference_list_init (GstVaapiEncoderH265 * encoder,
+    GstVaapiEncPicture * picture,
+    GstVaapiEncoderH265Ref ** reflist_0,
+    guint * reflist_0_count,
+    GstVaapiEncoderH265Ref ** reflist_1, guint * reflist_1_count)
+{
+  GstVaapiEncoderH265Ref *tmp;
+  GstVaapiH265RefPool *const ref_pool = &encoder->ref_pool;
+  GList *iter, *list_0_start = NULL, *list_1_start = NULL;
+  guint count;
+
+  *reflist_0_count = 0;
+  *reflist_1_count = 0;
+  if (picture->type == GST_VAAPI_PICTURE_TYPE_I)
+    return TRUE;
+
+  iter = g_queue_peek_tail_link (&ref_pool->ref_list);
+  for (; iter; iter = g_list_previous (iter)) {
+    tmp = (GstVaapiEncoderH265Ref *) iter->data;
+    g_assert (tmp && tmp->poc != picture->poc);
+    if (_poc_greater_than (picture->poc, tmp->poc, encoder->max_pic_order_cnt)) {
+      list_0_start = iter;
+      list_1_start = g_list_next (iter);
+      break;
+    }
+  }
+
+  /* order reflist_0 */
+  g_assert (list_0_start);
+  iter = list_0_start;
+  count = 0;
+  for (; iter; iter = g_list_previous (iter)) {
+    reflist_0[count] = (GstVaapiEncoderH265Ref *) iter->data;
+    ++count;
+  }
+  *reflist_0_count = count;
+
+  if (picture->type != GST_VAAPI_PICTURE_TYPE_B)
+    return TRUE;
+
+  /* order reflist_1 */
+  count = 0;
+  iter = list_1_start;
+  for (; iter; iter = g_list_next (iter)) {
+    reflist_1[count] = (GstVaapiEncoderH265Ref *) iter->data;
+    ++count;
+  }
+  *reflist_1_count = count;
+  return TRUE;
+}
+
+/* Fills in VA sequence parameter buffer */
+static gboolean
+fill_sequence (GstVaapiEncoderH265 * encoder, GstVaapiEncSequence * sequence)
+{
+  VAEncSequenceParameterBufferHEVC *const seq_param = sequence->param;
+
+  memset (seq_param, 0, sizeof (VAEncSequenceParameterBufferHEVC));
+
+  seq_param->general_profile_idc = encoder->profile_idc;
+  seq_param->general_level_idc = encoder->level_idc;
+  seq_param->general_tier_flag = 0;     /* Fixme: use the tier flag extracted from upstream caps or calcuted one */
+
+  seq_param->intra_period = GST_VAAPI_ENCODER_KEYFRAME_PERIOD (encoder);
+  seq_param->intra_idr_period = encoder->idr_period;
+  seq_param->ip_period = 1 + encoder->num_bframes;
+  seq_param->ip_period = seq_param->intra_period > 1 ?
+      (1 + encoder->num_bframes) : 0;
+  seq_param->bits_per_second = encoder->bitrate_bits;
+
+  seq_param->pic_width_in_luma_samples = encoder->luma_width;
+  seq_param->pic_height_in_luma_samples = encoder->luma_height;
+
+  /*sequence field values */
+  seq_param->seq_fields.value = 0;
+  seq_param->seq_fields.bits.chroma_format_idc = 1;
+  seq_param->seq_fields.bits.separate_colour_plane_flag = 0;
+  seq_param->seq_fields.bits.bit_depth_luma_minus8 = 0;
+  seq_param->seq_fields.bits.bit_depth_chroma_minus8 = 0;
+  seq_param->seq_fields.bits.scaling_list_enabled_flag = FALSE;
+  seq_param->seq_fields.bits.strong_intra_smoothing_enabled_flag = TRUE;
+  seq_param->seq_fields.bits.amp_enabled_flag = TRUE;
+  seq_param->seq_fields.bits.sample_adaptive_offset_enabled_flag =
+      encoder->sample_adaptive_offset_enabled_flag = FALSE;
+  seq_param->seq_fields.bits.pcm_enabled_flag = FALSE;
+  seq_param->seq_fields.bits.pcm_loop_filter_disabled_flag = FALSE;
+  seq_param->seq_fields.bits.sps_temporal_mvp_enabled_flag =
+      encoder->sps_temporal_mvp_enabled_flag = TRUE;
+
+  /* Based on 32x32 CTU */
+  seq_param->log2_min_luma_coding_block_size_minus3 = 0;
+  seq_param->log2_diff_max_min_luma_coding_block_size = 2;
+  seq_param->log2_min_transform_block_size_minus2 = 0;
+  seq_param->log2_diff_max_min_transform_block_size = 3;
+  seq_param->max_transform_hierarchy_depth_inter = 3;
+  seq_param->max_transform_hierarchy_depth_intra = 3;
+
+  seq_param->pcm_sample_bit_depth_luma_minus1 = 0;
+  seq_param->pcm_sample_bit_depth_chroma_minus1 = 0;
+  seq_param->log2_min_pcm_luma_coding_block_size_minus3 = 0;
+  seq_param->log2_max_pcm_luma_coding_block_size_minus3 = 0;
+
+  /* VUI parameters are always set, at least for timing_info (framerate) */
+  seq_param->vui_parameters_present_flag = TRUE;
+  if (seq_param->vui_parameters_present_flag) {
+    seq_param->vui_fields.bits.aspect_ratio_info_present_flag = TRUE;
+    if (seq_param->vui_fields.bits.aspect_ratio_info_present_flag) {
+      const GstVideoInfo *const vip = GST_VAAPI_ENCODER_VIDEO_INFO (encoder);
+      seq_param->aspect_ratio_idc = 0xff;
+      seq_param->sar_width = GST_VIDEO_INFO_PAR_N (vip);
+      seq_param->sar_height = GST_VIDEO_INFO_PAR_D (vip);
+    }
+    seq_param->vui_fields.bits.bitstream_restriction_flag = FALSE;
+    seq_param->vui_fields.bits.vui_timing_info_present_flag = TRUE;
+    if (seq_param->vui_fields.bits.vui_timing_info_present_flag) {
+      seq_param->vui_num_units_in_tick = GST_VAAPI_ENCODER_FPS_D (encoder);
+      seq_param->vui_time_scale = GST_VAAPI_ENCODER_FPS_N (encoder);
+    }
+  }
+  return TRUE;
+}
+
+/* Fills in VA picture parameter buffer */
+static gboolean
+fill_picture (GstVaapiEncoderH265 * encoder, GstVaapiEncPicture * picture,
+    GstVaapiCodedBuffer * codedbuf, GstVaapiSurfaceProxy * surface)
+{
+  VAEncPictureParameterBufferHEVC *const pic_param = picture->param;
+  GstVaapiH265RefPool *const ref_pool = &encoder->ref_pool;
+  GstVaapiEncoderH265Ref *ref_pic;
+  GList *reflist;
+  guint i;
+  guint8 nal_unit_type, no_output_of_prior_pics_flag = 0;
+
+  memset (pic_param, 0, sizeof (VAEncPictureParameterBufferHEVC));
+
+  pic_param->decoded_curr_pic.picture_id =
+      GST_VAAPI_SURFACE_PROXY_SURFACE_ID (surface);
+  pic_param->decoded_curr_pic.pic_order_cnt = picture->poc;
+  pic_param->decoded_curr_pic.flags = 0;
+
+  i = 0;
+  if (picture->type != GST_VAAPI_PICTURE_TYPE_I) {
+    for (reflist = g_queue_peek_head_link (&ref_pool->ref_list);
+        reflist; reflist = g_list_next (reflist)) {
+      ref_pic = reflist->data;
+      g_assert (ref_pic && ref_pic->pic &&
+          GST_VAAPI_SURFACE_PROXY_SURFACE_ID (ref_pic->pic) != VA_INVALID_ID);
+
+      pic_param->reference_frames[i].picture_id =
+          GST_VAAPI_SURFACE_PROXY_SURFACE_ID (ref_pic->pic);
+      ++i;
+    }
+    g_assert (i <= 15 && i <= ref_pool->max_ref_frames);
+  }
+  for (; i < 15; ++i) {
+    pic_param->reference_frames[i].picture_id = VA_INVALID_SURFACE;
+    pic_param->reference_frames[i].flags = 0;
+  }
+  pic_param->coded_buf = GST_VAAPI_OBJECT_ID (codedbuf);
+
+  /* slice_temporal_mvp_enable_flag == FALSE */
+  pic_param->collocated_ref_pic_index = 0xFF;
+
+  pic_param->last_picture = 0;
+  pic_param->pic_init_qp = encoder->init_qp;
+  pic_param->num_ref_idx_l0_default_active_minus1 =
+      (ref_pool->max_reflist0_count ? (ref_pool->max_reflist0_count - 1) : 0);
+  pic_param->num_ref_idx_l1_default_active_minus1 =
+      (ref_pool->max_reflist1_count ? (ref_pool->max_reflist1_count - 1) : 0);
+
+  get_nal_unit_type (picture, &nal_unit_type);
+  pic_param->nal_unit_type = nal_unit_type;
+
+  /* set picture fields */
+  pic_param->pic_fields.value = 0;
+  pic_param->pic_fields.bits.idr_pic_flag =
+      GST_VAAPI_ENC_PICTURE_IS_IDR (picture);
+  pic_param->pic_fields.bits.coding_type = picture->type;
+  if (picture->type != GST_VAAPI_PICTURE_TYPE_B)
+    pic_param->pic_fields.bits.reference_pic_flag = TRUE;
+  pic_param->pic_fields.bits.sign_data_hiding_enabled_flag = FALSE;
+  pic_param->pic_fields.bits.transform_skip_enabled_flag = TRUE;
+  pic_param->pic_fields.bits.pps_loop_filter_across_slices_enabled_flag = TRUE;
+
+  if (GST_VAAPI_ENC_PICTURE_IS_IDR (picture))
+    no_output_of_prior_pics_flag = 1;
+  pic_param->pic_fields.bits.no_output_of_prior_pics_flag =
+      no_output_of_prior_pics_flag;
+
+  return TRUE;
+}
+
+/* Adds slice headers to picture */
+static gboolean
+add_slice_headers (GstVaapiEncoderH265 * encoder, GstVaapiEncPicture * picture,
+    GstVaapiEncoderH265Ref ** reflist_0, guint reflist_0_count,
+    GstVaapiEncoderH265Ref ** reflist_1, guint reflist_1_count)
+{
+  VAEncSliceParameterBufferHEVC *slice_param;
+  GstVaapiEncSlice *slice;
+  guint slice_of_ctus, slice_mod_ctus, cur_slice_ctus;
+  guint ctu_size;
+  guint ctu_width_round_factor;
+  guint last_ctu_index;
+  guint i_slice, i_ref;
+
+  g_assert (picture);
+
+  ctu_size = encoder->ctu_width * encoder->ctu_height;
+
+  g_assert (encoder->num_slices && encoder->num_slices < ctu_size);
+  slice_of_ctus = ctu_size / encoder->num_slices;
+  slice_mod_ctus = ctu_size % encoder->num_slices;
+  last_ctu_index = 0;
+
+  for (i_slice = 0;
+      i_slice < encoder->num_slices && (last_ctu_index < ctu_size); ++i_slice) {
+    cur_slice_ctus = slice_of_ctus;
+    if (slice_mod_ctus) {
+      ++cur_slice_ctus;
+      --slice_mod_ctus;
+    }
+
+    /* Work-around for satisfying the VA-Intel driver.
+     * The driver only support multi slice begin from row start address */
+    ctu_width_round_factor =
+        encoder->ctu_width - (cur_slice_ctus % encoder->ctu_width);
+    cur_slice_ctus += ctu_width_round_factor;
+    if ((last_ctu_index + cur_slice_ctus) > ctu_size)
+      cur_slice_ctus = ctu_size - last_ctu_index;
+
+    slice = GST_VAAPI_ENC_SLICE_NEW (HEVC, encoder);
+    g_assert (slice && slice->param_id != VA_INVALID_ID);
+    slice_param = slice->param;
+
+    memset (slice_param, 0, sizeof (VAEncSliceParameterBufferHEVC));
+    if (i_slice == 0) {
+      encoder->first_slice_segment_in_pic_flag = TRUE;
+      slice_param->slice_segment_address = 0;
+    } else {
+      encoder->first_slice_segment_in_pic_flag = FALSE;
+      slice_param->slice_segment_address = last_ctu_index;
+    }
+    slice_param->num_ctu_in_slice = cur_slice_ctus;
+    slice_param->slice_type = h265_get_slice_type (picture->type);
+    slice_param->slice_pic_parameter_set_id = 0;
+
+    if (picture->type != GST_VAAPI_PICTURE_TYPE_I && reflist_0_count > 0)
+      slice_param->num_ref_idx_l0_active_minus1 = reflist_0_count - 1;
+    else
+      slice_param->num_ref_idx_l0_active_minus1 = 0;
+    if (picture->type == GST_VAAPI_PICTURE_TYPE_B && reflist_1_count > 0)
+      slice_param->num_ref_idx_l1_active_minus1 = reflist_1_count - 1;
+    else
+      slice_param->num_ref_idx_l1_active_minus1 = 0;
+    g_assert (slice_param->num_ref_idx_l0_active_minus1 == 0);
+    g_assert (slice_param->num_ref_idx_l1_active_minus1 == 0);
+
+    i_ref = 0;
+    if (picture->type != GST_VAAPI_PICTURE_TYPE_I) {
+      for (; i_ref < reflist_0_count; ++i_ref) {
+        slice_param->ref_pic_list0[i_ref].picture_id =
+            GST_VAAPI_SURFACE_PROXY_SURFACE_ID (reflist_0[i_ref]->pic);
+        slice_param->ref_pic_list0[i_ref].pic_order_cnt = reflist_0[i_ref]->poc;
+      }
+      g_assert (i_ref == 1);
+    }
+    for (; i_ref < G_N_ELEMENTS (slice_param->ref_pic_list0); ++i_ref) {
+      slice_param->ref_pic_list0[i_ref].picture_id = VA_INVALID_SURFACE;
+      slice_param->ref_pic_list0[i_ref].flags = 0;
+    }
+
+    i_ref = 0;
+    if (picture->type == GST_VAAPI_PICTURE_TYPE_B) {
+      for (; i_ref < reflist_1_count; ++i_ref) {
+        slice_param->ref_pic_list1[i_ref].picture_id =
+            GST_VAAPI_SURFACE_PROXY_SURFACE_ID (reflist_1[i_ref]->pic);
+        slice_param->ref_pic_list1[i_ref].pic_order_cnt = reflist_1[i_ref]->poc;
+      }
+      g_assert (i_ref == 1);
+    }
+    for (; i_ref < G_N_ELEMENTS (slice_param->ref_pic_list1); ++i_ref) {
+      slice_param->ref_pic_list1[i_ref].picture_id = VA_INVALID_SURFACE;
+      slice_param->ref_pic_list1[i_ref].flags = 0;
+    }
+
+    slice_param->max_num_merge_cand = 5;        /* MaxNumMergeCand  */
+    slice_param->slice_qp_delta = encoder->init_qp - encoder->min_qp;
+
+    slice_param->slice_fields.value = 0;
+
+    slice_param->slice_fields.
+        bits.slice_loop_filter_across_slices_enabled_flag = TRUE;
+
+    /* set calculation for next slice */
+    last_ctu_index += cur_slice_ctus;
+
+    if ((i_slice == encoder->num_slices - 1) || (last_ctu_index == ctu_size))
+      slice_param->slice_fields.bits.last_slice_of_pic_flag = 1;
+
+    if ((GST_VAAPI_ENCODER_PACKED_HEADERS (encoder) &
+            VA_ENC_PACKED_HEADER_SLICE)
+        && !add_packed_slice_header (encoder, picture, slice))
+      goto error_create_packed_slice_hdr;
+
+    gst_vaapi_enc_picture_add_slice (picture, slice);
+    gst_vaapi_codec_object_replace (&slice, NULL);
+  }
+  if (i_slice < encoder->num_slices)
+    GST_WARNING
+        ("Using less number of slices than requested, Number of slices per pictures is %d",
+        i_slice);
+  g_assert (last_ctu_index == ctu_size);
+
+  return TRUE;
+
+error_create_packed_slice_hdr:
+  {
+    GST_ERROR ("failed to create packed slice header buffer");
+    gst_vaapi_codec_object_replace (&slice, NULL);
+    return FALSE;
+  }
+}
+
+/* Generates and submits SPS header accordingly into the bitstream */
+static gboolean
+ensure_sequence (GstVaapiEncoderH265 * encoder, GstVaapiEncPicture * picture)
+{
+  GstVaapiEncSequence *sequence = NULL;
+
+  /* submit an SPS header before every new I-frame, if codec config changed */
+  if (!encoder->config_changed || picture->type != GST_VAAPI_PICTURE_TYPE_I)
+    return TRUE;
+
+  sequence = GST_VAAPI_ENC_SEQUENCE_NEW (HEVC, encoder);
+  if (!sequence || !fill_sequence (encoder, sequence))
+    goto error_create_seq_param;
+
+  /* add packed vps and sps headers */
+  if ((GST_VAAPI_ENCODER_PACKED_HEADERS (encoder) & VA_ENC_PACKED_HEADER_SEQUENCE)
+      && !(add_packed_vps_header (encoder, picture, sequence)
+          && add_packed_sequence_header (encoder, picture, sequence))) {
+    goto error_create_packed_seq_hdr;
+  }
+
+  if (sequence) {
+    gst_vaapi_enc_picture_set_sequence (picture, sequence);
+    gst_vaapi_codec_object_replace (&sequence, NULL);
+  }
+
+  encoder->config_changed = FALSE;
+  return TRUE;
+
+  /* ERRORS */
+error_create_seq_param:
+  {
+    GST_ERROR ("failed to create sequence parameter buffer (SPS)");
+    gst_vaapi_codec_object_replace (&sequence, NULL);
+    return FALSE;
+  }
+error_create_packed_seq_hdr:
+  {
+    GST_ERROR ("failed to create packed sequence header buffer");
+    gst_vaapi_codec_object_replace (&sequence, NULL);
+    return FALSE;
+  }
+}
+
+/* Generates and submits PPS header accordingly into the bitstream */
+static gboolean
+ensure_picture (GstVaapiEncoderH265 * encoder, GstVaapiEncPicture * picture,
+    GstVaapiCodedBufferProxy * codedbuf_proxy, GstVaapiSurfaceProxy * surface)
+{
+  GstVaapiCodedBuffer *const codedbuf =
+      GST_VAAPI_CODED_BUFFER_PROXY_BUFFER (codedbuf_proxy);
+  gboolean res = FALSE;
+
+  res = fill_picture (encoder, picture, codedbuf, surface);
+
+  if (!res)
+    return FALSE;
+
+  if (picture->type == GST_VAAPI_PICTURE_TYPE_I &&
+      (GST_VAAPI_ENCODER_PACKED_HEADERS (encoder) & VA_ENC_PACKED_HEADER_PICTURE)
+      && !add_packed_picture_header (encoder, picture)) {
+    GST_ERROR ("set picture packed header failed");
+    return FALSE;
+  }
+  return TRUE;
+}
+
+/* Generates slice headers */
+static gboolean
+ensure_slices (GstVaapiEncoderH265 * encoder, GstVaapiEncPicture * picture)
+{
+  GstVaapiEncoderH265Ref *reflist_0[15];
+  GstVaapiEncoderH265Ref *reflist_1[15];
+  GstVaapiH265RefPool *const ref_pool = &encoder->ref_pool;
+  guint reflist_0_count = 0, reflist_1_count = 0;
+
+  g_assert (picture);
+
+  if (picture->type != GST_VAAPI_PICTURE_TYPE_I &&
+      !reference_list_init (encoder, picture,
+          reflist_0, &reflist_0_count, reflist_1, &reflist_1_count)) {
+    GST_ERROR ("reference list reorder failed");
+    return FALSE;
+  }
+
+  g_assert (reflist_0_count + reflist_1_count <= ref_pool->max_ref_frames);
+  if (reflist_0_count > ref_pool->max_reflist0_count)
+    reflist_0_count = ref_pool->max_reflist0_count;
+  if (reflist_1_count > ref_pool->max_reflist1_count)
+    reflist_1_count = ref_pool->max_reflist1_count;
+
+  if (!add_slice_headers (encoder, picture,
+          reflist_0, reflist_0_count, reflist_1, reflist_1_count))
+    return FALSE;
+
+  return TRUE;
+}
+
+/* Estimates a good enough bitrate if none was supplied */
+static void
+ensure_bitrate (GstVaapiEncoderH265 * encoder)
+{
+  GstVaapiEncoder *const base_encoder = GST_VAAPI_ENCODER_CAST (encoder);
+
+  switch (GST_VAAPI_ENCODER_RATE_CONTROL (encoder)) {
+    case GST_VAAPI_RATECONTROL_CBR:
+    case GST_VAAPI_RATECONTROL_VBR:
+    case GST_VAAPI_RATECONTROL_VBR_CONSTRAINED:
+      if (!base_encoder->bitrate) {
+        /* Fixme: Provide better estimation */
+        /* Using a 1/6 compression ratio */
+        /* 12 bits per pixel fro yuv420 */
+        base_encoder->bitrate =
+            (encoder->luma_width * encoder->luma_height * 12 / 6) *
+            GST_VAAPI_ENCODER_FPS_N (encoder) /
+            GST_VAAPI_ENCODER_FPS_D (encoder) / 1000;
+        GST_INFO ("target bitrate computed to %u kbps", base_encoder->bitrate);
+      }
+      break;
+    default:
+      base_encoder->bitrate = 0;
+      break;
+  }
+}
+
+/* Constructs profile, tier and level information based on user-defined limits */
+static GstVaapiEncoderStatus
+ensure_profile_tier_level (GstVaapiEncoderH265 * encoder)
+{
+  const GstVaapiProfile profile = encoder->profile;
+  const GstVaapiTierH265 tier = encoder->tier;
+  const GstVaapiLevelH265 level = encoder->level;
+
+  ensure_tuning (encoder);
+
+  if (!ensure_profile (encoder) || !ensure_profile_limits (encoder))
+    return GST_VAAPI_ENCODER_STATUS_ERROR_UNSUPPORTED_PROFILE;
+
+  /* Check HW constraints */
+  if (!ensure_hw_profile_limits (encoder))
+    return GST_VAAPI_ENCODER_STATUS_ERROR_UNSUPPORTED_PROFILE;
+  if (encoder->profile_idc > encoder->hw_max_profile_idc)
+    return GST_VAAPI_ENCODER_STATUS_ERROR_UNSUPPORTED_PROFILE;
+
+  /* ensure tier */
+  if (!ensure_tier (encoder))
+    return GST_VAAPI_ENCODER_STATUS_ERROR_OPERATION_FAILED;
+
+  if (!ensure_level (encoder))
+    /* Ensure bitrate if not set already and derive the right level to use */
+    ensure_bitrate (encoder);
+  if (!ensure_level (encoder))
+    return GST_VAAPI_ENCODER_STATUS_ERROR_OPERATION_FAILED;
+
+  if (encoder->profile != profile || encoder->level != level
+      || encoder->tier != tier) {
+    GST_DEBUG ("selected %s profile at tier %s and level %s",
+        gst_vaapi_utils_h265_get_profile_string (encoder->profile),
+        gst_vaapi_utils_h265_get_tier_string (encoder->tier),
+        gst_vaapi_utils_h265_get_level_string (encoder->level));
+    encoder->config_changed = TRUE;
+  }
+  return GST_VAAPI_ENCODER_STATUS_SUCCESS;
+}
+
+static void
+reset_properties (GstVaapiEncoderH265 * encoder)
+{
+  GstVaapiEncoder *const base_encoder = GST_VAAPI_ENCODER_CAST (encoder);
+  GstVaapiH265ReorderPool *reorder_pool;
+  GstVaapiH265RefPool *ref_pool;
+  guint ctu_size;
+
+  if (encoder->idr_period < base_encoder->keyframe_period)
+    encoder->idr_period = base_encoder->keyframe_period;
+  if (encoder->idr_period > MAX_IDR_PERIOD)
+    encoder->idr_period = MAX_IDR_PERIOD;
+
+  /*Fixme: provide user control for idr_period ?? */
+  encoder->idr_period = base_encoder->keyframe_period * 2;
+
+  if (encoder->min_qp > encoder->init_qp ||
+      (GST_VAAPI_ENCODER_RATE_CONTROL (encoder) == GST_VAAPI_RATECONTROL_CQP &&
+          encoder->min_qp < encoder->init_qp))
+    encoder->min_qp = encoder->init_qp;
+
+  ctu_size = encoder->ctu_width * encoder->ctu_height;
+  if (encoder->num_slices > (ctu_size + 1) / 2)
+    encoder->num_slices = (ctu_size + 1) / 2;
+  g_assert (encoder->num_slices);
+
+  if (encoder->num_bframes > (base_encoder->keyframe_period + 1) / 2)
+    encoder->num_bframes = (base_encoder->keyframe_period + 1) / 2;
+
+  if (encoder->num_bframes)
+    encoder->cts_offset = GST_SECOND * GST_VAAPI_ENCODER_FPS_D (encoder) /
+        GST_VAAPI_ENCODER_FPS_N (encoder);
+  else
+    encoder->cts_offset = 0;
+
+  /* init max_poc */
+  encoder->log2_max_pic_order_cnt =
+      h265_get_log2_max_pic_order_cnt (encoder->idr_period);
+  g_assert (encoder->log2_max_pic_order_cnt >= 4);
+  encoder->max_pic_order_cnt = (1 << encoder->log2_max_pic_order_cnt);
+  encoder->idr_num = 0;
+
+  /* Only Supporting a maximum of two reference frames */
+  if (encoder->num_bframes) {
+    encoder->max_dec_pic_buffering = 3;
+    encoder->max_num_reorder_pics = 1;
+  } else {
+    encoder->max_dec_pic_buffering =
+        (GST_VAAPI_ENCODER_KEYFRAME_PERIOD (encoder) == 1) ? 1 : 2;
+    encoder->max_num_reorder_pics = 0;
+  }
+
+  ref_pool = &encoder->ref_pool;
+  ref_pool->max_reflist0_count = 1;
+  ref_pool->max_reflist1_count = encoder->num_bframes > 0;
+  ref_pool->max_ref_frames = ref_pool->max_reflist0_count
+      + ref_pool->max_reflist1_count;
+
+  reorder_pool = &encoder->reorder_pool;
+  reorder_pool->frame_index = 0;
+}
+
+static GstVaapiEncoderStatus
+gst_vaapi_encoder_h265_encode (GstVaapiEncoder * base_encoder,
+    GstVaapiEncPicture * picture, GstVaapiCodedBufferProxy * codedbuf)
+{
+  GstVaapiEncoderH265 *const encoder =
+      GST_VAAPI_ENCODER_H265_CAST (base_encoder);
+  GstVaapiEncoderStatus ret = GST_VAAPI_ENCODER_STATUS_ERROR_UNKNOWN;
+  GstVaapiSurfaceProxy *reconstruct = NULL;
+
+  reconstruct = gst_vaapi_encoder_create_surface (base_encoder);
+
+  g_assert (GST_VAAPI_SURFACE_PROXY_SURFACE (reconstruct));
+
+  if (!ensure_sequence (encoder, picture))
+    goto error;
+  if (!ensure_picture (encoder, picture, codedbuf, reconstruct))
+    goto error;
+  if (!ensure_slices (encoder, picture))
+    goto error;
+  if (!gst_vaapi_enc_picture_encode (picture))
+    goto error;
+
+  if (!reference_list_update (encoder, picture, reconstruct))
+    goto error;
+
+  return GST_VAAPI_ENCODER_STATUS_SUCCESS;
+error:
+  if (reconstruct)
+    gst_vaapi_encoder_release_surface (GST_VAAPI_ENCODER (encoder),
+        reconstruct);
+  return ret;
+}
+
+static GstVaapiEncoderStatus
+gst_vaapi_encoder_h265_flush (GstVaapiEncoder * base_encoder)
+{
+  GstVaapiEncoderH265 *const encoder =
+      GST_VAAPI_ENCODER_H265_CAST (base_encoder);
+  GstVaapiH265ReorderPool *reorder_pool;
+  GstVaapiEncPicture *pic;
+
+  reorder_pool = &encoder->reorder_pool;
+  reorder_pool->frame_index = 0;
+  reorder_pool->cur_present_index = 0;
+
+  while (!g_queue_is_empty (&reorder_pool->reorder_frame_list)) {
+    pic = (GstVaapiEncPicture *)
+        g_queue_pop_head (&reorder_pool->reorder_frame_list);
+    gst_vaapi_enc_picture_unref (pic);
+  }
+  g_queue_clear (&reorder_pool->reorder_frame_list);
+
+  return GST_VAAPI_ENCODER_STATUS_SUCCESS;
+}
+
+/* Generate "codec-data" buffer */
+static GstVaapiEncoderStatus
+gst_vaapi_encoder_h265_get_codec_data (GstVaapiEncoder * base_encoder,
+    GstBuffer ** out_buffer_ptr)
+{
+  GstVaapiEncoderH265 *const encoder =
+      GST_VAAPI_ENCODER_H265_CAST (base_encoder);
+  const guint32 configuration_version = 0x01;
+  const guint32 nal_length_size = 4;
+  GstMapInfo vps_info, sps_info, pps_info;
+  GstBitWriter bs;
+  GstBuffer *buffer;
+  guint min_spatial_segmentation_idc = 0;
+  guint num_arrays = 3;
+
+  if (!encoder->vps_data || !encoder->sps_data || !encoder->pps_data)
+    return GST_VAAPI_ENCODER_STATUS_ERROR_INVALID_HEADER;
+  if (gst_buffer_get_size (encoder->sps_data) < 4)
+    return GST_VAAPI_ENCODER_STATUS_ERROR_INVALID_HEADER;
+
+  if (!gst_buffer_map (encoder->vps_data, &vps_info, GST_MAP_READ))
+    goto error_map_vps_buffer;
+
+  if (!gst_buffer_map (encoder->sps_data, &sps_info, GST_MAP_READ))
+    goto error_map_sps_buffer;
+
+  if (!gst_buffer_map (encoder->pps_data, &pps_info, GST_MAP_READ))
+    goto error_map_pps_buffer;
+
+  /* Header */
+  gst_bit_writer_init (&bs,
+      (vps_info.size + sps_info.size + pps_info.size + 64) * 8);
+  WRITE_UINT32 (&bs, configuration_version, 8);
+  WRITE_UINT32 (&bs, sps_info.data[4], 8);      /* profile_space | tier_flag | profile_idc */
+  WRITE_UINT32 (&bs, sps_info.data[5], 32);     /* profile_compatibility_flag [0-31] */
+  /* progressive_source_flag | interlaced_source_flag | non_packed_constraint_flag |
+   * frame_only_constraint_flag | reserved_zero_bits[0-27] */
+  WRITE_UINT32 (&bs, sps_info.data[9], 32);
+  WRITE_UINT32 (&bs, sps_info.data[13], 16);    /* reserved_zero_bits [28-43] */
+  WRITE_UINT32 (&bs, sps_info.data[15], 8);     /* level_idc */
+  WRITE_UINT32 (&bs, 0x0f, 4);  /* 1111 */
+  WRITE_UINT32 (&bs, min_spatial_segmentation_idc, 12); /* min_spatial_segmentation_idc */
+  WRITE_UINT32 (&bs, 0x3f, 6);  /* 111111 */
+  WRITE_UINT32 (&bs, 0x00, 2);  /* parallelismType */
+  WRITE_UINT32 (&bs, 0x3f, 6);  /* 111111 */
+  WRITE_UINT32 (&bs, 0x01, 2);  /* chroma_format_idc */
+  WRITE_UINT32 (&bs, 0x3f, 6);  /* 111111 */
+  WRITE_UINT32 (&bs, 0x01, 3);  /* bit_depth_luma_minus8 */
+  WRITE_UINT32 (&bs, 0x3f, 6);  /* 111111 */
+  WRITE_UINT32 (&bs, 0x01, 3);  /* bit_depth_chroma_minus8 */
+  WRITE_UINT32 (&bs, 0x00, 16); /* avgFramerate */
+  WRITE_UINT32 (&bs, 0x00, 2);  /* constatnFramerate */
+  WRITE_UINT32 (&bs, 0x00, 3);  /* numTemporalLayers */
+  WRITE_UINT32 (&bs, 0x00, 1);  /* temporalIdNested */
+  WRITE_UINT32 (&bs, nal_length_size - 1, 2);   /* lengthSizeMinusOne */
+  WRITE_UINT32 (&bs, 0x00, 8);  /* numOfArrays */
+
+  WRITE_UINT32 (&bs, num_arrays, 8);    /* numOfArrays */
+
+  /* Write VPS */
+  WRITE_UINT32 (&bs, 0x00, 1);  /* array_completeness */
+  WRITE_UINT32 (&bs, 0x00, 1);  /* reserved zero */
+  WRITE_UINT32 (&bs, GST_H265_NAL_VPS, 6);      /* Nal_unit_type */
+  WRITE_UINT32 (&bs, 0x01, 16); /* numNalus, VPS count = 1 */
+  g_assert (GST_BIT_WRITER_BIT_SIZE (&bs) % 8 == 0);
+  WRITE_UINT32 (&bs, vps_info.size, 16);        /* VPS nalUnitLength */
+  gst_bit_writer_put_bytes (&bs, vps_info.data, vps_info.size);
+
+  /* Write SPS */
+  WRITE_UINT32 (&bs, 0x00, 1);  /* array_completeness */
+  WRITE_UINT32 (&bs, 0x00, 1);  /* reserved zero */
+  WRITE_UINT32 (&bs, GST_H265_NAL_SPS, 6);      /* Nal_unit_type */
+  WRITE_UINT32 (&bs, 0x01, 16); /* numNalus, SPS count = 1 */
+  g_assert (GST_BIT_WRITER_BIT_SIZE (&bs) % 8 == 0);
+  WRITE_UINT32 (&bs, sps_info.size, 16);        /* SPS nalUnitLength */
+  gst_bit_writer_put_bytes (&bs, sps_info.data, sps_info.size);
+
+  /* Write PPS */
+  WRITE_UINT32 (&bs, 0x00, 1);  /* array_completeness */
+  WRITE_UINT32 (&bs, 0x00, 1);  /* reserved zero */
+  WRITE_UINT32 (&bs, GST_H265_NAL_PPS, 6);      /* Nal_unit_type */
+  WRITE_UINT32 (&bs, 0x01, 16); /* numNalus, PPS count = 1 */
+  WRITE_UINT32 (&bs, pps_info.size, 16);        /* PPS nalUnitLength */
+  gst_bit_writer_put_bytes (&bs, pps_info.data, pps_info.size);
+
+  gst_buffer_unmap (encoder->pps_data, &pps_info);
+  gst_buffer_unmap (encoder->sps_data, &sps_info);
+  gst_buffer_unmap (encoder->vps_data, &vps_info);
+
+  buffer = gst_buffer_new_wrapped (GST_BIT_WRITER_DATA (&bs),
+      GST_BIT_WRITER_BIT_SIZE (&bs) / 8);
+  if (!buffer)
+    goto error_alloc_buffer;
+  *out_buffer_ptr = buffer;
+
+  gst_bit_writer_clear (&bs, FALSE);
+  return GST_VAAPI_ENCODER_STATUS_SUCCESS;
+
+  /* ERRORS */
+bs_error:
+  {
+    GST_ERROR ("failed to write codec-data");
+    gst_buffer_unmap (encoder->vps_data, &vps_info);
+    gst_buffer_unmap (encoder->sps_data, &sps_info);
+    gst_buffer_unmap (encoder->pps_data, &pps_info);
+    gst_bit_writer_clear (&bs, TRUE);
+    return FALSE;
+  }
+error_map_vps_buffer:
+  {
+    GST_ERROR ("failed to map VPS packed header");
+    return GST_VAAPI_ENCODER_STATUS_ERROR_ALLOCATION_FAILED;
+  }
+error_map_sps_buffer:
+  {
+    GST_ERROR ("failed to map SPS packed header");
+    return GST_VAAPI_ENCODER_STATUS_ERROR_ALLOCATION_FAILED;
+  }
+error_map_pps_buffer:
+  {
+    GST_ERROR ("failed to map PPS packed header");
+    gst_buffer_unmap (encoder->sps_data, &sps_info);
+    return GST_VAAPI_ENCODER_STATUS_ERROR_ALLOCATION_FAILED;
+  }
+error_alloc_buffer:
+  {
+    GST_ERROR ("failed to allocate codec-data buffer");
+    gst_bit_writer_clear (&bs, TRUE);
+    return GST_VAAPI_ENCODER_STATUS_ERROR_ALLOCATION_FAILED;
+  }
+}
+
+/* TODO */
+/* The re-ordering algorithm is similar to what we implemented for
+ * h264 encoder. But We could have a better algorithm for hevc encoder
+ * by having B-frames as reference pictures */
+static GstVaapiEncoderStatus
+gst_vaapi_encoder_h265_reordering (GstVaapiEncoder * base_encoder,
+    GstVideoCodecFrame * frame, GstVaapiEncPicture ** output)
+{
+  GstVaapiEncoderH265 *const encoder =
+      GST_VAAPI_ENCODER_H265_CAST (base_encoder);
+  GstVaapiH265ReorderPool *reorder_pool = NULL;
+  GstVaapiEncPicture *picture;
+  gboolean is_idr = FALSE;
+
+  *output = NULL;
+
+  reorder_pool = &encoder->reorder_pool;
+
+  if (!frame) {
+    if (reorder_pool->reorder_state != GST_VAAPI_ENC_H265_REORD_DUMP_FRAMES)
+      return GST_VAAPI_ENCODER_STATUS_NO_SURFACE;
+
+    /* reorder_state = GST_VAAPI_ENC_H265_REORD_DUMP_FRAMES
+       dump B frames from queue, sometime, there may also have P frame or I frame */
+    g_assert (encoder->num_bframes > 0);
+    g_return_val_if_fail (!g_queue_is_empty (&reorder_pool->reorder_frame_list),
+        GST_VAAPI_ENCODER_STATUS_ERROR_UNKNOWN);
+    picture = g_queue_pop_head (&reorder_pool->reorder_frame_list);
+    g_assert (picture);
+    if (g_queue_is_empty (&reorder_pool->reorder_frame_list)) {
+      reorder_pool->reorder_state = GST_VAAPI_ENC_H265_REORD_WAIT_FRAMES;
+    }
+    goto end;
+  }
+
+  /* new frame coming */
+  picture = GST_VAAPI_ENC_PICTURE_NEW (HEVC, encoder, frame);
+  if (!picture) {
+    GST_WARNING ("create H265 picture failed, frame timestamp:%"
+        GST_TIME_FORMAT, GST_TIME_ARGS (frame->pts));
+    return GST_VAAPI_ENCODER_STATUS_ERROR_ALLOCATION_FAILED;
+  }
+  ++reorder_pool->cur_present_index;
+  picture->poc = ((reorder_pool->cur_present_index * 1) %
+      encoder->max_pic_order_cnt);
+
+  is_idr = (reorder_pool->frame_index == 0 ||
+      reorder_pool->frame_index >= encoder->idr_period);
+
+  /* check key frames */
+  if (is_idr || GST_VIDEO_CODEC_FRAME_IS_FORCE_KEYFRAME (frame) ||
+      (reorder_pool->frame_index %
+          GST_VAAPI_ENCODER_KEYFRAME_PERIOD (encoder)) == 0) {
+    ++reorder_pool->frame_index;
+
+    /* b frame enabled,  check queue of reorder_frame_list */
+    if (encoder->num_bframes
+        && !g_queue_is_empty (&reorder_pool->reorder_frame_list)) {
+      GstVaapiEncPicture *p_pic;
+
+      p_pic = g_queue_pop_tail (&reorder_pool->reorder_frame_list);
+      set_p_frame (p_pic, encoder);
+      g_queue_foreach (&reorder_pool->reorder_frame_list,
+          (GFunc) set_b_frame, encoder);
+      set_key_frame (picture, encoder, is_idr);
+      g_queue_push_tail (&reorder_pool->reorder_frame_list, picture);
+      picture = p_pic;
+      reorder_pool->reorder_state = GST_VAAPI_ENC_H265_REORD_DUMP_FRAMES;
+    } else {                    /* no b frames in queue */
+      set_key_frame (picture, encoder, is_idr);
+      g_assert (g_queue_is_empty (&reorder_pool->reorder_frame_list));
+      if (encoder->num_bframes)
+        reorder_pool->reorder_state = GST_VAAPI_ENC_H265_REORD_WAIT_FRAMES;
+    }
+    goto end;
+  }
+
+  /* new p/b frames coming */
+  ++reorder_pool->frame_index;
+  if (reorder_pool->reorder_state == GST_VAAPI_ENC_H265_REORD_WAIT_FRAMES &&
+      g_queue_get_length (&reorder_pool->reorder_frame_list) <
+      encoder->num_bframes) {
+    g_queue_push_tail (&reorder_pool->reorder_frame_list, picture);
+    return GST_VAAPI_ENCODER_STATUS_NO_SURFACE;
+  }
+
+  set_p_frame (picture, encoder);
+
+  if (reorder_pool->reorder_state == GST_VAAPI_ENC_H265_REORD_WAIT_FRAMES) {
+    g_queue_foreach (&reorder_pool->reorder_frame_list, (GFunc) set_b_frame,
+        encoder);
+    reorder_pool->reorder_state = GST_VAAPI_ENC_H265_REORD_DUMP_FRAMES;
+    g_assert (!g_queue_is_empty (&reorder_pool->reorder_frame_list));
+  }
+
+end:
+  g_assert (picture);
+  frame = picture->frame;
+  if (GST_CLOCK_TIME_IS_VALID (frame->pts))
+    frame->pts += encoder->cts_offset;
+  *output = picture;
+
+  return GST_VAAPI_ENCODER_STATUS_SUCCESS;
+}
+
+static GstVaapiEncoderStatus
+set_context_info (GstVaapiEncoder * base_encoder)
+{
+  GstVaapiEncoderH265 *const encoder =
+      GST_VAAPI_ENCODER_H265_CAST (base_encoder);
+  GstVideoInfo *const vip = GST_VAAPI_ENCODER_VIDEO_INFO (encoder);
+  const guint DEFAULT_SURFACES_COUNT = 3;
+
+  /* Fixme: Using only a rough approximation for bitstream headers..
+   * Fixme: Not taken into account: ScalingList, RefPicListModification, PredWeightTable */
+  /* Maximum sizes for common headers (in bits) */
+  enum
+  {
+    MAX_PROFILE_TIER_LEVEL_SIZE = 684,
+    MAX_VPS_HDR_SIZE = 13781,
+    MAX_SPS_HDR_SIZE = 615,
+    MAX_SHORT_TERM_REFPICSET_SIZE = 55,
+    MAX_VUI_PARAMS_SIZE = 267,
+    MAX_HRD_PARAMS_SIZE = 8196,
+    MAX_PPS_HDR_SIZE = 274,
+    MAX_SLICE_HDR_SIZE = 33660
+  };
+
+  /* Account for VPS header */
+  base_encoder->codedbuf_size += 4 + GST_ROUND_UP_8 (MAX_VPS_HDR_SIZE +
+      MAX_PROFILE_TIER_LEVEL_SIZE + MAX_HRD_PARAMS_SIZE) / 8;
+
+  /* Account for SPS header */
+  base_encoder->codedbuf_size += 4 + GST_ROUND_UP_8 (MAX_SPS_HDR_SIZE +
+      MAX_PROFILE_TIER_LEVEL_SIZE + 64 * MAX_SHORT_TERM_REFPICSET_SIZE +
+      MAX_VUI_PARAMS_SIZE + MAX_HRD_PARAMS_SIZE) / 8;
+
+  /* Account for PPS header */
+  base_encoder->codedbuf_size += 4 + GST_ROUND_UP_8 (MAX_PPS_HDR_SIZE) / 8;
+
+  /* Account for slice header */
+  base_encoder->codedbuf_size += encoder->num_slices * (4 +
+      GST_ROUND_UP_8 (MAX_SLICE_HDR_SIZE + MAX_SHORT_TERM_REFPICSET_SIZE) / 8);
+
+  if (!ensure_hw_profile (encoder))
+    return GST_VAAPI_ENCODER_STATUS_ERROR_UNSUPPORTED_PROFILE;
+
+  base_encoder->num_ref_frames =
+      ((encoder->num_bframes ? 2 : 1) + DEFAULT_SURFACES_COUNT);
+
+  /* Only YUV 4:2:0 formats are supported for now. */
+  base_encoder->codedbuf_size += GST_ROUND_UP_32 (vip->width) *
+          GST_ROUND_UP_32 (vip->height) * 3 / 2;
+
+  return GST_VAAPI_ENCODER_STATUS_SUCCESS;
+}
+
+static GstVaapiEncoderStatus
+gst_vaapi_encoder_h265_reconfigure (GstVaapiEncoder * base_encoder)
+{
+  GstVaapiEncoderH265 *const encoder =
+      GST_VAAPI_ENCODER_H265_CAST (base_encoder);
+  GstVaapiEncoderStatus status;
+  guint luma_width, luma_height;
+
+  luma_width = GST_VAAPI_ENCODER_WIDTH (encoder);
+  luma_height = GST_VAAPI_ENCODER_HEIGHT (encoder);
+
+  if (luma_width != encoder->luma_width || luma_height != encoder->luma_height) {
+    GST_DEBUG ("resolution: %d %d", GST_VAAPI_ENCODER_WIDTH (encoder),
+        GST_VAAPI_ENCODER_HEIGHT (encoder));
+    encoder->luma_width = GST_ROUND_UP_32 (luma_width);
+    encoder->luma_height = GST_ROUND_UP_32 (luma_height);
+    encoder->ctu_width = (encoder->luma_width + 31) / 32;
+    encoder->ctu_height = (encoder->luma_height + 31) / 32;
+    encoder->config_changed = TRUE;
+
+    /* Frame Cropping */
+    if ((GST_VAAPI_ENCODER_WIDTH (encoder) & 31) ||
+        (GST_VAAPI_ENCODER_HEIGHT (encoder) & 31)) {
+      static const guint SubWidthC[] = { 1, 2, 2, 1 };
+      static const guint SubHeightC[] = { 1, 2, 1, 1 };
+      encoder->conformance_window_flag = 1;
+      encoder->conf_win_left_offset = 0;
+      encoder->conf_win_right_offset =
+          (encoder->luma_width -
+          GST_VAAPI_ENCODER_WIDTH (encoder)) / SubWidthC[1];
+      encoder->conf_win_top_offset = 0;
+      encoder->conf_win_bottom_offset =
+          (encoder->luma_height -
+          GST_VAAPI_ENCODER_HEIGHT (encoder)) / SubHeightC[1];
+    }
+  }
+
+  status = ensure_profile_tier_level (encoder);
+  if (status != GST_VAAPI_ENCODER_STATUS_SUCCESS)
+    return status;
+
+  reset_properties (encoder);
+  return set_context_info (base_encoder);
+}
+
+static gboolean
+gst_vaapi_encoder_h265_init (GstVaapiEncoder * base_encoder)
+{
+  GstVaapiEncoderH265 *const encoder =
+      GST_VAAPI_ENCODER_H265_CAST (base_encoder);
+  GstVaapiH265ReorderPool *reorder_pool;
+  GstVaapiH265RefPool *ref_pool;
+
+  encoder->conformance_window_flag = 0;
+  encoder->num_slices = 1;
+
+  /* re-ordering  list initialize */
+  reorder_pool = &encoder->reorder_pool;
+  g_queue_init (&reorder_pool->reorder_frame_list);
+  reorder_pool->reorder_state = GST_VAAPI_ENC_H265_REORD_NONE;
+  reorder_pool->frame_index = 0;
+  reorder_pool->cur_present_index = 0;
+
+  /* reference list info initialize */
+  ref_pool = &encoder->ref_pool;
+  g_queue_init (&ref_pool->ref_list);
+  ref_pool->max_ref_frames = 0;
+  ref_pool->max_reflist0_count = 1;
+  ref_pool->max_reflist1_count = 1;
+
+  return TRUE;
+}
+
+static void
+gst_vaapi_encoder_h265_finalize (GstVaapiEncoder * base_encoder)
+{
+  /*free private buffers */
+  GstVaapiEncoderH265 *const encoder =
+      GST_VAAPI_ENCODER_H265_CAST (base_encoder);
+  GstVaapiEncPicture *pic;
+  GstVaapiEncoderH265Ref *ref;
+  GstVaapiH265RefPool *ref_pool;
+  GstVaapiH265ReorderPool *reorder_pool;
+
+  gst_buffer_replace (&encoder->vps_data, NULL);
+  gst_buffer_replace (&encoder->sps_data, NULL);
+  gst_buffer_replace (&encoder->pps_data, NULL);
+
+  /* reference list info de-init */
+  ref_pool = &encoder->ref_pool;
+  while (!g_queue_is_empty (&ref_pool->ref_list)) {
+    ref = (GstVaapiEncoderH265Ref *) g_queue_pop_head (&ref_pool->ref_list);
+    reference_pic_free (encoder, ref);
+  }
+  g_queue_clear (&ref_pool->ref_list);
+
+  /* re-ordering  list initialize */
+  reorder_pool = &encoder->reorder_pool;
+  while (!g_queue_is_empty (&reorder_pool->reorder_frame_list)) {
+    pic = (GstVaapiEncPicture *)
+        g_queue_pop_head (&reorder_pool->reorder_frame_list);
+    gst_vaapi_enc_picture_unref (pic);
+  }
+  g_queue_clear (&reorder_pool->reorder_frame_list);
+}
+
+static GstVaapiEncoderStatus
+gst_vaapi_encoder_h265_set_property (GstVaapiEncoder * base_encoder,
+    gint prop_id, const GValue * value)
+{
+  GstVaapiEncoderH265 *const encoder =
+      GST_VAAPI_ENCODER_H265_CAST (base_encoder);
+
+  switch (prop_id) {
+    case GST_VAAPI_ENCODER_H265_PROP_MAX_BFRAMES:
+      encoder->num_bframes = g_value_get_uint (value);
+      break;
+    case GST_VAAPI_ENCODER_H265_PROP_INIT_QP:
+      encoder->init_qp = g_value_get_uint (value);
+      break;
+    case GST_VAAPI_ENCODER_H265_PROP_MIN_QP:
+      encoder->min_qp = g_value_get_uint (value);
+      break;
+    case GST_VAAPI_ENCODER_H265_PROP_NUM_SLICES:
+      encoder->num_slices = g_value_get_uint (value);
+      break;
+    default:
+      return GST_VAAPI_ENCODER_STATUS_ERROR_INVALID_PARAMETER;
+  }
+  return GST_VAAPI_ENCODER_STATUS_SUCCESS;
+}
+
+GST_VAAPI_ENCODER_DEFINE_CLASS_DATA (H265);
+
+static inline const GstVaapiEncoderClass *
+gst_vaapi_encoder_h265_class (void)
+{
+  static const GstVaapiEncoderClass GstVaapiEncoderH265Class = {
+    GST_VAAPI_ENCODER_CLASS_INIT (H265, h265),
+    .set_property = gst_vaapi_encoder_h265_set_property,
+    .get_codec_data = gst_vaapi_encoder_h265_get_codec_data
+  };
+  return &GstVaapiEncoderH265Class;
+}
+
+/**
+ * gst_vaapi_encoder_h265_new:
+ * @display: a #GstVaapiDisplay
+ *
+ * Creates a new #GstVaapiEncoder for H.265 encoding. Note that the
+ * only supported output stream format is "byte-stream" format.
+ *
+ * Return value: the newly allocated #GstVaapiEncoder object
+ */
+GstVaapiEncoder *
+gst_vaapi_encoder_h265_new (GstVaapiDisplay * display)
+{
+  return gst_vaapi_encoder_new (gst_vaapi_encoder_h265_class (), display);
+}
+
+/**
+ * gst_vaapi_encoder_h265_get_default_properties:
+ *
+ * Determines the set of common and H.265 specific encoder properties.
+ * The caller owns an extra reference to the resulting array of
+ * #GstVaapiEncoderPropInfo elements, so it shall be released with
+ * g_ptr_array_unref() after usage.
+ *
+ * Return value: the set of encoder properties for #GstVaapiEncoderH265,
+ *   or %NULL if an error occurred.
+ */
+GPtrArray *
+gst_vaapi_encoder_h265_get_default_properties (void)
+{
+  const GstVaapiEncoderClass *const klass = gst_vaapi_encoder_h265_class ();
+  GPtrArray *props;
+
+  props = gst_vaapi_encoder_properties_get_default (klass);
+  if (!props)
+    return NULL;
+
+  /**
+   * GstVaapiEncoderH265:max-bframes:
+   *
+   * The number of B-frames between I and P.
+   */
+  GST_VAAPI_ENCODER_PROPERTIES_APPEND (props,
+      GST_VAAPI_ENCODER_H265_PROP_MAX_BFRAMES,
+      g_param_spec_uint ("max-bframes",
+          "Max B-Frames", "Number of B-frames between I and P", 0, 10, 0,
+          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+  /**
+   * GstVaapiEncoderH265:init-qp:
+   *
+   * The initial quantizer value.
+   */
+  GST_VAAPI_ENCODER_PROPERTIES_APPEND (props,
+      GST_VAAPI_ENCODER_H265_PROP_INIT_QP,
+      g_param_spec_uint ("init-qp",
+          "Initial QP", "Initial quantizer value", 1, 51, 26,
+          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+  /**
+   * GstVaapiEncoderH265:min-qp:
+   *
+   * The minimum quantizer value.
+   */
+  GST_VAAPI_ENCODER_PROPERTIES_APPEND (props,
+      GST_VAAPI_ENCODER_H265_PROP_MIN_QP,
+      g_param_spec_uint ("min-qp",
+          "Minimum QP", "Minimum quantizer value", 1, 51, 1,
+          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+  /* Fixme: there seems to be issues with multi-slice encoding */
+  /**
+   * GstVaapiEncoderH265:num-slices:
+   *
+   * The number of slices per frame.
+   */
+  GST_VAAPI_ENCODER_PROPERTIES_APPEND (props,
+      GST_VAAPI_ENCODER_H265_PROP_NUM_SLICES,
+      g_param_spec_uint ("num-slices",
+          "Number of Slices",
+          "Number of slices per frame",
+          1, 200, 1, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+  return props;
+}
+
+/**
+ * gst_vaapi_encoder_h265_set_max_profile:
+ * @encoder: a #GstVaapiEncoderH265
+ * @profile: an H.265 #GstVaapiProfile
+ *
+ * Notifies the @encoder to use coding tools from the supplied
+ * @profile at most.
+ *
+ * This means that if the minimal profile derived to
+ * support the specified coding tools is greater than this @profile,
+ * then an error is returned when the @encoder is configured.
+ *
+ * Return value: %TRUE on success
+ */
+gboolean
+gst_vaapi_encoder_h265_set_max_profile (GstVaapiEncoderH265 * encoder,
+    GstVaapiProfile profile)
+{
+  guint8 profile_idc;
+
+  g_return_val_if_fail (encoder != NULL, FALSE);
+  g_return_val_if_fail (profile != GST_VAAPI_PROFILE_UNKNOWN, FALSE);
+
+  if (gst_vaapi_profile_get_codec (profile) != GST_VAAPI_CODEC_H265)
+    return FALSE;
+
+  profile_idc = gst_vaapi_utils_h265_get_profile_idc (profile);
+  if (!profile_idc)
+    return FALSE;
+
+  encoder->max_profile_idc = profile_idc;
+  return TRUE;
+}
+
+/**
+ * gst_vaapi_encoder_h265_get_profile_tier_level:
+ * @encoder: a #GstVaapiEncoderH265
+ * @out_profile_ptr: return location for the #GstVaapiProfile
+ * @out_level_ptr: return location for the #GstVaapiLevelH265
+ * @out_tier_ptr: return location for the #GstVaapiTierH265
+ *
+ * Queries the H.265 @encoder for the active profile and level. That
+ * information is only constructed and valid after the encoder is
+ * configured, i.e. after the gst_vaapi_encoder_set_codec_state()
+ * function is called.
+ *
+ * Return value: %TRUE on success
+ */
+gboolean
+gst_vaapi_encoder_h265_get_profile_tier_level (GstVaapiEncoderH265 * encoder,
+    GstVaapiProfile * out_profile_ptr, GstVaapiTierH265 * out_tier_ptr,
+    GstVaapiLevelH265 * out_level_ptr)
+{
+  g_return_val_if_fail (encoder != NULL, FALSE);
+
+  if (!encoder->profile || !encoder->tier || !encoder->level)
+    return FALSE;
+
+  if (out_profile_ptr)
+    *out_profile_ptr = encoder->profile;
+  if (out_level_ptr)
+    *out_level_ptr = encoder->level;
+  if (out_tier_ptr)
+    *out_tier_ptr = encoder->tier;
+
+  return TRUE;
+}
diff -Nru gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapiencoder_h265.h gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapiencoder_h265.h
--- gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapiencoder_h265.h	1970-01-01 00:00:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapiencoder_h265.h	2015-07-15 12:47:43.000000000 +0000
@@ -0,0 +1,72 @@
+/*
+ *  gstvaapiencoder_h265.h - H.265 encoder
+ *
+ *  Copyright (C) 2015 Intel Corporation
+ *    Author: Sreerenj Balachandran <sreerenj.balachandran@intel.com>
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public License
+ *  as published by the Free Software Foundation; either version 2.1
+ *  of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free
+ *  Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ *  Boston, MA 02110-1301 USA
+ */
+
+#ifndef GST_VAAPI_ENCODER_H265_H
+#define GST_VAAPI_ENCODER_H265_H
+
+#include <gst/vaapi/gstvaapiencoder.h>
+#include <gst/vaapi/gstvaapiutils_h265.h>
+
+G_BEGIN_DECLS
+
+#define GST_VAAPI_ENCODER_H265(encoder) \
+  ((GstVaapiEncoderH265 *) (encoder))
+
+typedef struct _GstVaapiEncoderH265 GstVaapiEncoderH265;
+
+/**
+ * GstVaapiEncoderH265Prop:
+ * @GST_VAAPI_ENCODER_H265_PROP_MAX_BFRAMES: Number of B-frames between I
+ *   and P (uint).
+ * @GST_VAAPI_ENCODER_H265_PROP_INIT_QP: Initial quantizer value (uint).
+ * @GST_VAAPI_ENCODER_H265_PROP_MIN_QP: Minimal quantizer value (uint).
+ * @GST_VAAPI_ENCODER_H265_PROP_NUM_SLICES: Number of slices per frame (uint).
+ * @GST_VAAPI_ENCODER_H265_PROP_CPB_LENGTH: Length of the CPB buffer
+ *   in milliseconds (uint).
+ *
+ * The set of H.265 encoder specific configurable properties.
+ */
+typedef enum {
+  GST_VAAPI_ENCODER_H265_PROP_MAX_BFRAMES = -1,
+  GST_VAAPI_ENCODER_H265_PROP_INIT_QP = -2,
+  GST_VAAPI_ENCODER_H265_PROP_MIN_QP = -3,
+  GST_VAAPI_ENCODER_H265_PROP_NUM_SLICES = -4,
+  GST_VAAPI_ENCODER_H265_PROP_CPB_LENGTH = -7
+} GstVaapiEncoderH265Prop;
+
+GstVaapiEncoder *
+gst_vaapi_encoder_h265_new (GstVaapiDisplay * display);
+
+GPtrArray *
+gst_vaapi_encoder_h265_get_default_properties (void);
+
+gboolean
+gst_vaapi_encoder_h265_set_max_profile (GstVaapiEncoderH265 * encoder,
+    GstVaapiProfile profile);
+
+gboolean
+gst_vaapi_encoder_h265_get_profile_tier_level (GstVaapiEncoderH265 * encoder,
+    GstVaapiProfile * out_profile_ptr, GstVaapiTierH265 *out_tier_ptr, GstVaapiLevelH265 * out_level_ptr);
+
+G_END_DECLS
+
+#endif /*GST_VAAPI_ENCODER_H265_H */
diff -Nru gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapiencoder_jpeg.c gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapiencoder_jpeg.c
--- gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapiencoder_jpeg.c	1970-01-01 00:00:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapiencoder_jpeg.c	2015-07-15 12:47:43.000000000 +0000
@@ -0,0 +1,834 @@
+/*
+ *  gstvaapiencoder_jpeg.c - JPEG encoder
+ *
+ *  Copyright (C) 2015 Intel Corporation
+ *    Author: Sreerenj Balachandran <sreerenj.balachandran@intel.com>
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public License
+ *  as published by the Free Software Foundation; either version 2.1
+ *  of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free
+ *  Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ *  Boston, MA 02110-1301 USA
+ */
+
+#include "sysdeps.h"
+#include <va/va.h>
+#include <va/va_enc_jpeg.h>
+#include <gst/base/gstbitwriter.h>
+#include <gst/codecparsers/gstjpegparser.h>
+#include "gstvaapicompat.h"
+#include "gstvaapiencoder_priv.h"
+#include "gstvaapiencoder_jpeg.h"
+#include "gstvaapicodedbufferproxy_priv.h"
+#include "gstvaapisurface.h"
+
+#define DEBUG 1
+#include "gstvaapidebug.h"
+
+/* Define default rate control mode ("constant-qp") */
+#define DEFAULT_RATECONTROL GST_VAAPI_RATECONTROL_NONE
+
+/* Supported set of VA rate controls, within this implementation */
+#define SUPPORTED_RATECONTROLS                  \
+  (GST_VAAPI_RATECONTROL_MASK (NONE))
+
+/* Supported set of tuning options, within this implementation */
+#define SUPPORTED_TUNE_OPTIONS \
+  (GST_VAAPI_ENCODER_TUNE_MASK (NONE))
+
+/* Supported set of VA packed headers, within this implementation */
+#define SUPPORTED_PACKED_HEADERS                \
+  (VA_ENC_PACKED_HEADER_RAW_DATA)
+
+#define NUM_DC_RUN_SIZE_BITS 16
+#define NUM_AC_RUN_SIZE_BITS 16
+#define NUM_AC_CODE_WORDS_HUFFVAL 162
+#define NUM_DC_CODE_WORDS_HUFFVAL 12
+
+/* ------------------------------------------------------------------------- */
+/* --- JPEG Encoder                                                      --- */
+/* ------------------------------------------------------------------------- */
+
+#define GST_VAAPI_ENCODER_JPEG_CAST(encoder) \
+    ((GstVaapiEncoderJpeg *)(encoder))
+
+struct _GstVaapiEncoderJpeg
+{
+  GstVaapiEncoder parent_instance;
+  GstVaapiProfile profile;
+  guint quality;
+  GstJpegQuantTables quant_tables;
+  GstJpegQuantTables scaled_quant_tables;
+  gboolean has_quant_tables;
+  GstJpegHuffmanTables huff_tables;
+  gboolean has_huff_tables;
+  gint cwidth[GST_VIDEO_MAX_COMPONENTS];
+  gint cheight[GST_VIDEO_MAX_COMPONENTS];
+  gint h_samp[GST_VIDEO_MAX_COMPONENTS];
+  gint v_samp[GST_VIDEO_MAX_COMPONENTS];
+  gint h_max_samp;
+  gint v_max_samp;
+  guint n_components;
+};
+
+/* based on upstream gst-plugins-good jpegencoder */
+static void
+generate_sampling_factors (GstVaapiEncoderJpeg * encoder)
+{
+  GstVideoInfo *vinfo;
+  gint i;
+
+  vinfo = GST_VAAPI_ENCODER_VIDEO_INFO (encoder);
+
+  if (GST_VIDEO_INFO_FORMAT (vinfo) == GST_VIDEO_FORMAT_ENCODED) {
+    /* Use native I420 format */
+    encoder->n_components = 3;
+    for (i = 0; i < encoder->n_components; ++i) {
+      if (i == 0)
+        encoder->h_samp[i] = encoder->v_samp[i] = 2;
+      else
+        encoder->h_samp[i] = encoder->v_samp[i] = 1;
+      GST_DEBUG ("sampling factors: %d %d", encoder->h_samp[i],
+          encoder->v_samp[i]);
+    }
+    return;
+  }
+
+  encoder->n_components = GST_VIDEO_INFO_N_COMPONENTS (vinfo);
+
+  encoder->h_max_samp = 0;
+  encoder->v_max_samp = 0;
+  for (i = 0; i < encoder->n_components; ++i) {
+    encoder->cwidth[i] = GST_VIDEO_INFO_COMP_WIDTH (vinfo, i);
+    encoder->cheight[i] = GST_VIDEO_INFO_COMP_HEIGHT (vinfo, i);
+    encoder->h_samp[i] =
+        GST_ROUND_UP_4 (GST_VIDEO_INFO_WIDTH (vinfo)) / encoder->cwidth[i];
+    encoder->h_max_samp = MAX (encoder->h_max_samp, encoder->h_samp[i]);
+    encoder->v_samp[i] =
+        GST_ROUND_UP_4 (GST_VIDEO_INFO_HEIGHT (vinfo)) / encoder->cheight[i];
+    encoder->v_max_samp = MAX (encoder->v_max_samp, encoder->v_samp[i]);
+  }
+  /* samp should only be 1, 2 or 4 */
+  g_assert (encoder->h_max_samp <= 4);
+  g_assert (encoder->v_max_samp <= 4);
+
+  /* now invert */
+  /* maximum is invariant, as one of the components should have samp 1 */
+  for (i = 0; i < encoder->n_components; ++i) {
+    encoder->h_samp[i] = encoder->h_max_samp / encoder->h_samp[i];
+    encoder->v_samp[i] = encoder->v_max_samp / encoder->v_samp[i];
+    GST_DEBUG ("sampling factors: %d %d", encoder->h_samp[i],
+        encoder->v_samp[i]);
+  }
+}
+
+/* Derives the profile that suits best to the configuration */
+static GstVaapiEncoderStatus
+ensure_profile (GstVaapiEncoderJpeg * encoder)
+{
+  /* Always start from "simple" profile for maximum compatibility */
+  encoder->profile = GST_VAAPI_PROFILE_JPEG_BASELINE;
+
+  return GST_VAAPI_ENCODER_STATUS_SUCCESS;
+}
+
+/* Derives the profile supported by the underlying hardware */
+static gboolean
+ensure_hw_profile (GstVaapiEncoderJpeg * encoder)
+{
+  GstVaapiDisplay *const display = GST_VAAPI_ENCODER_DISPLAY (encoder);
+  GstVaapiEntrypoint entrypoint = GST_VAAPI_ENTRYPOINT_PICTURE_ENCODE;
+  GstVaapiProfile profile, profiles[2];
+  guint i, num_profiles = 0;
+
+  profiles[num_profiles++] = encoder->profile;
+
+  profile = GST_VAAPI_PROFILE_UNKNOWN;
+  for (i = 0; i < num_profiles; i++) {
+    if (gst_vaapi_display_has_encoder (display, profiles[i], entrypoint)) {
+      profile = profiles[i];
+      break;
+    }
+  }
+  if (profile == GST_VAAPI_PROFILE_UNKNOWN)
+    goto error_unsupported_profile;
+
+  GST_VAAPI_ENCODER_CAST (encoder)->profile = profile;
+  return TRUE;
+
+  /* ERRORS */
+error_unsupported_profile:
+  {
+    GST_ERROR ("unsupported HW profile (0x%08x)", encoder->profile);
+    return FALSE;
+  }
+}
+
+static GstVaapiEncoderStatus
+set_context_info (GstVaapiEncoder * base_encoder)
+{
+  GstVaapiEncoderJpeg *encoder = GST_VAAPI_ENCODER_JPEG_CAST (base_encoder);
+  GstVideoInfo *const vip = GST_VAAPI_ENCODER_VIDEO_INFO (encoder);
+
+  /* Maximum sizes for common headers (in bytes) */
+  enum
+  {
+    MAX_APP_HDR_SIZE = 20,
+    MAX_FRAME_HDR_SIZE = 19,
+    MAX_QUANT_TABLE_SIZE = 138,
+    MAX_HUFFMAN_TABLE_SIZE = 432,
+    MAX_SCAN_HDR_SIZE = 14
+  };
+
+  if (!ensure_hw_profile (encoder))
+    return GST_VAAPI_ENCODER_STATUS_ERROR_UNSUPPORTED_PROFILE;
+
+  base_encoder->num_ref_frames = 0;
+
+  /* Only YUV 4:2:0 formats are supported for now. */
+  base_encoder->codedbuf_size = GST_ROUND_UP_16 (vip->width) *
+      GST_ROUND_UP_16 (vip->height) * 3 / 2;
+
+  base_encoder->codedbuf_size += MAX_APP_HDR_SIZE + MAX_FRAME_HDR_SIZE +
+      MAX_QUANT_TABLE_SIZE + MAX_HUFFMAN_TABLE_SIZE + MAX_SCAN_HDR_SIZE;
+
+  return GST_VAAPI_ENCODER_STATUS_SUCCESS;
+}
+
+static gboolean
+fill_picture (GstVaapiEncoderJpeg * encoder,
+    GstVaapiEncPicture * picture,
+    GstVaapiCodedBuffer * codedbuf, GstVaapiSurfaceProxy * surface)
+{
+  VAEncPictureParameterBufferJPEG *const pic_param = picture->param;
+
+  memset (pic_param, 0, sizeof (VAEncPictureParameterBufferJPEG));
+
+  pic_param->reconstructed_picture =
+      GST_VAAPI_SURFACE_PROXY_SURFACE_ID (surface);
+  pic_param->picture_width = GST_VAAPI_ENCODER_WIDTH (encoder);
+  pic_param->picture_height = GST_VAAPI_ENCODER_HEIGHT (encoder);
+  pic_param->coded_buf = GST_VAAPI_OBJECT_ID (codedbuf);
+
+  pic_param->pic_flags.bits.profile = 0;        /* Profile = Baseline */
+  pic_param->pic_flags.bits.progressive = 0;    /* Sequential encoding */
+  pic_param->pic_flags.bits.huffman = 1;        /* Uses Huffman coding */
+  pic_param->pic_flags.bits.interleaved = 0;    /* Input format is non interleaved (YUV) */
+  pic_param->pic_flags.bits.differential = 0;   /* non-Differential Encoding */
+  pic_param->sample_bit_depth = 8;
+  pic_param->num_scan = 1;
+  pic_param->num_components = encoder->n_components;
+  pic_param->quality = encoder->quality;
+  return TRUE;
+}
+
+static gboolean
+ensure_picture (GstVaapiEncoderJpeg * encoder, GstVaapiEncPicture * picture,
+    GstVaapiCodedBufferProxy * codedbuf_proxy, GstVaapiSurfaceProxy * surface)
+{
+  GstVaapiCodedBuffer *const codedbuf =
+      GST_VAAPI_CODED_BUFFER_PROXY_BUFFER (codedbuf_proxy);
+
+  if (!fill_picture (encoder, picture, codedbuf, surface))
+    return FALSE;
+
+  return TRUE;
+}
+
+/* This is a work-around: Normalize the quality factor and scale QM
+ * values similar to what VA-Intel driver is doing. Otherwise the
+ * generated packed headers will be wrong, since the driver itself
+ * is scaling the QM values using the normalized quality factor */
+static void
+generate_scaled_qm (GstJpegQuantTables * quant_tables,
+    GstJpegQuantTables * scaled_quant_tables, guint quality)
+{
+  guint qt_val, nm_quality, i;
+  nm_quality = quality == 0 ? 1 : quality;
+  nm_quality =
+      (nm_quality < 50) ? (5000 / nm_quality) : (200 - (nm_quality * 2));
+
+  g_assert (quant_tables != NULL);
+  g_assert (scaled_quant_tables != NULL);
+
+  for (i = 0; i < GST_JPEG_MAX_QUANT_ELEMENTS; i++) {
+    /* Luma QM */
+    qt_val = (quant_tables->quant_tables[0].quant_table[i] * nm_quality) / 100;
+    scaled_quant_tables->quant_tables[0].quant_table[i] =
+        CLAMP (qt_val, 1, 255);
+    /* Chroma QM */
+    qt_val = (quant_tables->quant_tables[1].quant_table[i] * nm_quality) / 100;
+    scaled_quant_tables->quant_tables[1].quant_table[i] =
+        CLAMP (qt_val, 1, 255);
+  }
+}
+
+static gboolean
+fill_quantization_table (GstVaapiEncoderJpeg * encoder,
+    GstVaapiEncPicture * picture)
+{
+  VAQMatrixBufferJPEG *q_matrix;
+  int i;
+
+  g_assert (picture);
+
+  picture->q_matrix = GST_VAAPI_ENC_Q_MATRIX_NEW (JPEG, encoder);
+  if (!picture->q_matrix) {
+    GST_ERROR ("failed to allocate quantiser table");
+    return GST_VAAPI_DECODER_STATUS_ERROR_ALLOCATION_FAILED;
+  }
+  q_matrix = picture->q_matrix->param;
+
+  if (!encoder->has_quant_tables) {
+    gst_jpeg_get_default_quantization_tables (&encoder->quant_tables);
+    encoder->has_quant_tables = TRUE;
+    generate_scaled_qm (&encoder->quant_tables, &encoder->scaled_quant_tables,
+        encoder->quality);
+  }
+  q_matrix->load_lum_quantiser_matrix = 1;
+  for (i = 0; i < GST_JPEG_MAX_QUANT_ELEMENTS; i++) {
+    q_matrix->lum_quantiser_matrix[i] =
+        encoder->quant_tables.quant_tables[0].quant_table[i];
+  }
+
+  q_matrix->load_chroma_quantiser_matrix = 1;
+  for (i = 0; i < GST_JPEG_MAX_QUANT_ELEMENTS; i++) {
+    q_matrix->chroma_quantiser_matrix[i] =
+        encoder->quant_tables.quant_tables[1].quant_table[i];
+  }
+
+  return TRUE;
+}
+
+static gboolean
+ensure_quantization_table (GstVaapiEncoderJpeg * encoder,
+    GstVaapiEncPicture * picture)
+{
+  g_assert (picture);
+
+  if (!fill_quantization_table (encoder, picture))
+    return FALSE;
+
+  return TRUE;
+}
+
+static gboolean
+fill_huffman_table (GstVaapiEncoderJpeg * encoder, GstVaapiEncPicture * picture)
+{
+  VAHuffmanTableBufferJPEGBaseline *huffman_table;
+  guint i, num_tables;
+
+  g_assert (picture);
+
+  picture->huf_table = GST_VAAPI_ENC_HUFFMAN_TABLE_NEW (JPEGBaseline, encoder);
+  if (!picture->huf_table) {
+    GST_ERROR ("failed to allocate Huffman tables");
+    return GST_VAAPI_DECODER_STATUS_ERROR_ALLOCATION_FAILED;
+  }
+  huffman_table = picture->huf_table->param;
+
+  num_tables = MIN (G_N_ELEMENTS (huffman_table->huffman_table),
+      GST_JPEG_MAX_SCAN_COMPONENTS);
+
+  if (!encoder->has_huff_tables) {
+    gst_jpeg_get_default_huffman_tables (&encoder->huff_tables);
+    encoder->has_huff_tables = TRUE;
+  }
+
+  for (i = 0; i < num_tables; i++) {
+    huffman_table->load_huffman_table[i] =
+        encoder->huff_tables.dc_tables[i].valid
+        && encoder->huff_tables.ac_tables[i].valid;
+    if (!huffman_table->load_huffman_table[i])
+      continue;
+
+    memcpy (huffman_table->huffman_table[i].num_dc_codes,
+        encoder->huff_tables.dc_tables[i].huf_bits,
+        sizeof (huffman_table->huffman_table[i].num_dc_codes));
+    memcpy (huffman_table->huffman_table[i].dc_values,
+        encoder->huff_tables.dc_tables[i].huf_values,
+        sizeof (huffman_table->huffman_table[i].dc_values));
+    memcpy (huffman_table->huffman_table[i].num_ac_codes,
+        encoder->huff_tables.ac_tables[i].huf_bits,
+        sizeof (huffman_table->huffman_table[i].num_ac_codes));
+    memcpy (huffman_table->huffman_table[i].ac_values,
+        encoder->huff_tables.ac_tables[i].huf_values,
+        sizeof (huffman_table->huffman_table[i].ac_values));
+    memset (huffman_table->huffman_table[i].pad,
+        0, sizeof (huffman_table->huffman_table[i].pad));
+  }
+
+  return TRUE;
+}
+
+static gboolean
+ensure_huffman_table (GstVaapiEncoderJpeg * encoder,
+    GstVaapiEncPicture * picture)
+{
+  g_assert (picture);
+
+  if (!fill_huffman_table (encoder, picture))
+    return FALSE;
+
+  return TRUE;
+}
+
+static gboolean
+fill_slices (GstVaapiEncoderJpeg * encoder, GstVaapiEncPicture * picture)
+{
+  VAEncSliceParameterBufferJPEG *slice_param;
+  GstVaapiEncSlice *slice;
+  VAEncPictureParameterBufferJPEG *const pic_param = picture->param;
+
+  slice = GST_VAAPI_ENC_SLICE_NEW (JPEG, encoder);
+  g_assert (slice && slice->param_id != VA_INVALID_ID);
+  slice_param = slice->param;
+
+  slice_param->restart_interval = 0;
+  slice_param->num_components = pic_param->num_components;
+
+  slice_param->components[0].component_selector = 1;
+  slice_param->components[0].dc_table_selector = 0;
+  slice_param->components[0].ac_table_selector = 0;
+
+  slice_param->components[1].component_selector = 2;
+  slice_param->components[1].dc_table_selector = 1;
+  slice_param->components[1].ac_table_selector = 1;
+
+  slice_param->components[2].component_selector = 3;
+  slice_param->components[2].dc_table_selector = 1;
+  slice_param->components[2].ac_table_selector = 1;
+
+  gst_vaapi_enc_picture_add_slice (picture, slice);
+  gst_vaapi_codec_object_replace (&slice, NULL);
+
+  return TRUE;
+}
+
+static gboolean
+ensure_slices (GstVaapiEncoderJpeg * encoder, GstVaapiEncPicture * picture)
+{
+  g_assert (picture);
+
+  if (!fill_slices (encoder, picture))
+    return FALSE;
+
+  return TRUE;
+}
+
+static void
+generate_frame_hdr (GstJpegFrameHdr * frame_hdr, GstVaapiEncoderJpeg * encoder,
+    GstVaapiEncPicture * picture)
+{
+  VAEncPictureParameterBufferJPEG *const pic_param = picture->param;
+  guint i;
+
+  memset (frame_hdr, 0, sizeof (GstJpegFrameHdr));
+  frame_hdr->sample_precision = 8;
+  frame_hdr->width = pic_param->picture_width;
+  frame_hdr->height = pic_param->picture_height;
+  frame_hdr->num_components = pic_param->num_components;
+
+  for (i = 0; i < frame_hdr->num_components; i++) {
+    frame_hdr->components[i].identifier = i + 1;
+    frame_hdr->components[i].horizontal_factor = encoder->h_samp[i];
+    frame_hdr->components[i].vertical_factor = encoder->v_samp[i];
+    if (i == 0)
+      frame_hdr->components[i].quant_table_selector = 0;
+    else
+      frame_hdr->components[i].quant_table_selector = 1;
+  }
+}
+
+static void
+generate_scan_hdr (GstJpegScanHdr * scan_hdr, GstVaapiEncPicture * picture)
+{
+
+  VAEncPictureParameterBufferJPEG *const pic_param = picture->param;
+
+  memset (scan_hdr, 0, sizeof (GstJpegScanHdr));
+  scan_hdr->num_components = pic_param->num_components;
+  //Y Component
+  scan_hdr->components[0].component_selector = 1;
+  scan_hdr->components[0].dc_selector = 0;
+  scan_hdr->components[0].ac_selector = 0;
+
+
+  //U Component
+  scan_hdr->components[1].component_selector = 2;
+  scan_hdr->components[1].dc_selector = 1;
+  scan_hdr->components[1].ac_selector = 1;
+
+  //V Component
+  scan_hdr->components[2].component_selector = 3;
+  scan_hdr->components[2].dc_selector = 1;
+  scan_hdr->components[2].ac_selector = 1;
+}
+
+static gboolean
+bs_write_jpeg_header (GstBitWriter * bs, GstVaapiEncoderJpeg * encoder,
+    GstVaapiEncPicture * picture)
+{
+  GstJpegFrameHdr frame_hdr;
+  GstJpegScanHdr scan_hdr;
+  guint i, j;
+
+  gst_bit_writer_put_bits_uint8 (bs, 0xFF, 8);
+  gst_bit_writer_put_bits_uint8 (bs, GST_JPEG_MARKER_SOI, 8);
+  gst_bit_writer_put_bits_uint8 (bs, 0xFF, 8);
+  gst_bit_writer_put_bits_uint8 (bs, GST_JPEG_MARKER_APP_MIN, 8);
+  gst_bit_writer_put_bits_uint16 (bs, 16, 16);
+  gst_bit_writer_put_bits_uint8 (bs, 0x4A, 8);  //J
+  gst_bit_writer_put_bits_uint8 (bs, 0x46, 8);  //F
+  gst_bit_writer_put_bits_uint8 (bs, 0x49, 8);  //I
+  gst_bit_writer_put_bits_uint8 (bs, 0x46, 8);  //F
+  gst_bit_writer_put_bits_uint8 (bs, 0x00, 8);  //0
+  gst_bit_writer_put_bits_uint8 (bs, 1, 8);     //Major Version
+  gst_bit_writer_put_bits_uint8 (bs, 1, 8);     //Minor Version
+  gst_bit_writer_put_bits_uint8 (bs, 0, 8);     //Density units 0:no units, 1:pixels per inch, 2: pixels per cm
+  gst_bit_writer_put_bits_uint16 (bs, 1, 16);   //X density (pixel-aspect-ratio)
+  gst_bit_writer_put_bits_uint16 (bs, 1, 16);   //Y density (pixel-aspect-ratio)
+  gst_bit_writer_put_bits_uint8 (bs, 0, 8);     //Thumbnail width
+  gst_bit_writer_put_bits_uint8 (bs, 0, 8);     //Thumbnail height
+
+  /* Add  quantization table */
+  if (!encoder->has_quant_tables) {
+    gst_jpeg_get_default_quantization_tables (&encoder->quant_tables);
+    generate_scaled_qm (&encoder->quant_tables, &encoder->scaled_quant_tables,
+        encoder->quality);
+    encoder->has_quant_tables = TRUE;
+  }
+
+  gst_bit_writer_put_bits_uint8 (bs, 0xFF, 8);
+  gst_bit_writer_put_bits_uint8 (bs, GST_JPEG_MARKER_DQT, 8);
+  gst_bit_writer_put_bits_uint16 (bs, 3 + GST_JPEG_MAX_QUANT_ELEMENTS, 16);     //Lq
+  gst_bit_writer_put_bits_uint8 (bs, encoder->quant_tables.quant_tables[0].quant_precision, 4); //Pq
+  gst_bit_writer_put_bits_uint8 (bs, 0, 4);     //Tq
+  for (i = 0; i < GST_JPEG_MAX_QUANT_ELEMENTS; i++) {
+    gst_bit_writer_put_bits_uint16 (bs,
+        encoder->scaled_quant_tables.quant_tables[0].quant_table[i], 8);
+  }
+  gst_bit_writer_put_bits_uint8 (bs, 0xFF, 8);
+  gst_bit_writer_put_bits_uint8 (bs, GST_JPEG_MARKER_DQT, 8);
+  gst_bit_writer_put_bits_uint16 (bs, 3 + GST_JPEG_MAX_QUANT_ELEMENTS, 16);     //Lq
+  gst_bit_writer_put_bits_uint8 (bs, encoder->quant_tables.quant_tables[1].quant_precision, 4); //Pq
+  gst_bit_writer_put_bits_uint8 (bs, 1, 4);     //Tq
+  for (i = 0; i < GST_JPEG_MAX_QUANT_ELEMENTS; i++) {
+    gst_bit_writer_put_bits_uint16 (bs,
+        encoder->scaled_quant_tables.quant_tables[1].quant_table[i], 8);
+  }
+
+  /*Add frame header */
+  generate_frame_hdr (&frame_hdr, encoder, picture);
+  gst_bit_writer_put_bits_uint8 (bs, 0xFF, 8);
+  gst_bit_writer_put_bits_uint8 (bs, GST_JPEG_MARKER_SOF_MIN, 8);
+  gst_bit_writer_put_bits_uint16 (bs, 8 + (3 * 3), 16); //lf, Size of FrameHeader in bytes without the Marker SOF
+  gst_bit_writer_put_bits_uint8 (bs, frame_hdr.sample_precision, 8);
+  gst_bit_writer_put_bits_uint16 (bs, frame_hdr.height, 16);
+  gst_bit_writer_put_bits_uint16 (bs, frame_hdr.width, 16);
+  gst_bit_writer_put_bits_uint8 (bs, frame_hdr.num_components, 8);
+  for (i = 0; i < frame_hdr.num_components; i++) {
+    gst_bit_writer_put_bits_uint8 (bs, frame_hdr.components[i].identifier, 8);
+    gst_bit_writer_put_bits_uint8 (bs,
+        frame_hdr.components[i].horizontal_factor, 4);
+    gst_bit_writer_put_bits_uint8 (bs, frame_hdr.components[i].vertical_factor,
+        4);
+    gst_bit_writer_put_bits_uint8 (bs,
+        frame_hdr.components[i].quant_table_selector, 8);
+  }
+
+  /* Add Huffman table */
+  if (!encoder->has_huff_tables) {
+    gst_jpeg_get_default_huffman_tables (&encoder->huff_tables);
+    encoder->has_huff_tables = TRUE;
+  }
+  for (i = 0; i < 2; i++) {
+    gst_bit_writer_put_bits_uint8 (bs, 0xFF, 8);
+    gst_bit_writer_put_bits_uint8 (bs, GST_JPEG_MARKER_DHT, 8);
+    gst_bit_writer_put_bits_uint16 (bs, 0x1F, 16);      //length of table
+    gst_bit_writer_put_bits_uint8 (bs, 0, 4);
+    gst_bit_writer_put_bits_uint8 (bs, i, 4);
+    for (j = 0; j < NUM_DC_RUN_SIZE_BITS; j++) {
+      gst_bit_writer_put_bits_uint8 (bs,
+          encoder->huff_tables.dc_tables[i].huf_bits[j], 8);
+    }
+
+    for (j = 0; j < NUM_DC_CODE_WORDS_HUFFVAL; j++) {
+      gst_bit_writer_put_bits_uint8 (bs,
+          encoder->huff_tables.dc_tables[i].huf_values[j], 8);
+    }
+
+    gst_bit_writer_put_bits_uint8 (bs, 0xFF, 8);
+    gst_bit_writer_put_bits_uint8 (bs, GST_JPEG_MARKER_DHT, 8);
+    gst_bit_writer_put_bits_uint16 (bs, 0xB5, 16);      //length of table
+    gst_bit_writer_put_bits_uint8 (bs, 1, 4);
+    gst_bit_writer_put_bits_uint8 (bs, i, 4);
+    for (j = 0; j < NUM_AC_RUN_SIZE_BITS; j++) {
+      gst_bit_writer_put_bits_uint8 (bs,
+          encoder->huff_tables.ac_tables[i].huf_bits[j], 8);
+    }
+
+    for (j = 0; j < NUM_AC_CODE_WORDS_HUFFVAL; j++) {
+      gst_bit_writer_put_bits_uint8 (bs,
+          encoder->huff_tables.ac_tables[i].huf_values[j], 8);
+    }
+  }
+
+  /* Add ScanHeader */
+  generate_scan_hdr (&scan_hdr, picture);
+  gst_bit_writer_put_bits_uint8 (bs, 0xFF, 8);
+  gst_bit_writer_put_bits_uint8 (bs, GST_JPEG_MARKER_SOS, 8);
+  gst_bit_writer_put_bits_uint16 (bs, 12, 16);  //Length of Scan
+  gst_bit_writer_put_bits_uint8 (bs, scan_hdr.num_components, 8);
+
+  for (i = 0; i < scan_hdr.num_components; i++) {
+    gst_bit_writer_put_bits_uint8 (bs,
+        scan_hdr.components[i].component_selector, 8);
+    gst_bit_writer_put_bits_uint8 (bs, scan_hdr.components[i].dc_selector, 4);
+    gst_bit_writer_put_bits_uint8 (bs, scan_hdr.components[i].ac_selector, 4);
+  }
+  gst_bit_writer_put_bits_uint8 (bs, 0, 8);     //0 for Baseline
+  gst_bit_writer_put_bits_uint8 (bs, 63, 8);    //63 for Baseline
+  gst_bit_writer_put_bits_uint8 (bs, 0, 4);     //0 for Baseline
+  gst_bit_writer_put_bits_uint8 (bs, 0, 4);     //0 for Baseline
+
+  return TRUE;
+}
+
+static gboolean
+add_packed_header (GstVaapiEncoderJpeg * encoder, GstVaapiEncPicture * picture)
+{
+  GstVaapiEncPackedHeader *packed_raw_data_hdr;
+  GstBitWriter bs;
+  VAEncPackedHeaderParameterBuffer packed_raw_data_hdr_param = { 0 };
+  guint32 data_bit_size;
+  guint8 *data;
+
+  gst_bit_writer_init (&bs, 128 * 8);
+  bs_write_jpeg_header (&bs, encoder, picture);
+  data_bit_size = GST_BIT_WRITER_BIT_SIZE (&bs);
+  data = GST_BIT_WRITER_DATA (&bs);
+
+  packed_raw_data_hdr_param.type = VAEncPackedHeaderRawData;
+  packed_raw_data_hdr_param.bit_length = data_bit_size;
+  packed_raw_data_hdr_param.has_emulation_bytes = 0;
+
+  packed_raw_data_hdr =
+      gst_vaapi_enc_packed_header_new (GST_VAAPI_ENCODER (encoder),
+      &packed_raw_data_hdr_param, sizeof (packed_raw_data_hdr_param), data,
+      (data_bit_size + 7) / 8);
+  g_assert (packed_raw_data_hdr);
+
+  gst_vaapi_enc_picture_add_packed_header (picture, packed_raw_data_hdr);
+  gst_vaapi_codec_object_replace (&packed_raw_data_hdr, NULL);
+
+  gst_bit_writer_clear (&bs, TRUE);
+
+  return TRUE;
+}
+
+static gboolean
+ensure_packed_headers (GstVaapiEncoderJpeg * encoder,
+    GstVaapiEncPicture * picture)
+{
+  g_assert (picture);
+
+  if ((GST_VAAPI_ENCODER_PACKED_HEADERS (encoder) &
+          VA_ENC_PACKED_HEADER_RAW_DATA)
+      && !add_packed_header (encoder, picture))
+    goto error_create_packed_hdr;
+
+  return TRUE;
+
+error_create_packed_hdr:
+  {
+    GST_ERROR ("failed to create packed raw data header buffer");
+    return FALSE;
+  }
+}
+
+static GstVaapiEncoderStatus
+gst_vaapi_encoder_jpeg_encode (GstVaapiEncoder * base_encoder,
+    GstVaapiEncPicture * picture, GstVaapiCodedBufferProxy * codedbuf)
+{
+  GstVaapiEncoderJpeg *const encoder =
+      GST_VAAPI_ENCODER_JPEG_CAST (base_encoder);
+  GstVaapiEncoderStatus ret = GST_VAAPI_ENCODER_STATUS_ERROR_UNKNOWN;
+  GstVaapiSurfaceProxy *reconstruct = NULL;
+
+  reconstruct = gst_vaapi_encoder_create_surface (base_encoder);
+
+  g_assert (GST_VAAPI_SURFACE_PROXY_SURFACE (reconstruct));
+
+  if (!ensure_picture (encoder, picture, codedbuf, reconstruct))
+    goto error;
+  if (!ensure_quantization_table (encoder, picture))
+    goto error;
+  if (!ensure_huffman_table (encoder, picture))
+    goto error;
+  if (!ensure_slices (encoder, picture))
+    goto error;
+  if (!ensure_packed_headers (encoder, picture))
+    goto error;
+  if (!gst_vaapi_enc_picture_encode (picture))
+    goto error;
+  if (reconstruct)
+    gst_vaapi_encoder_release_surface (GST_VAAPI_ENCODER (encoder),
+        reconstruct);
+
+  return GST_VAAPI_ENCODER_STATUS_SUCCESS;
+error:
+  if (reconstruct)
+    gst_vaapi_encoder_release_surface (GST_VAAPI_ENCODER (encoder),
+        reconstruct);
+  return ret;
+}
+
+static GstVaapiEncoderStatus
+gst_vaapi_encoder_jpeg_flush (GstVaapiEncoder * base_encoder)
+{
+  return GST_VAAPI_ENCODER_STATUS_SUCCESS;
+}
+
+static GstVaapiEncoderStatus
+gst_vaapi_encoder_jpeg_reordering (GstVaapiEncoder * base_encoder,
+    GstVideoCodecFrame * frame, GstVaapiEncPicture ** output)
+{
+  GstVaapiEncoderJpeg *const encoder =
+      GST_VAAPI_ENCODER_JPEG_CAST (base_encoder);
+  GstVaapiEncPicture *picture = NULL;
+  GstVaapiEncoderStatus status = GST_VAAPI_ENCODER_STATUS_SUCCESS;
+
+  if (!frame)
+    return GST_VAAPI_ENCODER_STATUS_NO_SURFACE;
+
+  picture = GST_VAAPI_ENC_PICTURE_NEW (JPEG, encoder, frame);
+  if (!picture) {
+    GST_WARNING ("create JPEG picture failed, frame timestamp:%"
+        GST_TIME_FORMAT, GST_TIME_ARGS (frame->pts));
+    return GST_VAAPI_ENCODER_STATUS_ERROR_ALLOCATION_FAILED;
+  }
+
+  *output = picture;
+  return status;
+}
+
+static GstVaapiEncoderStatus
+gst_vaapi_encoder_jpeg_reconfigure (GstVaapiEncoder * base_encoder)
+{
+  GstVaapiEncoderJpeg *const encoder =
+      GST_VAAPI_ENCODER_JPEG_CAST (base_encoder);
+  GstVaapiEncoderStatus status;
+
+  status = ensure_profile (encoder);
+  if (status != GST_VAAPI_ENCODER_STATUS_SUCCESS)
+    return status;
+
+  /* generate sampling factors (A.1.1) */
+  generate_sampling_factors (encoder);
+
+  return set_context_info (base_encoder);
+}
+
+static gboolean
+gst_vaapi_encoder_jpeg_init (GstVaapiEncoder * base_encoder)
+{
+  GstVaapiEncoderJpeg *const encoder =
+      GST_VAAPI_ENCODER_JPEG_CAST (base_encoder);
+
+  encoder->has_quant_tables = FALSE;
+  memset (&encoder->quant_tables, 0, sizeof (encoder->quant_tables));
+  memset (&encoder->scaled_quant_tables, 0,
+      sizeof (encoder->scaled_quant_tables));
+  encoder->has_huff_tables = FALSE;
+  memset (&encoder->huff_tables, 0, sizeof (encoder->huff_tables));
+
+  return TRUE;
+}
+
+static void
+gst_vaapi_encoder_jpeg_finalize (GstVaapiEncoder * base_encoder)
+{
+}
+
+static GstVaapiEncoderStatus
+gst_vaapi_encoder_jpeg_set_property (GstVaapiEncoder * base_encoder,
+    gint prop_id, const GValue * value)
+{
+  GstVaapiEncoderJpeg *const encoder =
+      GST_VAAPI_ENCODER_JPEG_CAST (base_encoder);
+
+  switch (prop_id) {
+    case GST_VAAPI_ENCODER_JPEG_PROP_QUALITY:
+      encoder->quality = g_value_get_uint (value);
+      break;
+    default:
+      return GST_VAAPI_ENCODER_STATUS_ERROR_INVALID_PARAMETER;
+  }
+  return GST_VAAPI_ENCODER_STATUS_SUCCESS;
+}
+
+GST_VAAPI_ENCODER_DEFINE_CLASS_DATA (JPEG);
+
+static inline const GstVaapiEncoderClass *
+gst_vaapi_encoder_jpeg_class (void)
+{
+  static const GstVaapiEncoderClass GstVaapiEncoderJpegClass = {
+    GST_VAAPI_ENCODER_CLASS_INIT (Jpeg, jpeg),
+    .set_property = gst_vaapi_encoder_jpeg_set_property,
+  };
+  return &GstVaapiEncoderJpegClass;
+}
+
+/**
+ * gst_vaapi_encoder_jpeg_new:
+ * @display: a #GstVaapiDisplay
+ *
+ * Creates a new #GstVaapiEncoder for JPEG encoding.
+ *
+ * Return value: the newly allocated #GstVaapiEncoder object
+ */
+GstVaapiEncoder *
+gst_vaapi_encoder_jpeg_new (GstVaapiDisplay * display)
+{
+  return gst_vaapi_encoder_new (gst_vaapi_encoder_jpeg_class (), display);
+}
+
+/**
+ * gst_vaapi_encoder_jpeg_get_default_properties:
+ *
+ * Determines the set of common and jpeg specific encoder properties.
+ * The caller owns an extra reference to the resulting array of
+ * #GstVaapiEncoderPropInfo elements, so it shall be released with
+ * g_ptr_array_unref() after usage.
+ *
+ * Return value: the set of encoder properties for #GstVaapiEncoderJpeg,
+ *   or %NULL if an error occurred.
+ */
+GPtrArray *
+gst_vaapi_encoder_jpeg_get_default_properties (void)
+{
+  const GstVaapiEncoderClass *const klass = gst_vaapi_encoder_jpeg_class ();
+  GPtrArray *props;
+
+  props = gst_vaapi_encoder_properties_get_default (klass);
+  if (!props)
+    return NULL;
+
+  GST_VAAPI_ENCODER_PROPERTIES_APPEND (props,
+      GST_VAAPI_ENCODER_JPEG_PROP_QUALITY,
+      g_param_spec_uint ("quality",
+          "Quality factor",
+          "Quality factor",
+          0, 100, 50, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+  return props;
+}
diff -Nru gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapiencoder_jpeg.h gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapiencoder_jpeg.h
--- gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapiencoder_jpeg.h	1970-01-01 00:00:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapiencoder_jpeg.h	2015-07-15 12:47:43.000000000 +0000
@@ -0,0 +1,52 @@
+/*
+ *  gstvaapiencoder_jpeg.h JPEGG encoder
+ *
+ *  Copyright (C) 2015 Intel Corporation
+ *    Author: Sreerenj Balachandran <sreerenj.balachandran@intel.com>
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public License
+ *  as published by the Free Software Foundation; either version 2.1
+ *  of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free
+ *  Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ *  Boston, MA 02110-1301 USA
+ */
+
+#ifndef GST_VAAPI_ENCODER_JPEG_H
+#define GST_VAAPI_ENCODER_JPEG_H
+
+#include <gst/vaapi/gstvaapiencoder.h>
+
+G_BEGIN_DECLS
+
+#define GST_VAAPI_ENCODER_JPEG(encoder) \
+  ((GstVaapiEncoderJpeg *) (encoder))
+
+typedef struct _GstVaapiEncoderJpeg GstVaapiEncoderJpeg;
+
+/**
+ * GstVaapiEncoderJpegProp:
+ * @GST_VAAPI_ENCODER_JPEG_PROP_QUALITY: Quality Factor value (uint).
+ *
+ * The set of JPEG encoder specific configurable properties.
+ */
+typedef enum {
+  GST_VAAPI_ENCODER_JPEG_PROP_QUALITY = -1
+} GstVaapiEncoderJpegProp;
+
+GstVaapiEncoder *
+gst_vaapi_encoder_jpeg_new (GstVaapiDisplay * display);
+
+GPtrArray *
+gst_vaapi_encoder_jpeg_get_default_properties (void);
+
+G_END_DECLS
+#endif /*GST_VAAPI_ENCODER_JPEG_H */
diff -Nru gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapiencoder_mpeg2.c gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapiencoder_mpeg2.c
--- gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapiencoder_mpeg2.c	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapiencoder_mpeg2.c	2015-07-15 12:47:43.000000000 +0000
@@ -22,6 +22,7 @@
  */
 
 #include "sysdeps.h"
+#include <math.h>
 #include <va/va.h>
 #include <va/va_enc_mpeg2.h>
 #include <gst/base/gstbitwriter.h>
@@ -887,9 +888,9 @@
 
   for (i = 0; i < sizeof (frame_rate_tab) / sizeof (frame_rate_tab[0]); i++) {
 
-    if (abs (1000 * frame_rate_tab[i].value - 1000 * frame_rate_value) < delta) {
+    if (fabsf (1000 * frame_rate_tab[i].value - 1000 * frame_rate_value) < delta) {
       code = frame_rate_tab[i].code;
-      delta = abs (1000 * frame_rate_tab[i].value - 1000 * frame_rate_value);
+      delta = fabsf (1000 * frame_rate_tab[i].value - 1000 * frame_rate_value);
     }
   }
   return code;
diff -Nru gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapiencoder_objects.c gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapiencoder_objects.c
--- gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapiencoder_objects.c	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapiencoder_objects.c	2015-07-15 12:47:43.000000000 +0000
@@ -250,6 +250,80 @@
 }
 
 /* ------------------------------------------------------------------------- */
+/* ---  Quantization Matrices                                            --- */
+/* ------------------------------------------------------------------------- */
+
+GST_VAAPI_CODEC_DEFINE_TYPE (GstVaapiEncQMatrix, gst_vaapi_enc_q_matrix);
+
+void
+gst_vaapi_enc_q_matrix_destroy (GstVaapiEncQMatrix * q_matrix)
+{
+  vaapi_destroy_buffer (GET_VA_DISPLAY (q_matrix), &q_matrix->param_id);
+  q_matrix->param = NULL;
+}
+
+gboolean
+gst_vaapi_enc_q_matrix_create (GstVaapiEncQMatrix * q_matrix,
+    const GstVaapiCodecObjectConstructorArgs * args)
+{
+  q_matrix->param_id = VA_INVALID_ID;
+  return vaapi_create_buffer (GET_VA_DISPLAY (q_matrix),
+      GET_VA_CONTEXT (q_matrix), VAQMatrixBufferType,
+      args->param_size, args->param, &q_matrix->param_id, &q_matrix->param);
+}
+
+GstVaapiEncQMatrix *
+gst_vaapi_enc_q_matrix_new (GstVaapiEncoder * encoder,
+    gconstpointer param, guint param_size)
+{
+  GstVaapiCodecObject *object;
+
+  object = gst_vaapi_codec_object_new (&GstVaapiEncQMatrixClass,
+      GST_VAAPI_CODEC_BASE (encoder), param, param_size, NULL, 0, 0);
+  if (!object)
+    return NULL;
+  return GST_VAAPI_ENC_Q_MATRIX_CAST (object);
+}
+
+/* ------------------------------------------------------------------------- */
+/* --- JPEG Huffman Tables                                               --- */
+/* ------------------------------------------------------------------------- */
+
+#if USE_JPEG_ENCODER
+GST_VAAPI_CODEC_DEFINE_TYPE (GstVaapiEncHuffmanTable, gst_vaapi_enc_huffman_table);
+
+void
+gst_vaapi_enc_huffman_table_destroy (GstVaapiEncHuffmanTable * huf_table)
+{
+  vaapi_destroy_buffer (GET_VA_DISPLAY (huf_table), &huf_table->param_id);
+  huf_table->param = NULL;
+}
+
+gboolean
+gst_vaapi_enc_huffman_table_create (GstVaapiEncHuffmanTable * huf_table,
+    const GstVaapiCodecObjectConstructorArgs * args)
+{
+  huf_table->param_id = VA_INVALID_ID;
+  return vaapi_create_buffer (GET_VA_DISPLAY (huf_table),
+      GET_VA_CONTEXT (huf_table), VAHuffmanTableBufferType, args->param_size,
+      args->param, &huf_table->param_id, (void **) &huf_table->param);
+}
+
+GstVaapiEncHuffmanTable *
+gst_vaapi_enc_huffman_table_new (GstVaapiEncoder * encoder,
+    guint8 * data, guint data_size)
+{
+  GstVaapiCodecObject *object;
+
+  object = gst_vaapi_codec_object_new (&GstVaapiEncHuffmanTableClass,
+      GST_VAAPI_CODEC_BASE (encoder), data, data_size, NULL, 0, 0);
+  if (!object)
+    return NULL;
+  return GST_VAAPI_ENC_HUFFMAN_TABLE_CAST (object);
+}
+#endif
+
+/* ------------------------------------------------------------------------- */
 /* --- Encoder Picture                                                   --- */
 /* ------------------------------------------------------------------------- */
 
@@ -270,6 +344,10 @@
     g_ptr_array_unref (picture->slices);
     picture->slices = NULL;
   }
+
+  gst_vaapi_codec_object_replace (&picture->q_matrix, NULL);
+  gst_vaapi_codec_object_replace (&picture->huf_table, NULL);
+
   gst_vaapi_codec_object_replace (&picture->sequence, NULL);
 
   gst_vaapi_surface_proxy_replace (&picture->proxy, NULL);
@@ -422,6 +500,8 @@
 gst_vaapi_enc_picture_encode (GstVaapiEncPicture * picture)
 {
   GstVaapiEncSequence *sequence;
+  GstVaapiEncQMatrix *q_matrix;
+  GstVaapiEncHuffmanTable *huf_table;
   VADisplay va_display;
   VAContextID va_context;
   VAStatus status;
@@ -445,6 +525,18 @@
           &sequence->param_id, &sequence->param))
     return FALSE;
 
+  /* Submit Quantization matrix */
+  q_matrix = picture->q_matrix;
+  if (q_matrix && !do_encode (va_display, va_context,
+          &q_matrix->param_id, &q_matrix->param))
+    return FALSE;
+
+  /* Submit huffman table */
+  huf_table = picture->huf_table;
+  if (huf_table && !do_encode (va_display, va_context,
+          &huf_table->param_id, (void **) &huf_table->param))
+    return FALSE;
+
   /* Submit Packed Headers */
   for (i = 0; i < picture->packed_headers->len; i++) {
     GstVaapiEncPackedHeader *const header =
diff -Nru gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapiencoder_objects.h gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapiencoder_objects.h
--- gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapiencoder_objects.h	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapiencoder_objects.h	2015-07-15 12:47:43.000000000 +0000
@@ -33,7 +33,8 @@
 typedef struct _GstVaapiEncSequence GstVaapiEncSequence;
 typedef struct _GstVaapiEncMiscParam GstVaapiEncMiscParam;
 typedef struct _GstVaapiEncSlice GstVaapiEncSlice;
-typedef struct _GstVaapiCodedBuffer GstVaapiCodedBuffer;
+typedef struct _GstVaapiEncQMatrix GstVaapiEncQMatrix;
+typedef struct _GstVaapiEncHuffmanTable GstVaapiEncHuffmanTable;
 typedef struct _GstVaapiEncPackedHeader GstVaapiEncPackedHeader;
 
 /* ------------------------------------------------------------------------- */
@@ -156,6 +157,60 @@
     VAEncMiscParameterType type, guint data_size);
 
 /* ------------------------------------------------------------------------- */
+/* ---  Quantization Matrices                                            --- */
+/* ------------------------------------------------------------------------- */
+
+#define GST_VAAPI_ENC_Q_MATRIX_CAST(obj) \
+  ((GstVaapiEncQMatrix *) (obj))
+
+/**
+ * GstVaapiEncQMatrix:
+ *
+ * A #GstVaapiCodecObject holding a quantization matrix parameter.
+ */
+struct _GstVaapiEncQMatrix
+{
+  /*< private >*/
+  GstVaapiCodecObject parent_instance;
+  VABufferID param_id;
+
+  /*< public >*/
+  gpointer param;
+};
+
+G_GNUC_INTERNAL
+GstVaapiEncQMatrix *
+gst_vaapi_enc_q_matrix_new (GstVaapiEncoder * encoder, gconstpointer param,
+    guint param_size);
+
+/* ------------------------------------------------------------------------- */
+/* --- JPEG Huffman Tables                                               --- */
+/* ------------------------------------------------------------------------- */
+
+#define GST_VAAPI_ENC_HUFFMAN_TABLE_CAST(obj) \
+  ((GstVaapiEncHuffmanTable *) (obj))
+
+/**
+ * GstVaapiEncHuffmanTable:
+ *
+ * A #GstVaapiCodecObject holding huffman table.
+ */
+struct _GstVaapiEncHuffmanTable
+{
+  /*< private >*/
+  GstVaapiCodecObject parent_instance;
+  VABufferID param_id;
+
+  /*< public >*/
+  gpointer param;
+};
+
+G_GNUC_INTERNAL
+GstVaapiEncHuffmanTable *
+gst_vaapi_enc_huffman_table_new (GstVaapiEncoder * encoder, guint8 * data,
+    guint data_size);
+
+/* ------------------------------------------------------------------------- */
 /* --- Encoder Picture                                                   --- */
 /* ------------------------------------------------------------------------- */
 
@@ -201,6 +256,8 @@
   VASurfaceID surface_id;
   gpointer param;
   GPtrArray *slices;
+  GstVaapiEncQMatrix *q_matrix;
+  GstVaapiEncHuffmanTable *huf_table;
   GstClockTime pts;
   guint frame_num;
   guint poc;
@@ -272,6 +329,16 @@
   gst_vaapi_enc_slice_new (GST_VAAPI_ENCODER_CAST (encoder),            \
       NULL, sizeof(G_PASTE (VAEncSliceParameterBuffer, codec)))
 
+/* GstVaapiEncQuantMatrix */
+#define GST_VAAPI_ENC_Q_MATRIX_NEW(codec, encoder)                      \
+  gst_vaapi_enc_q_matrix_new (GST_VAAPI_ENCODER_CAST (encoder),         \
+      NULL, sizeof (G_PASTE (VAQMatrixBuffer, codec)))
+
+/* GstVaapiEncHuffmanTable */
+#define GST_VAAPI_ENC_HUFFMAN_TABLE_NEW(codec, encoder)                 \
+  gst_vaapi_enc_huffman_table_new (GST_VAAPI_ENCODER_CAST (encoder),    \
+      NULL, sizeof (G_PASTE (VAHuffmanTableBuffer, codec)))
+
 G_END_DECLS
 
 #endif /* GST_VAAPI_ENCODER_OBJECTS_H */
diff -Nru gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapiencoder_vp8.c gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapiencoder_vp8.c
--- gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapiencoder_vp8.c	1970-01-01 00:00:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapiencoder_vp8.c	2015-07-15 12:47:43.000000000 +0000
@@ -0,0 +1,564 @@
+/*
+ *  gstvaapiencoder_vp8.c - VP8 encoder
+ *
+ *  Copyright (C) 2015 Intel Corporation
+ *    Author: Sreerenj Balachandran <sreerenj.balachandran@intel.com>
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public License
+ *  as published by the Free Software Foundation; either version 2.1
+ *  of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free
+ *  Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ *  Boston, MA 02110-1301 USA
+ */
+
+#include "sysdeps.h"
+#include <va/va.h>
+#include <va/va_enc_vp8.h>
+#include <gst/base/gstbitwriter.h>
+#include <gst/codecparsers/gstvp8parser.h>
+#include "gstvaapicompat.h"
+#include "gstvaapiencoder_priv.h"
+#include "gstvaapiencoder_vp8.h"
+#include "gstvaapicodedbufferproxy_priv.h"
+#include "gstvaapisurface.h"
+
+#define DEBUG 1
+#include "gstvaapidebug.h"
+
+/* Define default rate control mode ("constant-qp") */
+#define DEFAULT_RATECONTROL GST_VAAPI_RATECONTROL_CQP
+
+/* Supported set of VA rate controls, within this implementation */
+#define SUPPORTED_RATECONTROLS                  \
+  (GST_VAAPI_RATECONTROL_MASK (CQP))
+
+/* Supported set of tuning options, within this implementation */
+#define SUPPORTED_TUNE_OPTIONS \
+  (GST_VAAPI_ENCODER_TUNE_MASK (NONE))
+
+/* Supported set of VA packed headers, within this implementation */
+#define SUPPORTED_PACKED_HEADERS                \
+  (VA_ENC_PACKED_HEADER_NONE)
+
+#define DEFAULT_LOOP_FILTER_LEVEL 0
+#define DEFAULT_SHARPNESS_LEVEL 0
+#define DEFAULT_YAC_QI 40
+
+/* ------------------------------------------------------------------------- */
+/* --- VP8 Encoder                                                      --- */
+/* ------------------------------------------------------------------------- */
+
+#define GST_VAAPI_ENCODER_VP8_CAST(encoder) \
+    ((GstVaapiEncoderVP8 *)(encoder))
+
+struct _GstVaapiEncoderVP8
+{
+  GstVaapiEncoder parent_instance;
+  GstVaapiProfile profile;
+  guint loop_filter_level;
+  guint sharpness_level;
+  guint yac_qi;
+  guint frame_num;
+  /* reference list */
+  GstVaapiSurfaceProxy *last_ref;
+  GstVaapiSurfaceProxy *golden_ref;
+  GstVaapiSurfaceProxy *alt_ref;
+};
+
+/* Derives the profile that suits best to the configuration */
+static GstVaapiEncoderStatus
+ensure_profile (GstVaapiEncoderVP8 * encoder)
+{
+  /* Always start from "simple" profile for maximum compatibility */
+  encoder->profile = GST_VAAPI_PROFILE_VP8;
+
+  return GST_VAAPI_ENCODER_STATUS_SUCCESS;
+}
+
+/* Derives the profile supported by the underlying hardware */
+static gboolean
+ensure_hw_profile (GstVaapiEncoderVP8 * encoder)
+{
+  GstVaapiDisplay *const display = GST_VAAPI_ENCODER_DISPLAY (encoder);
+  GstVaapiEntrypoint entrypoint = GST_VAAPI_ENTRYPOINT_SLICE_ENCODE;
+  GstVaapiProfile profile, profiles[2];
+  guint i, num_profiles = 0;
+
+  profiles[num_profiles++] = encoder->profile;
+
+  profile = GST_VAAPI_PROFILE_UNKNOWN;
+  for (i = 0; i < num_profiles; i++) {
+    if (gst_vaapi_display_has_encoder (display, profiles[i], entrypoint)) {
+      profile = profiles[i];
+      break;
+    }
+  }
+  if (profile == GST_VAAPI_PROFILE_UNKNOWN)
+    goto error_unsupported_profile;
+
+  GST_VAAPI_ENCODER_CAST (encoder)->profile = profile;
+  return TRUE;
+
+  /* ERRORS */
+error_unsupported_profile:
+  {
+    GST_ERROR ("unsupported HW profile (0x%08x)", encoder->profile);
+    return FALSE;
+  }
+}
+
+static gboolean
+ensure_bitrate (GstVaapiEncoderVP8 * encoder)
+{
+  GstVaapiEncoder *const base_encoder = GST_VAAPI_ENCODER_CAST (encoder);
+
+  /* Default compression: 64 bits per macroblock  */
+  switch (GST_VAAPI_ENCODER_RATE_CONTROL (encoder)) {
+    case GST_VAAPI_RATECONTROL_CBR:
+      if (!base_encoder->bitrate) {
+        base_encoder->bitrate = GST_VAAPI_ENCODER_WIDTH (encoder) *
+            GST_VAAPI_ENCODER_HEIGHT (encoder) *
+            GST_VAAPI_ENCODER_FPS_N (encoder) /
+            GST_VAAPI_ENCODER_FPS_D (encoder) / 4 * 1000;
+      }
+    default:
+      base_encoder->bitrate = 0;
+      break;
+  }
+
+  return TRUE;
+}
+
+static GstVaapiEncoderStatus
+set_context_info (GstVaapiEncoder * base_encoder)
+{
+  GstVaapiEncoderVP8 *encoder = GST_VAAPI_ENCODER_VP8_CAST (base_encoder);
+  GstVideoInfo *const vip = GST_VAAPI_ENCODER_VIDEO_INFO (encoder);
+
+  /* Maximum sizes for common headers (in bytes) */
+  enum
+  {
+    MAX_FRAME_TAG_SIZE = 10,
+    MAX_UPDATE_SEGMENTATION_SIZE = 13,
+    MAX_MB_LF_ADJUSTMENTS_SIZE = 9,
+    MAX_QUANT_INDICES_SIZE = 5,
+    MAX_TOKEN_PROB_UPDATE_SIZE = 1188,
+    MAX_MV_PROBE_UPDATE_SIZE = 38,
+    MAX_REST_OF_FRAME_HDR_SIZE = 15
+  };
+
+  if (!ensure_hw_profile (encoder))
+    return GST_VAAPI_ENCODER_STATUS_ERROR_UNSUPPORTED_PROFILE;
+
+  base_encoder->num_ref_frames = 3;
+
+  /* Only YUV 4:2:0 formats are supported for now. */
+  base_encoder->codedbuf_size = GST_ROUND_UP_16 (vip->width) *
+      GST_ROUND_UP_16 (vip->height) * 3 / 2;
+
+  base_encoder->codedbuf_size +=
+      MAX_FRAME_TAG_SIZE + MAX_UPDATE_SEGMENTATION_SIZE +
+      MAX_MB_LF_ADJUSTMENTS_SIZE + MAX_QUANT_INDICES_SIZE +
+      MAX_TOKEN_PROB_UPDATE_SIZE + MAX_MV_PROBE_UPDATE_SIZE +
+      MAX_REST_OF_FRAME_HDR_SIZE;
+
+  return GST_VAAPI_ENCODER_STATUS_SUCCESS;
+}
+
+static void
+clear_ref (GstVaapiEncoderVP8 * encoder, GstVaapiSurfaceProxy ** ref)
+{
+  if (*ref) {
+    gst_vaapi_encoder_release_surface (GST_VAAPI_ENCODER (encoder), *ref);
+    *ref = NULL;
+  }
+}
+
+static void
+clear_references (GstVaapiEncoderVP8 * encoder)
+{
+  clear_ref (encoder, &encoder->last_ref);
+  clear_ref (encoder, &encoder->golden_ref);
+  clear_ref (encoder, &encoder->alt_ref);
+}
+
+static void
+push_reference (GstVaapiEncoderVP8 * encoder, GstVaapiSurfaceProxy * ref)
+{
+  if (encoder->last_ref == NULL) {
+    encoder->golden_ref = gst_vaapi_surface_proxy_ref (ref);
+    encoder->alt_ref = gst_vaapi_surface_proxy_ref (ref);
+  } else {
+    clear_ref (encoder, &encoder->alt_ref);
+    encoder->alt_ref = encoder->golden_ref;
+    encoder->golden_ref = encoder->last_ref;
+  }
+  encoder->last_ref = ref;
+}
+
+static gboolean
+fill_sequence (GstVaapiEncoderVP8 * encoder, GstVaapiEncSequence * sequence)
+{
+  GstVaapiEncoder *const base_encoder = GST_VAAPI_ENCODER_CAST (encoder);
+  VAEncSequenceParameterBufferVP8 *const seq_param = sequence->param;
+
+  memset (seq_param, 0, sizeof (VAEncSequenceParameterBufferVP8));
+
+  seq_param->frame_width = GST_VAAPI_ENCODER_WIDTH (encoder);
+  seq_param->frame_height = GST_VAAPI_ENCODER_HEIGHT (encoder);
+
+  if (GST_VAAPI_ENCODER_RATE_CONTROL (encoder) & GST_VAAPI_RATECONTROL_CBR)
+    seq_param->bits_per_second = base_encoder->bitrate;
+
+  seq_param->intra_period = base_encoder->keyframe_period;
+
+  return TRUE;
+}
+
+static gboolean
+ensure_sequence (GstVaapiEncoderVP8 * encoder, GstVaapiEncPicture * picture)
+{
+  GstVaapiEncSequence *sequence;
+
+  g_assert (picture);
+
+  if (picture->type != GST_VAAPI_PICTURE_TYPE_I)
+    return TRUE;
+
+  sequence = GST_VAAPI_ENC_SEQUENCE_NEW (VP8, encoder);
+  if (!sequence)
+    goto error;
+
+  if (!fill_sequence (encoder, sequence))
+    goto error;
+
+  gst_vaapi_enc_picture_set_sequence (picture, sequence);
+  gst_vaapi_codec_object_replace (&sequence, NULL);
+  return TRUE;
+
+error:
+  gst_vaapi_codec_object_replace (&sequence, NULL);
+  return FALSE;
+}
+
+static gboolean
+fill_picture (GstVaapiEncoderVP8 * encoder,
+    GstVaapiEncPicture * picture,
+    GstVaapiCodedBuffer * codedbuf, GstVaapiSurfaceProxy * surface)
+{
+  VAEncPictureParameterBufferVP8 *const pic_param = picture->param;
+  int i;
+
+  memset (pic_param, 0, sizeof (VAEncPictureParameterBufferVP8));
+
+  pic_param->reconstructed_frame = GST_VAAPI_SURFACE_PROXY_SURFACE_ID (surface);
+  pic_param->coded_buf = GST_VAAPI_OBJECT_ID (codedbuf);
+
+  if (picture->type == GST_VAAPI_PICTURE_TYPE_P) {
+    pic_param->pic_flags.bits.frame_type = 1;
+    pic_param->ref_arf_frame =
+        GST_VAAPI_SURFACE_PROXY_SURFACE_ID (encoder->alt_ref);
+    pic_param->ref_gf_frame =
+        GST_VAAPI_SURFACE_PROXY_SURFACE_ID (encoder->golden_ref);
+    pic_param->ref_last_frame =
+        GST_VAAPI_SURFACE_PROXY_SURFACE_ID (encoder->last_ref);
+    pic_param->pic_flags.bits.refresh_last = 1;
+    pic_param->pic_flags.bits.refresh_golden_frame = 0;
+    pic_param->pic_flags.bits.copy_buffer_to_golden = 1;
+    pic_param->pic_flags.bits.refresh_alternate_frame = 0;
+    pic_param->pic_flags.bits.copy_buffer_to_alternate = 2;
+  } else {
+    pic_param->ref_last_frame = VA_INVALID_SURFACE;
+    pic_param->ref_gf_frame = VA_INVALID_SURFACE;
+    pic_param->ref_arf_frame = VA_INVALID_SURFACE;
+    pic_param->pic_flags.bits.refresh_last = 1;
+    pic_param->pic_flags.bits.refresh_golden_frame = 1;
+    pic_param->pic_flags.bits.refresh_alternate_frame = 1;
+  }
+
+  pic_param->pic_flags.bits.show_frame = 1;
+
+  if (encoder->loop_filter_level) {
+    pic_param->pic_flags.bits.version = 1;
+    pic_param->pic_flags.bits.loop_filter_type = 1;     /* Enable simple loop filter */
+    /* Disabled segmentation, so what matters is only loop_filter_level[0] */
+    for (i = 0; i < 4; i++)
+      pic_param->loop_filter_level[i] = encoder->loop_filter_level;
+  }
+
+  pic_param->sharpness_level = encoder->sharpness_level;
+
+  return TRUE;
+}
+
+static gboolean
+ensure_picture (GstVaapiEncoderVP8 * encoder, GstVaapiEncPicture * picture,
+    GstVaapiCodedBufferProxy * codedbuf_proxy, GstVaapiSurfaceProxy * surface)
+{
+  GstVaapiCodedBuffer *const codedbuf =
+      GST_VAAPI_CODED_BUFFER_PROXY_BUFFER (codedbuf_proxy);
+
+  if (!fill_picture (encoder, picture, codedbuf, surface))
+    return FALSE;
+
+  return TRUE;
+}
+
+static gboolean
+fill_quantization_table (GstVaapiEncoderVP8 * encoder,
+    GstVaapiEncPicture * picture, GstVaapiEncQMatrix * q_matrix)
+{
+  VAQMatrixBufferVP8 *const qmatrix_param = q_matrix->param;
+  int i;
+
+  memset (qmatrix_param, 0, sizeof (VAQMatrixBufferVP8));
+
+  /* DefaultYacQantVal = 8 for I frame, which is ac_qlookup[4] and
+   * DefaultYacQantVAl = 44 for P frame, which is ac_qllookup[40] */
+  for (i = 0; i < 4; i++) {
+    if (encoder->yac_qi == DEFAULT_YAC_QI) {
+      if (picture->type == GST_VAAPI_PICTURE_TYPE_I)
+        qmatrix_param->quantization_index[i] = 4;
+      else
+        qmatrix_param->quantization_index[i] = 40;
+    } else
+      qmatrix_param->quantization_index[i] = encoder->yac_qi;
+  }
+
+  return TRUE;
+}
+
+static gboolean
+ensure_quantization_table (GstVaapiEncoderVP8 * encoder,
+    GstVaapiEncPicture * picture)
+{
+  g_assert (picture);
+
+  picture->q_matrix = GST_VAAPI_ENC_Q_MATRIX_NEW (VP8, encoder);
+  if (!picture->q_matrix) {
+    GST_ERROR ("failed to allocate quantiser table");
+    return GST_VAAPI_DECODER_STATUS_ERROR_ALLOCATION_FAILED;
+  }
+
+  if (!fill_quantization_table (encoder, picture, picture->q_matrix))
+    return FALSE;
+
+  return TRUE;
+}
+
+static GstVaapiEncoderStatus
+gst_vaapi_encoder_vp8_encode (GstVaapiEncoder * base_encoder,
+    GstVaapiEncPicture * picture, GstVaapiCodedBufferProxy * codedbuf)
+{
+  GstVaapiEncoderVP8 *const encoder = GST_VAAPI_ENCODER_VP8_CAST (base_encoder);
+  GstVaapiEncoderStatus ret = GST_VAAPI_ENCODER_STATUS_ERROR_UNKNOWN;
+  GstVaapiSurfaceProxy *reconstruct = NULL;
+
+  reconstruct = gst_vaapi_encoder_create_surface (base_encoder);
+
+  g_assert (GST_VAAPI_SURFACE_PROXY_SURFACE (reconstruct));
+
+  if (!ensure_sequence (encoder, picture))
+    goto error;
+  if (!ensure_picture (encoder, picture, codedbuf, reconstruct))
+    goto error;
+  if (!ensure_quantization_table (encoder, picture))
+    goto error;
+  if (!gst_vaapi_enc_picture_encode (picture))
+    goto error;
+  if (reconstruct) {
+    if (picture->type == GST_VAAPI_PICTURE_TYPE_I)
+      clear_references (encoder);
+    push_reference (encoder, reconstruct);
+  }
+
+  return GST_VAAPI_ENCODER_STATUS_SUCCESS;
+error:
+  if (reconstruct)
+    gst_vaapi_encoder_release_surface (GST_VAAPI_ENCODER (encoder),
+        reconstruct);
+  return ret;
+}
+
+static GstVaapiEncoderStatus
+gst_vaapi_encoder_vp8_flush (GstVaapiEncoder * base_encoder)
+{
+  return GST_VAAPI_ENCODER_STATUS_SUCCESS;
+}
+
+static GstVaapiEncoderStatus
+gst_vaapi_encoder_vp8_reordering (GstVaapiEncoder * base_encoder,
+    GstVideoCodecFrame * frame, GstVaapiEncPicture ** output)
+{
+  GstVaapiEncoderVP8 *const encoder = GST_VAAPI_ENCODER_VP8_CAST (base_encoder);
+  GstVaapiEncPicture *picture = NULL;
+  GstVaapiEncoderStatus status = GST_VAAPI_ENCODER_STATUS_SUCCESS;
+
+  if (!frame)
+    return GST_VAAPI_ENCODER_STATUS_NO_SURFACE;
+
+  picture = GST_VAAPI_ENC_PICTURE_NEW (VP8, encoder, frame);
+  if (!picture) {
+    GST_WARNING ("create VP8 picture failed, frame timestamp:%"
+        GST_TIME_FORMAT, GST_TIME_ARGS (frame->pts));
+    return GST_VAAPI_ENCODER_STATUS_ERROR_ALLOCATION_FAILED;
+  }
+
+  if (encoder->frame_num >= base_encoder->keyframe_period) {
+    encoder->frame_num = 0;
+    clear_references (encoder);
+  }
+  if (encoder->frame_num == 0) {
+    picture->type = GST_VAAPI_PICTURE_TYPE_I;
+    GST_VIDEO_CODEC_FRAME_SET_SYNC_POINT (frame);
+  } else {
+    picture->type = GST_VAAPI_PICTURE_TYPE_P;
+  }
+
+  encoder->frame_num++;
+  *output = picture;
+  return status;
+}
+
+static GstVaapiEncoderStatus
+gst_vaapi_encoder_vp8_reconfigure (GstVaapiEncoder * base_encoder)
+{
+  GstVaapiEncoderVP8 *const encoder = GST_VAAPI_ENCODER_VP8_CAST (base_encoder);
+  GstVaapiEncoderStatus status;
+
+  status = ensure_profile (encoder);
+  if (status != GST_VAAPI_ENCODER_STATUS_SUCCESS)
+    return status;
+
+  if (!ensure_bitrate (encoder))
+    goto error;
+
+  return set_context_info (base_encoder);
+
+error:
+  return GST_VAAPI_ENCODER_STATUS_ERROR_OPERATION_FAILED;
+}
+
+static gboolean
+gst_vaapi_encoder_vp8_init (GstVaapiEncoder * base_encoder)
+{
+  GstVaapiEncoderVP8 *const encoder = GST_VAAPI_ENCODER_VP8_CAST (base_encoder);
+
+  encoder->frame_num = 0;
+  encoder->last_ref = NULL;
+  encoder->golden_ref = NULL;
+  encoder->alt_ref = NULL;
+
+  return TRUE;
+}
+
+static void
+gst_vaapi_encoder_vp8_finalize (GstVaapiEncoder * base_encoder)
+{
+  GstVaapiEncoderVP8 *const encoder = GST_VAAPI_ENCODER_VP8_CAST (base_encoder);
+  clear_references (encoder);
+}
+
+static GstVaapiEncoderStatus
+gst_vaapi_encoder_vp8_set_property (GstVaapiEncoder * base_encoder,
+    gint prop_id, const GValue * value)
+{
+  GstVaapiEncoderVP8 *const encoder = GST_VAAPI_ENCODER_VP8_CAST (base_encoder);
+
+  switch (prop_id) {
+    case GST_VAAPI_ENCODER_VP8_PROP_LOOP_FILTER_LEVEL:
+      encoder->loop_filter_level = g_value_get_uint (value);
+      break;
+    case GST_VAAPI_ENCODER_VP8_PROP_SHARPNESS_LEVEL:
+      encoder->sharpness_level = g_value_get_uint (value);
+      break;
+    case GST_VAAPI_ENCODER_VP8_PROP_YAC_Q_INDEX:
+      encoder->yac_qi = g_value_get_uint (value);
+      break;
+    default:
+      return GST_VAAPI_ENCODER_STATUS_ERROR_INVALID_PARAMETER;
+  }
+  return GST_VAAPI_ENCODER_STATUS_SUCCESS;
+}
+
+GST_VAAPI_ENCODER_DEFINE_CLASS_DATA (VP8);
+
+static inline const GstVaapiEncoderClass *
+gst_vaapi_encoder_vp8_class (void)
+{
+  static const GstVaapiEncoderClass GstVaapiEncoderVP8Class = {
+    GST_VAAPI_ENCODER_CLASS_INIT (VP8, vp8),
+    .set_property = gst_vaapi_encoder_vp8_set_property,
+  };
+  return &GstVaapiEncoderVP8Class;
+}
+
+/**
+ * gst_vaapi_encoder_vp8_new:
+ * @display: a #GstVaapiDisplay
+ *
+ * Creates a new #GstVaapiEncoder for VP8 encoding.
+ *
+ * Return value: the newly allocated #GstVaapiEncoder object
+ */
+GstVaapiEncoder *
+gst_vaapi_encoder_vp8_new (GstVaapiDisplay * display)
+{
+  return gst_vaapi_encoder_new (gst_vaapi_encoder_vp8_class (), display);
+}
+
+/**
+ * gst_vaapi_encoder_vp8_get_default_properties:
+ *
+ * Determines the set of common and vp8 specific encoder properties.
+ * The caller owns an extra reference to the resulting array of
+ * #GstVaapiEncoderPropInfo elements, so it shall be released with
+ * g_ptr_array_unref() after usage.
+ *
+ * Return value: the set of encoder properties for #GstVaapiEncoderVP8,
+ *   or %NULL if an error occurred.
+ */
+GPtrArray *
+gst_vaapi_encoder_vp8_get_default_properties (void)
+{
+  const GstVaapiEncoderClass *const klass = gst_vaapi_encoder_vp8_class ();
+  GPtrArray *props;
+
+  props = gst_vaapi_encoder_properties_get_default (klass);
+  if (!props)
+    return NULL;
+
+  GST_VAAPI_ENCODER_PROPERTIES_APPEND (props,
+      GST_VAAPI_ENCODER_VP8_PROP_LOOP_FILTER_LEVEL,
+      g_param_spec_uint ("loop-filter-level",
+          "Loop Filter Level",
+          "Controls the deblocking filter strength",
+          0, 63, DEFAULT_LOOP_FILTER_LEVEL,
+          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+  GST_VAAPI_ENCODER_PROPERTIES_APPEND (props,
+      GST_VAAPI_ENCODER_VP8_PROP_SHARPNESS_LEVEL,
+      g_param_spec_uint ("sharpness-level",
+          "Sharpness Level",
+          "Controls the deblocking filter sensitivity",
+          0, 7, DEFAULT_SHARPNESS_LEVEL,
+          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+  GST_VAAPI_ENCODER_PROPERTIES_APPEND (props,
+      GST_VAAPI_ENCODER_VP8_PROP_YAC_Q_INDEX,
+      g_param_spec_uint ("yac-qi",
+          "Luma AC Quant Table index",
+          "Quantization Table index for Luma AC Coefficients, (in default case, yac_qi=4 for key frames and yac_qi=40 for P frames)",
+          0, 127, DEFAULT_YAC_QI, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+  return props;
+}
diff -Nru gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapiencoder_vp8.h gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapiencoder_vp8.h
--- gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapiencoder_vp8.h	1970-01-01 00:00:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapiencoder_vp8.h	2015-07-15 12:47:43.000000000 +0000
@@ -0,0 +1,56 @@
+/*
+ *  gstvaapiencoder_vp8.h VP8G encoder
+ *
+ *  Copyright (C) 2015 Intel Corporation
+ *    Author: Sreerenj Balachandran <sreerenj.balachandran@intel.com>
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public License
+ *  as published by the Free Software Foundation; either version 2.1
+ *  of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free
+ *  Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ *  Boston, MA 02110-1301 USA
+ */
+
+#ifndef GST_VAAPI_ENCODER_VP8_H
+#define GST_VAAPI_ENCODER_VP8_H
+
+#include <gst/vaapi/gstvaapiencoder.h>
+
+G_BEGIN_DECLS
+
+#define GST_VAAPI_ENCODER_VP8(encoder) \
+  ((GstVaapiEncoderVP8 *) (encoder))
+
+typedef struct _GstVaapiEncoderVP8 GstVaapiEncoderVP8;
+
+/**
+ * GstVaapiEncoderVP8Prop:
+ * @GST_VAAPI_ENCODER_VP8_PROP_LOOP_FILTER_LEVEL: Loop Filter Level(uint).
+ * @GST_VAAPI_ENCODER_VP8_PROP_LOOP_SHARPNESS_LEVEL: Sharpness Level(uint).
+ * @GST_VAAPI_ENCODER_VP8_PROP_YAC_Q_INDEX: Quantization table index for luma AC(uint).
+ *
+ * The set of VP8 encoder specific configurable properties.
+ */
+typedef enum {
+  GST_VAAPI_ENCODER_VP8_PROP_LOOP_FILTER_LEVEL = -1,
+  GST_VAAPI_ENCODER_VP8_PROP_SHARPNESS_LEVEL = -2,
+  GST_VAAPI_ENCODER_VP8_PROP_YAC_Q_INDEX = -3
+} GstVaapiEncoderVP8Prop;
+
+GstVaapiEncoder *
+gst_vaapi_encoder_vp8_new (GstVaapiDisplay * display);
+
+GPtrArray *
+gst_vaapi_encoder_vp8_get_default_properties (void);
+
+G_END_DECLS
+#endif /*GST_VAAPI_ENCODER_VP8_H */
diff -Nru gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapifilter.c gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapifilter.c
--- gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapifilter.c	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapifilter.c	2015-07-15 12:47:43.000000000 +0000
@@ -278,6 +278,7 @@
   PROP_CONTRAST = GST_VAAPI_FILTER_OP_CONTRAST,
   PROP_DEINTERLACING = GST_VAAPI_FILTER_OP_DEINTERLACING,
   PROP_SCALING = GST_VAAPI_FILTER_OP_SCALING,
+  PROP_SKINTONE = GST_VAAPI_FILTER_OP_SKINTONE,
 
   N_PROPERTIES
 };
@@ -399,6 +400,18 @@
       "Scaling method to use",
       GST_VAAPI_TYPE_SCALE_METHOD,
       DEFAULT_SCALING, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+
+#if VA_CHECK_VERSION(0,36,0)
+  /**
+   * GstVaapiFilter:skin-tone-enhancement:
+   *
+   * Apply the skin tone enhancement algorithm.
+   */
+  g_properties[PROP_SKINTONE] = g_param_spec_boolean ("skin-tone-enhancement",
+      "Skin tone enhancement",
+      "Apply the skin tone enhancement algorithm",
+      FALSE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+#endif
 }
 
 static void
@@ -447,6 +460,12 @@
       op_data->va_cap_size = sizeof (VAProcFilterCap);
       op_data->va_buffer_size = sizeof (VAProcFilterParameterBuffer);
       break;
+#if VA_CHECK_VERSION(0,36,0)
+    case GST_VAAPI_FILTER_OP_SKINTONE:
+      op_data->va_type = VAProcFilterSkinToneEnhancement;
+      op_data->va_buffer_size = sizeof (VAProcFilterParameterBuffer);
+      break;
+#endif
     case GST_VAAPI_FILTER_OP_HUE:
       op_data->va_subtype = VAProcColorBalanceHue;
       goto op_colorbalance;
@@ -628,6 +647,11 @@
       if (op_data->va_type != va_type)
         continue;
 
+      if (op_data->va_cap_size == 0) { /* no caps, like skintone */
+        g_ptr_array_add (ops, op_data_ref (op_data));
+        continue;
+      }
+
       if (!filter_caps) {
         filter_caps = vpp_get_filter_caps (filter, va_type,
             op_data->va_cap_size, &num_filter_caps);
@@ -878,6 +902,46 @@
   return success;
 }
 
+/* Update skin tone enhancement */
+#if USE_VA_VPP
+gboolean
+op_set_skintone_unlocked (GstVaapiFilter * filter,
+   GstVaapiFilterOpData * op_data, gboolean value)
+{
+  VAProcFilterParameterBuffer *buf;
+
+  if (!op_data || !op_ensure_buffer (filter, op_data))
+    return FALSE;
+
+  op_data->is_enabled = value;
+  if (!op_data->is_enabled)
+    return TRUE;
+
+  buf = vaapi_map_buffer (filter->va_display, op_data->va_buffer);
+  if (!buf)
+    return FALSE;
+  buf->type = op_data->va_type;
+  buf->value = 0;
+  vaapi_unmap_buffer (filter->va_display, op_data->va_buffer, NULL);
+  return TRUE;
+}
+#endif
+
+static inline gboolean
+op_set_skintone (GstVaapiFilter * filter, GstVaapiFilterOpData * op_data,
+   gboolean enhance)
+{
+  gboolean success = FALSE;
+
+#if USE_VA_VPP
+  GST_VAAPI_DISPLAY_LOCK (filter->display);
+  success = op_set_skintone_unlocked (filter, op_data, enhance);
+  GST_VAAPI_DISPLAY_UNLOCK (filter->display);
+#endif
+  return success;
+}
+
+
 static gboolean
 deint_refs_set (GArray * refs, GstVaapiSurface ** surfaces, guint num_surfaces)
 {
@@ -1300,6 +1364,10 @@
     case GST_VAAPI_FILTER_OP_SCALING:
       return gst_vaapi_filter_set_scaling (filter, value ?
           g_value_get_enum (value) : DEFAULT_SCALING);
+    case GST_VAAPI_FILTER_OP_SKINTONE:
+      return op_set_skintone (filter, op_data,
+          (value ? g_value_get_boolean (value) :
+              G_PARAM_SPEC_BOOLEAN (op_data->pspec)->default_value));
     default:
       break;
   }
@@ -1789,3 +1857,23 @@
   filter->scale_method = method;
   return TRUE;
 }
+
+/**
+ * gst_vaapi_filter_set_skintone:
+ * @filter: a #GstVaapiFilter
+ * @enhance: %TRUE if enable the skin tone enhancement algorithm
+ *
+ * Applies the skin tone enhancement algorithm.
+ *
+ * Return value: %TRUE if the operation is supported, %FALSE
+ * otherwise.
+  **/
+gboolean
+gst_vaapi_filter_set_skintone (GstVaapiFilter * filter,
+    gboolean enhance)
+{
+  g_return_val_if_fail (filter != NULL, FALSE);
+
+  return op_set_skintone (filter,
+      find_operation (filter, GST_VAAPI_FILTER_OP_SKINTONE), enhance);
+}
diff -Nru gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapifilter.h gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapifilter.h
--- gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapifilter.h	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapifilter.h	2015-07-15 12:47:43.000000000 +0000
@@ -41,6 +41,7 @@
  * @GST_VAAPI_FILTER_OP_BRIGHTNESS: Change brightness (float).
  * @GST_VAAPI_FILTER_OP_CONTRAST: Change contrast (float).
  * @GST_VAAPI_FILTER_OP_SCALING: Change scaling method (#GstVaapiScaleMethod).
+ * @GST_VAAPI_FILTER_OP_SKINTONE: Skin tone enhancement (bool).
  *
  * The set of operations that could be applied to the filter.
  */
@@ -55,6 +56,7 @@
   GST_VAAPI_FILTER_OP_CONTRAST,
   GST_VAAPI_FILTER_OP_DEINTERLACING,
   GST_VAAPI_FILTER_OP_SCALING,
+  GST_VAAPI_FILTER_OP_SKINTONE,
 } GstVaapiFilterOp;
 
 /**
@@ -240,4 +242,8 @@
 gst_vaapi_filter_set_scaling (GstVaapiFilter * filter,
     GstVaapiScaleMethod method);
 
+gboolean
+gst_vaapi_filter_set_skintone (GstVaapiFilter * filter,
+    gboolean enhance);
+
 #endif /* GST_VAAPI_FILTER_H */
diff -Nru gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapiimage.c gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapiimage.c
--- gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapiimage.c	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapiimage.c	2015-07-15 12:47:43.000000000 +0000
@@ -698,7 +698,6 @@
     return image->image.data_size;
 }
 
-#if GST_CHECK_VERSION(1,0,0)
 #include <gst/video/gstvideometa.h>
 
 static gboolean
@@ -715,52 +714,6 @@
 
     return vmeta ? init_image_from_video_meta(raw_image, vmeta) : FALSE;
 }
-#else
-static gboolean
-init_image_from_buffer(GstVaapiImageRaw *raw_image, GstBuffer *buffer)
-{
-    GstCaps *caps;
-    guchar *data;
-    guint32 data_size;
-    GstVideoInfo vi;
-    guint i, frame_size;
-
-    data      = GST_BUFFER_DATA(buffer);
-    data_size = GST_BUFFER_SIZE(buffer);
-    caps      = GST_BUFFER_CAPS(buffer);
-
-    if (!caps)
-        return FALSE;
-
-    if (!gst_video_info_from_caps(&vi, caps))
-        goto error_unsupported_caps;
-
-    /* Check for compatible data size */
-    frame_size = GST_VIDEO_INFO_SIZE(&vi);
-    if (frame_size != data_size)
-        goto error_incompatible_size;
-
-    raw_image->format = GST_VIDEO_INFO_FORMAT(&vi);
-    raw_image->width  = GST_VIDEO_INFO_WIDTH(&vi);
-    raw_image->height = GST_VIDEO_INFO_HEIGHT(&vi);
-
-    raw_image->num_planes = GST_VIDEO_INFO_N_PLANES(&vi);
-    for (i = 0; i < raw_image->num_planes; i++) {
-        raw_image->pixels[i] = data + GST_VIDEO_INFO_PLANE_OFFSET(&vi, i);
-        raw_image->stride[i] = GST_VIDEO_INFO_PLANE_STRIDE(&vi, i);
-    }
-    return TRUE;
-
-    /* ERRORS */
-error_unsupported_caps:
-    GST_ERROR("unsupported caps %" GST_PTR_FORMAT, caps);
-    return FALSE;
-error_incompatible_size:
-    GST_ERROR("incompatible frame size (%u) with buffer size (%u)",
-              frame_size, data_size);
-    return FALSE;
-}
-#endif
 
 /* Copy N lines of an image */
 static inline void
diff -Nru gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapiprofile.c gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapiprofile.c
--- gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapiprofile.c	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapiprofile.c	2015-07-15 12:47:43.000000000 +0000
@@ -66,6 +66,7 @@
     { GST_VAAPI_CODEC_VC1,      "vc1"   },
     { GST_VAAPI_CODEC_JPEG,     "jpeg"  },
     { GST_VAAPI_CODEC_VP8,      "vp8"   },
+    { GST_VAAPI_CODEC_H265,     "h265"  },
     { 0, }
 };
 
@@ -120,6 +121,7 @@
       "video/x-h264", "stereo-high"
     },
 #endif
+#if GST_CHECK_VERSION(1,5,0)
     { GST_VAAPI_PROFILE_VC1_SIMPLE, VAProfileVC1Simple,
       "video/x-wmv, wmvversion=3", "simple"
     },
@@ -127,8 +129,19 @@
       "video/x-wmv, wmvversion=3", "main"
     },
     { GST_VAAPI_PROFILE_VC1_ADVANCED, VAProfileVC1Advanced,
-      "video/x-wmv, wmvversion=3, " GST_MAKE_FORMAT_STRING(WVC1), "advanced"
+      "video/x-wmv, wmvversion=3, format=(string)WVC1", "advanced"
     },
+#else
+    { GST_VAAPI_PROFILE_VC1_SIMPLE, VAProfileVC1Simple,
+      "video/x-wmv, wmvversion=3", NULL
+    },
+    { GST_VAAPI_PROFILE_VC1_MAIN, VAProfileVC1Main,
+      "video/x-wmv, wmvversion=3", NULL
+    },
+    { GST_VAAPI_PROFILE_VC1_ADVANCED, VAProfileVC1Advanced,
+      "video/x-wmv, wmvversion=3, format=(string)WVC1", NULL
+    },
+#endif
 #if VA_CHECK_VERSION(0,32,0)
     { GST_VAAPI_PROFILE_JPEG_BASELINE, VAProfileJPEGBaseline,
       "image/jpeg", NULL
@@ -139,16 +152,25 @@
       "video/x-vp8", NULL
     },
 #endif
+#if VA_CHECK_VERSION(0,37,0)
+    { GST_VAAPI_PROFILE_H265_MAIN, VAProfileHEVCMain,
+      "video/x-h265", "main"
+    },
+    { GST_VAAPI_PROFILE_H265_MAIN10, VAProfileHEVCMain10,
+      "video/x-h265", "main10"
+    },
+#endif
     { 0, }
 };
 
 /* Entry-points */
 static const GstVaapiEntrypointMap gst_vaapi_entrypoints[] = {
-    { GST_VAAPI_ENTRYPOINT_VLD,          VAEntrypointVLD        },
-    { GST_VAAPI_ENTRYPOINT_IDCT,         VAEntrypointIDCT       },
-    { GST_VAAPI_ENTRYPOINT_MOCO,         VAEntrypointMoComp     },
+    { GST_VAAPI_ENTRYPOINT_VLD,            VAEntrypointVLD          },
+    { GST_VAAPI_ENTRYPOINT_IDCT,           VAEntrypointIDCT         },
+    { GST_VAAPI_ENTRYPOINT_MOCO,           VAEntrypointMoComp       },
 #if VA_CHECK_VERSION(0,30,0)
-    { GST_VAAPI_ENTRYPOINT_SLICE_ENCODE, VAEntrypointEncSlice   },
+    { GST_VAAPI_ENTRYPOINT_SLICE_ENCODE,   VAEntrypointEncSlice     },
+    { GST_VAAPI_ENTRYPOINT_PICTURE_ENCODE, VAEntrypointEncPicture   },
 #endif
     { 0, }
 };
@@ -292,6 +314,29 @@
 }
 
 static GstVaapiProfile
+gst_vaapi_profile_from_codec_data_h265(GstBuffer *buffer)
+{
+   /* ISO/IEC 14496-15:  HEVC file format */
+    guchar buf[3];
+
+    if (gst_buffer_extract(buffer, 0, buf, sizeof(buf)) != sizeof(buf))
+        return 0;
+
+    if (buf[0] != 1)    /* configurationVersion = 1 */
+        return 0;
+
+    if (buf[1] & 0xc0)  /* general_profile_space = 0 */
+        return 0;
+
+    switch (buf[1] & 0x1f) {   /* HEVCProfileIndication */
+    case 1:   return GST_VAAPI_PROFILE_H265_MAIN;
+    case 2:   return GST_VAAPI_PROFILE_H265_MAIN10;
+    case 3:   return GST_VAAPI_PROFILE_H265_MAIN_STILL_PICTURE;
+    }
+    return 0;
+}
+
+static GstVaapiProfile
 gst_vaapi_profile_from_codec_data(GstVaapiCodec codec, GstBuffer *buffer)
 {
     GstVaapiProfile profile;
@@ -303,6 +348,9 @@
     case GST_VAAPI_CODEC_H264:
         profile = gst_vaapi_profile_from_codec_data_h264(buffer);
         break;
+    case GST_VAAPI_CODEC_H265:
+        profile = gst_vaapi_profile_from_codec_data_h265(buffer);
+        break;
     default:
         profile = 0;
         break;
diff -Nru gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapiprofile.h gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapiprofile.h
--- gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapiprofile.h	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapiprofile.h	2015-07-15 12:47:43.000000000 +0000
@@ -39,6 +39,7 @@
  * @GST_VAAPI_CODEC_WMV3: Windows Media Video 9. VC-1 Simple or Main profile (SMPTE 421M)
  * @GST_VAAPI_CODEC_VC1: VC-1 Advanced profile (SMPTE 421M)
  * @GST_VAAPI_CODEC_JPEG: JPEG (ITU-T 81)
+ * @GST_VAAPI_CODEC_H265: H.265 aka MPEG-H Part 2 (ITU-T H.265)
  *
  * The set of all codecs for #GstVaapiCodec.
  */
@@ -52,6 +53,7 @@
     GST_VAAPI_CODEC_VC1         = GST_MAKE_FOURCC('V','C','1',0),
     GST_VAAPI_CODEC_JPEG        = GST_MAKE_FOURCC('J','P','G',0),
     GST_VAAPI_CODEC_VP8         = GST_MAKE_FOURCC('V','P','8',0),
+    GST_VAAPI_CODEC_H265        = GST_MAKE_FOURCC('2','6','5',0),
 } GstVaapiCodec;
 
 /**
@@ -121,6 +123,12 @@
  *   VC-1 advanced profile
  * @GST_VAAPI_PROFILE_JPEG_BASELINE:
  *   JPEG baseline profile
+ * @GST_VAAPI_PROFILE_H265_MAIN:
+ *   H.265 main profile [A.3.2]
+ * @GST_VAAPI_PROFILE_H265_MAIN10:
+ *   H.265 main 10 profile [A.3.3]
+ * @GST_VAAPI_PROFILE_H265_MAIN_STILL_PICTURE:
+ *   H.265 main still picture profile [A.3.4]
  *
  * The set of all profiles for #GstVaapiProfile.
  */
@@ -153,6 +161,10 @@
     GST_VAAPI_PROFILE_VC1_ADVANCED          = GST_VAAPI_MAKE_PROFILE(VC1,3),
     GST_VAAPI_PROFILE_JPEG_BASELINE         = GST_VAAPI_MAKE_PROFILE(JPEG,1),
     GST_VAAPI_PROFILE_VP8                   = GST_VAAPI_MAKE_PROFILE(VP8,1),
+    GST_VAAPI_PROFILE_H265_MAIN             = GST_VAAPI_MAKE_PROFILE(H265,1),
+    GST_VAAPI_PROFILE_H265_MAIN10           = GST_VAAPI_MAKE_PROFILE(H265,2),
+    GST_VAAPI_PROFILE_H265_MAIN_STILL_PICTURE =
+                                               GST_VAAPI_MAKE_PROFILE(H265,3),
 } GstVaapiProfile;
 
 /**
@@ -161,6 +173,7 @@
  * @GST_VAAPI_ENTRYPOINT_IDCT: Inverse Decrete Cosine Transform
  * @GST_VAAPI_ENTRYPOINT_MOCO: Motion Compensation
  * @GST_VAAPI_ENTRYPOINT_SLICE_ENCODE: Encode Slice
+ * @GST_VAAPI_ENTRYPOINT_PICTURE_ENCODE: Encode Picture
  *
  * The set of all entrypoints for #GstVaapiEntrypoint
  */
@@ -168,7 +181,8 @@
     GST_VAAPI_ENTRYPOINT_VLD = 1,
     GST_VAAPI_ENTRYPOINT_IDCT,
     GST_VAAPI_ENTRYPOINT_MOCO,
-    GST_VAAPI_ENTRYPOINT_SLICE_ENCODE
+    GST_VAAPI_ENTRYPOINT_SLICE_ENCODE,
+    GST_VAAPI_ENTRYPOINT_PICTURE_ENCODE
 } GstVaapiEntrypoint;
 
 const gchar *
diff -Nru gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapisubpicture.c gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapisubpicture.c
--- gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapisubpicture.c	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapisubpicture.c	2015-07-15 12:47:43.000000000 +0000
@@ -191,10 +191,8 @@
     gfloat global_alpha;
     guint width, height, stride;
     guint hw_flags, flags;
-#if GST_CHECK_VERSION(1,0,0)
     GstVideoMeta *vmeta;
     GstMapInfo map_info;
-#endif
 
     g_return_val_if_fail(GST_IS_VIDEO_OVERLAY_RECTANGLE(rect), NULL);
 
@@ -206,11 +204,10 @@
 #endif
     if (!gst_vaapi_display_has_subpicture_format(display, format, &hw_flags))
         return NULL;
-    
+
     flags = hw_flags & from_GstVideoOverlayFormatFlags(
         gst_video_overlay_rectangle_get_flags(rect));
 
-#if GST_CHECK_VERSION(1,0,0)
     buffer = gst_video_overlay_rectangle_get_pixels_unscaled_argb(rect,
         to_GstVideoOverlayFormatFlags(flags));
     if (!buffer)
@@ -225,13 +222,6 @@
     if (!gst_video_meta_map(vmeta, 0, &map_info, (gpointer *)&data,
             (gint *)&stride, GST_MAP_READ))
         return NULL;
-#else
-    buffer = (gst_video_overlay_rectangle_get_pixels_unscaled_argb)(rect,
-        &width, &height, &stride, to_GstVideoOverlayFormatFlags(flags));
-    if (!buffer)
-        return NULL;
-    data = GST_BUFFER_DATA(buffer);
-#endif
 
     image = gst_vaapi_image_new(display, format, width, height);
     if (!image)
@@ -251,9 +241,7 @@
 
     subpicture = gst_vaapi_subpicture_new(image, flags);
     gst_vaapi_object_unref(image);
-#if GST_CHECK_VERSION(1,0,0)
     gst_video_meta_unmap(vmeta, 0, &map_info);
-#endif
     if (!subpicture)
         return NULL;
 
diff -Nru gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapisurface.c gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapisurface.c
--- gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapisurface.c	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapisurface.c	2015-07-15 12:47:43.000000000 +0000
@@ -225,7 +225,7 @@
 gst_vaapi_surface_create_from_buffer_proxy (GstVaapiSurface * surface,
     GstVaapiBufferProxy * proxy, const GstVideoInfo * vip)
 {
-#if VA_CHECK_VERSION (0,34,0)
+#if VA_CHECK_VERSION (0,36,0)
   GstVaapiDisplay *const display = GST_VAAPI_OBJECT_DISPLAY (surface);
   GstVideoFormat format;
   VASurfaceID surface_id;
diff -Nru gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapisurface_egl.c gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapisurface_egl.c
--- gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapisurface_egl.c	1970-01-01 00:00:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapisurface_egl.c	2015-07-15 12:47:43.000000000 +0000
@@ -0,0 +1,255 @@
+/*
+ *  gstvaapisurface_egl.c - VA surface abstraction (EGL interop)
+ *
+ *  Copyright (C) 2014 Intel Corporation
+ *    Author: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public License
+ *  as published by the Free Software Foundation; either version 2.1
+ *  of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free
+ *  Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ *  Boston, MA 02110-1301 USA
+ */
+
+#include "sysdeps.h"
+#include "gstvaapisurface_egl.h"
+#include "gstvaapisurface_drm.h"
+#include "gstvaapisurface_priv.h"
+#include "gstvaapiimage_priv.h"
+#include "gstvaapibufferproxy_priv.h"
+#include "gstvaapidisplay_egl_priv.h"
+#include "gstvaapifilter.h"
+
+typedef struct
+{
+  GstVaapiDisplayEGL *display;
+  EGLImageKHR image;
+  GstVideoFormat format;
+  guint width;
+  guint height;
+  GstVaapiSurface *surface;     /* result */
+} CreateSurfaceWithEGLImageArgs;
+
+static GstVaapiSurface *
+do_create_surface_with_egl_image_unlocked (GstVaapiDisplayEGL * display,
+    EGLImageKHR image, GstVideoFormat format, guint width, guint height)
+{
+  GstVaapiDisplay *const base_display = GST_VAAPI_DISPLAY_CAST (display);
+  EglContext *const ctx = GST_VAAPI_DISPLAY_EGL_CONTEXT (display);
+  EglVTable *vtable;
+  gsize size, offset[GST_VIDEO_MAX_PLANES];
+  gint name, stride[GST_VIDEO_MAX_PLANES];
+
+  if (!ctx || !(vtable = egl_context_get_vtable (ctx, FALSE)))
+    return NULL;
+
+  memset (offset, 0, sizeof (offset));
+  memset (stride, 0, sizeof (stride));
+
+  if (vtable->has_EGL_MESA_drm_image) {
+    /* EGL_MESA_drm_image extension */
+    if (!vtable->eglExportDRMImageMESA (ctx->display->base.handle.p, image,
+            &name, NULL, &stride[0]))
+      goto error_export_image_gem_buf;
+
+    size = height * stride[0];
+    return gst_vaapi_surface_new_with_gem_buf_handle (base_display, name, size,
+        format, width, height, offset, stride);
+  }
+  return NULL;
+
+  /* ERRORS */
+error_export_image_gem_buf:
+  GST_ERROR ("failed to export EGL image to GEM buffer");
+  return NULL;
+}
+
+static void
+do_create_surface_with_egl_image (CreateSurfaceWithEGLImageArgs * args)
+{
+  GST_VAAPI_DISPLAY_LOCK (args->display);
+  args->surface = do_create_surface_with_egl_image_unlocked (args->display,
+      args->image, args->format, args->width, args->height);
+  GST_VAAPI_DISPLAY_UNLOCK (args->display);
+}
+
+// Creates VA surface with EGLImage buffer as backing storage (internal)
+static inline GstVaapiSurface *
+create_surface_with_egl_image (GstVaapiDisplayEGL * display, EGLImageKHR image,
+    GstVideoFormat format, guint width, guint height)
+{
+  CreateSurfaceWithEGLImageArgs args =
+      { display, image, format, width, height };
+
+  if (!egl_context_run (GST_VAAPI_DISPLAY_EGL_CONTEXT (display),
+          (EglContextRunFunc) do_create_surface_with_egl_image, &args))
+    return NULL;
+  return args.surface;
+}
+
+// Creates VA surface from an EGLImage buffer copy (internal)
+static GstVaapiSurface *
+create_surface_from_egl_image (GstVaapiDisplayEGL * display,
+    const GstVideoInfo * vip, EGLImageKHR image, GstVideoFormat format,
+    guint width, guint height, guint flags)
+{
+  GstVaapiDisplay *const base_display = GST_VAAPI_DISPLAY_CAST (display);
+  GstVaapiSurface *img_surface = NULL, *out_surface = NULL;
+  gboolean use_native_format = TRUE;
+  GstVaapiFilter *filter = NULL;
+  GstVaapiFilterStatus filter_status;
+
+  img_surface = create_surface_with_egl_image (display, image, format,
+      width, height);
+  if (!img_surface)
+    return NULL;
+
+  if (vip) {
+    use_native_format =
+        GST_VIDEO_INFO_FORMAT (vip) == GST_VIDEO_FORMAT_ENCODED ||
+        GST_VIDEO_INFO_FORMAT (vip) == GST_VIDEO_FORMAT_UNKNOWN;
+
+    if (GST_VIDEO_INFO_WIDTH (vip) && GST_VIDEO_INFO_HEIGHT (vip)) {
+      width = GST_VIDEO_INFO_WIDTH (vip);
+      height = GST_VIDEO_INFO_HEIGHT (vip);
+    }
+  }
+
+  if (use_native_format) {
+    out_surface = gst_vaapi_surface_new (base_display,
+        GST_VAAPI_CHROMA_TYPE_YUV420, width, height);
+  } else {
+    out_surface = gst_vaapi_surface_new_with_format (base_display,
+        GST_VIDEO_INFO_FORMAT (vip), width, height);
+  }
+  if (!out_surface)
+    goto error_create_surface;
+
+  filter = gst_vaapi_filter_new (base_display);
+  if (!filter)
+    goto error_create_filter;
+
+  filter_status = gst_vaapi_filter_process (filter,
+      img_surface, out_surface, flags);
+  if (filter_status != GST_VAAPI_FILTER_STATUS_SUCCESS)
+    goto error_convert_surface;
+
+  gst_vaapi_object_unref (img_surface);
+  gst_vaapi_filter_unref (filter);
+  return out_surface;
+
+  /* ERRORS */
+error_create_surface:
+  GST_ERROR ("failed to create output surface format:%s size:%dx%d",
+      gst_vaapi_video_format_to_string (vip ? GST_VIDEO_INFO_FORMAT (vip) :
+          GST_VIDEO_FORMAT_ENCODED), width, height);
+  goto error_cleanup;
+error_convert_surface:
+  GST_ERROR ("failed to transfer EGL image to VA surface (status = %d)",
+      filter_status);
+  goto error_cleanup;
+error_create_filter:
+  GST_ERROR ("failed to create video processing filter");
+  // fall-through
+error_cleanup:
+  gst_vaapi_object_replace (&img_surface, NULL);
+  gst_vaapi_object_replace (&out_surface, NULL);
+  gst_vaapi_filter_replace (&filter, NULL);
+  return NULL;
+}
+
+/**
+ * gst_vaapi_surface_new_from_egl_image:
+ * @display: a #GstVaapiDisplay
+ * @vip: the desired (optional) #GstVideoInfo constraints
+ * @image: the EGL image to import
+ * @format: the EGL @image format
+ * @width: the EGL @image width in pixels
+ * @height: the EGL @image height in pixels
+ * @flags: postprocessing flags. See #GstVaapiSurfaceRenderFlags
+ *
+ * Creates a new #GstVaapiSurface with a copy of the EGL image
+ * contents. i.e. the input EGL @image can be disposed and the
+ * resulting VA surface would still be valid with the contents at the
+ * time this function was called.
+ *
+ * If @vip is %NULL, then the resulting VA surface will be created
+ * with the same video format and size as the original @image. If @vip
+ * is non-%NULL and the desired format is GST_VIDEO_FORMAT_ENCODED,
+ * then the resulting VA surface will have the best "native" HW
+ * format, usually NV12.
+ *
+ * Return value: the newly allocated #GstVaapiSurface object, or %NULL
+ *   if creation from EGL image failed, or is not supported
+ */
+GstVaapiSurface *
+gst_vaapi_surface_new_from_egl_image (GstVaapiDisplay * base_display,
+    const GstVideoInfo * vip, EGLImageKHR image, GstVideoFormat format,
+    guint width, guint height, guint flags)
+{
+  GstVaapiDisplayEGL *display;
+
+  g_return_val_if_fail (GST_VAAPI_IS_DISPLAY_EGL (base_display), NULL);
+  g_return_val_if_fail (image != EGL_NO_IMAGE_KHR, NULL);
+  g_return_val_if_fail (width > 0, NULL);
+  g_return_val_if_fail (height > 0, NULL);
+
+  display = GST_VAAPI_DISPLAY_EGL (base_display);
+  if (!display || !GST_VAAPI_IS_DISPLAY_EGL (display))
+    goto error_invalid_display;
+  return create_surface_from_egl_image (display, vip, image, format,
+      width, height, flags);
+
+  /* ERRORS */
+error_invalid_display:
+  GST_ERROR ("invalid display (NULL or not of EGL class");
+  return NULL;
+}
+
+/**
+ * gst_vaapi_surface_new_with_egl_image:
+ * @display: a #GstVaapiDisplay
+ * @image: the EGL image to import
+ * @format: the EGL @image format
+ * @width: the EGL @image width in pixels
+ * @height: the EGL @image height in pixels
+ *
+ * Creates a new #GstVaapiSurface bound to an external EGL image.
+ *
+ * The caller maintains the lifetime of the EGL image object. In
+ * particular, the EGL image shall not be destroyed before the last
+ * reference to the resulting VA surface is released.
+ *
+ * Return value: the newly allocated #GstVaapiSurface object, or %NULL
+ *   if creation from EGL image failed, or is not supported
+ */
+GstVaapiSurface *
+gst_vaapi_surface_new_with_egl_image (GstVaapiDisplay * base_display,
+    EGLImageKHR image, GstVideoFormat format, guint width, guint height)
+{
+  GstVaapiDisplayEGL *display;
+
+  g_return_val_if_fail (GST_VAAPI_IS_DISPLAY_EGL (base_display), NULL);
+  g_return_val_if_fail (image != EGL_NO_IMAGE_KHR, NULL);
+  g_return_val_if_fail (width > 0, NULL);
+  g_return_val_if_fail (height > 0, NULL);
+
+  display = GST_VAAPI_DISPLAY_EGL (base_display);
+  if (!display || !GST_VAAPI_IS_DISPLAY_EGL (display))
+    goto error_invalid_display;
+  return create_surface_with_egl_image (display, image, format, width, height);
+
+  /* ERRORS */
+error_invalid_display:
+  GST_ERROR ("invalid display (NULL or not of EGL class");
+  return NULL;
+}
diff -Nru gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapisurface_egl.h gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapisurface_egl.h
--- gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapisurface_egl.h	1970-01-01 00:00:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapisurface_egl.h	2015-07-15 12:47:43.000000000 +0000
@@ -0,0 +1,43 @@
+/*
+ *  gstvaapisurface_egl.h - VA surface abstraction (EGL interop)
+ *
+ *  Copyright (C) 2014 Intel Corporation
+ *    Author: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public License
+ *  as published by the Free Software Foundation; either version 2.1
+ *  of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free
+ *  Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ *  Boston, MA 02110-1301 USA
+ */
+
+#ifndef GST_VAAPI_SURFACE_EGL_H
+#define GST_VAAPI_SURFACE_EGL_H
+
+#include <EGL/egl.h>
+#include <EGL/eglext.h>
+#include <gst/vaapi/gstvaapisurface.h>
+
+G_BEGIN_DECLS
+
+GstVaapiSurface *
+gst_vaapi_surface_new_from_egl_image (GstVaapiDisplay * display,
+    const GstVideoInfo * vip, EGLImageKHR image, GstVideoFormat format,
+    guint width, guint height, guint flags);
+
+GstVaapiSurface *
+gst_vaapi_surface_new_with_egl_image (GstVaapiDisplay * display,
+    EGLImageKHR image, GstVideoFormat format, guint width, guint height);
+
+G_END_DECLS
+
+#endif /* GST_VAAPI_SURFACE_EGL_H */
diff -Nru gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapitexture.c gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapitexture.c
--- gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapitexture.c	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapitexture.c	2015-07-15 12:47:43.000000000 +0000
@@ -39,6 +39,10 @@
 #undef gst_vaapi_texture_unref
 #undef gst_vaapi_texture_replace
 
+#define GST_VAAPI_TEXTURE_ORIENTATION_FLAGS \
+  (GST_VAAPI_TEXTURE_ORIENTATION_FLAG_X_INVERTED | \
+   GST_VAAPI_TEXTURE_ORIENTATION_FLAG_Y_INVERTED)
+
 static void
 gst_vaapi_texture_init (GstVaapiTexture * texture, GstVaapiID id,
     guint target, guint format, guint width, guint height)
@@ -298,6 +302,43 @@
 }
 
 /**
+ * gst_vaapi_texture_get_orientation_flags:
+ * @texture: a #GstVaapiTexture
+ *
+ * Retrieves the texture memory layout flags, i.e. orientation.
+ *
+ * Return value: the #GstVaapiTextureOrientationFlags.
+ */
+guint
+gst_vaapi_texture_get_orientation_flags (GstVaapiTexture * texture)
+{
+  g_return_val_if_fail (texture != NULL, 0);
+
+  return GST_VAAPI_TEXTURE_FLAGS (texture) &
+      GST_VAAPI_TEXTURE_ORIENTATION_FLAGS;
+}
+
+/**
+ * gst_vaapi_texture_set_orientation_flags:
+ * @texture: a #GstVaapiTexture
+ * @flags: a bitmask of #GstVaapiTextureOrientationFlags
+ *
+ * Reset the texture orientation flags to the supplied set of
+ * @flags. This completely replaces the previously installed
+ * flags. So, should they still be needed, then they shall be
+ * retrieved first with gst_vaapi_texture_get_orientation_flags().
+ */
+void
+gst_vaapi_texture_set_orientation_flags (GstVaapiTexture * texture, guint flags)
+{
+  g_return_if_fail (texture != NULL);
+  g_return_if_fail ((flags & ~GST_VAAPI_TEXTURE_ORIENTATION_FLAGS) == 0);
+
+  GST_VAAPI_TEXTURE_FLAG_UNSET (texture, GST_VAAPI_TEXTURE_ORIENTATION_FLAGS);
+  GST_VAAPI_TEXTURE_FLAG_SET (texture, flags);
+}
+
+/**
  * gst_vaapi_texture_put_surface:
  * @texture: a #GstVaapiTexture
  * @surface: a #GstVaapiSurface
diff -Nru gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapitexture_egl.c gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapitexture_egl.c
--- gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapitexture_egl.c	1970-01-01 00:00:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapitexture_egl.c	2015-07-15 12:47:43.000000000 +0000
@@ -0,0 +1,349 @@
+/*
+ *  gstvaapitexture_egl.c - VA/EGL texture abstraction
+ *
+ *  Copyright (C) 2014 Intel Corporation
+ *    Author: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public License
+ *  as published by the Free Software Foundation; either version 2.1
+ *  of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free
+ *  Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ *  Boston, MA 02110-1301 USA
+ */
+
+/**
+ * SECTION:gstvaapitexture_egl
+ * @short_description: VA/EGL texture abstraction
+ */
+
+#include "sysdeps.h"
+#include "gstvaapitexture.h"
+#include "gstvaapitexture_egl.h"
+#include "gstvaapitexture_priv.h"
+#include "gstvaapicompat.h"
+#include "gstvaapiutils.h"
+#include "gstvaapiutils_egl.h"
+#include "gstvaapidisplay_egl.h"
+#include "gstvaapidisplay_egl_priv.h"
+#include "gstvaapisurface_egl.h"
+#include "gstvaapifilter.h"
+
+#define GST_VAAPI_TEXTURE_EGL(texture) \
+  ((GstVaapiTextureEGL *) (texture))
+
+typedef struct _GstVaapiTextureEGL GstVaapiTextureEGL;
+typedef struct _GstVaapiTextureEGLClass GstVaapiTextureEGLClass;
+
+/**
+ * GstVaapiTextureEGL:
+ *
+ * Base object for EGL texture wrapper.
+ */
+struct _GstVaapiTextureEGL
+{
+  /*< private >*/
+  GstVaapiTexture parent_instance;
+
+  EglContext *egl_context;
+  EGLImageKHR egl_image;
+  GstVaapiSurface *surface;
+  GstVaapiFilter *filter;
+};
+
+/**
+ * GstVaapiTextureEGLClass:
+ *
+ * Base class for EGL texture wrapper.
+ */
+struct _GstVaapiTextureEGLClass
+{
+  /*< private >*/
+  GstVaapiTextureClass parent_class;
+};
+
+typedef struct
+{
+  GstVaapiTextureEGL *texture;
+  gboolean success;             /* result */
+} CreateTextureArgs;
+
+typedef struct
+{
+  GstVaapiTextureEGL *texture;
+  GstVaapiSurface *surface;
+  const GstVaapiRectangle *crop_rect;
+  guint flags;
+  gboolean success;             /* result */
+} UploadSurfaceArgs;
+
+static gboolean
+create_objects (GstVaapiTextureEGL * texture, GLuint texture_id)
+{
+  GstVaapiTexture *const base_texture = GST_VAAPI_TEXTURE (texture);
+  EglContext *const ctx = texture->egl_context;
+  EglVTable *const vtable = egl_context_get_vtable (ctx, FALSE);
+  GLint attribs[3], *attrib;
+
+  attrib = attribs;
+  *attrib++ = EGL_IMAGE_PRESERVED_KHR;
+  *attrib++ = EGL_TRUE;
+  *attrib++ = EGL_NONE;
+  texture->egl_image = vtable->eglCreateImageKHR (ctx->display->base.handle.p,
+      ctx->base.handle.p, EGL_GL_TEXTURE_2D_KHR,
+      (EGLClientBuffer) GSIZE_TO_POINTER (texture_id), attribs);
+  if (!texture->egl_image)
+    goto error_create_image;
+
+  texture->surface =
+      gst_vaapi_surface_new_with_egl_image (GST_VAAPI_OBJECT_DISPLAY (texture),
+      texture->egl_image, GST_VIDEO_FORMAT_RGBA, base_texture->width,
+      base_texture->height);
+  if (!texture->surface)
+    goto error_create_surface;
+
+  texture->filter = gst_vaapi_filter_new (GST_VAAPI_OBJECT_DISPLAY (texture));
+  if (!texture->filter)
+    goto error_create_filter;
+  return TRUE;
+
+  /* ERRORS */
+error_create_image:
+  GST_ERROR ("failed to create EGL image from 2D texture %u", texture_id);
+  return FALSE;
+error_create_surface:
+  GST_ERROR ("failed to create VA surface from 2D texture %u", texture_id);
+  return FALSE;
+error_create_filter:
+  GST_ERROR ("failed to create VPP filter for color conversion");
+  return FALSE;
+}
+
+static gboolean
+do_create_texture_unlocked (GstVaapiTextureEGL * texture)
+{
+  GstVaapiTexture *const base_texture = GST_VAAPI_TEXTURE (texture);
+  GLuint texture_id;
+
+  if (base_texture->is_wrapped)
+    texture_id = GST_VAAPI_TEXTURE_ID (texture);
+  else {
+    texture_id = egl_create_texture (texture->egl_context,
+        base_texture->gl_target, base_texture->gl_format,
+        base_texture->width, base_texture->height);
+    if (!texture_id)
+      return FALSE;
+    GST_VAAPI_TEXTURE_ID (texture) = texture_id;
+  }
+  return create_objects (texture, texture_id);
+}
+
+static void
+do_create_texture (CreateTextureArgs * args)
+{
+  GstVaapiTextureEGL *const texture = args->texture;
+  EglContextState old_cs;
+
+  args->success = FALSE;
+
+  GST_VAAPI_OBJECT_LOCK_DISPLAY (texture);
+  if (egl_context_set_current (texture->egl_context, TRUE, &old_cs)) {
+    args->success = do_create_texture_unlocked (texture);
+    egl_context_set_current (texture->egl_context, FALSE, &old_cs);
+  }
+  GST_VAAPI_OBJECT_UNLOCK_DISPLAY (texture);
+}
+
+static void
+destroy_objects (GstVaapiTextureEGL * texture)
+{
+  EglContext *const ctx = texture->egl_context;
+  EglVTable *const vtable = egl_context_get_vtable (ctx, FALSE);
+
+  if (texture->egl_image != EGL_NO_IMAGE_KHR) {
+    vtable->eglDestroyImageKHR (ctx->display->base.handle.p,
+        texture->egl_image);
+    texture->egl_image = EGL_NO_IMAGE_KHR;
+  }
+  gst_vaapi_object_replace (&texture->surface, NULL);
+  gst_vaapi_filter_replace (&texture->filter, NULL);
+}
+
+static void
+do_destroy_texture_unlocked (GstVaapiTextureEGL * texture)
+{
+  GstVaapiTexture *const base_texture = GST_VAAPI_TEXTURE (texture);
+  const GLuint texture_id = GST_VAAPI_TEXTURE_ID (texture);
+
+  destroy_objects (texture);
+
+  if (texture_id) {
+    if (!base_texture->is_wrapped)
+      egl_destroy_texture (texture->egl_context, texture_id);
+    GST_VAAPI_TEXTURE_ID (texture) = 0;
+  }
+}
+
+static void
+do_destroy_texture (GstVaapiTextureEGL * texture)
+{
+  EglContextState old_cs;
+
+  GST_VAAPI_OBJECT_LOCK_DISPLAY (texture);
+  if (egl_context_set_current (texture->egl_context, TRUE, &old_cs)) {
+    do_destroy_texture_unlocked (texture);
+    egl_context_set_current (texture->egl_context, FALSE, &old_cs);
+  }
+  GST_VAAPI_OBJECT_UNLOCK_DISPLAY (texture);
+  egl_object_replace (&texture->egl_context, NULL);
+}
+
+static gboolean
+do_upload_surface_unlocked (GstVaapiTextureEGL * texture,
+    GstVaapiSurface * surface, const GstVaapiRectangle * crop_rect, guint flags)
+{
+  GstVaapiFilterStatus status;
+
+  if (!gst_vaapi_filter_set_cropping_rectangle (texture->filter, crop_rect))
+    return FALSE;
+
+  status = gst_vaapi_filter_process (texture->filter, surface, texture->surface,
+      flags);
+  if (status != GST_VAAPI_FILTER_STATUS_SUCCESS)
+    return FALSE;
+  return TRUE;
+}
+
+static void
+do_upload_surface (UploadSurfaceArgs * args)
+{
+  GstVaapiTextureEGL *const texture = args->texture;
+  EglContextState old_cs;
+
+  args->success = FALSE;
+
+  GST_VAAPI_OBJECT_LOCK_DISPLAY (texture);
+  if (egl_context_set_current (texture->egl_context, TRUE, &old_cs)) {
+    args->success = do_upload_surface_unlocked (texture, args->surface,
+        args->crop_rect, args->flags);
+    egl_context_set_current (texture->egl_context, FALSE, &old_cs);
+  }
+  GST_VAAPI_OBJECT_UNLOCK_DISPLAY (texture);
+}
+
+static gboolean
+gst_vaapi_texture_egl_create (GstVaapiTextureEGL * texture)
+{
+  CreateTextureArgs args = { texture };
+
+  egl_object_replace (&texture->egl_context,
+      GST_VAAPI_DISPLAY_EGL_CONTEXT (GST_VAAPI_OBJECT_DISPLAY (texture)));
+
+  return egl_context_run (texture->egl_context,
+      (EglContextRunFunc) do_create_texture, &args) && args.success;
+}
+
+static void
+gst_vaapi_texture_egl_destroy (GstVaapiTextureEGL * texture)
+{
+  egl_context_run (texture->egl_context,
+      (EglContextRunFunc) do_destroy_texture, texture);
+}
+
+static gboolean
+gst_vaapi_texture_egl_put_surface (GstVaapiTextureEGL * texture,
+    GstVaapiSurface * surface, const GstVaapiRectangle * crop_rect, guint flags)
+{
+  UploadSurfaceArgs args = { texture, surface, crop_rect, flags };
+
+  return egl_context_run (texture->egl_context,
+      (EglContextRunFunc) do_upload_surface, &args) && args.success;
+}
+
+static void
+gst_vaapi_texture_egl_class_init (GstVaapiTextureEGLClass * klass)
+{
+  GstVaapiObjectClass *const object_class = GST_VAAPI_OBJECT_CLASS (klass);
+  GstVaapiTextureClass *const texture_class = GST_VAAPI_TEXTURE_CLASS (klass);
+
+  object_class->finalize = (GstVaapiObjectFinalizeFunc)
+      gst_vaapi_texture_egl_destroy;
+  texture_class->allocate = (GstVaapiTextureAllocateFunc)
+      gst_vaapi_texture_egl_create;
+  texture_class->put_surface = (GstVaapiTexturePutSurfaceFunc)
+      gst_vaapi_texture_egl_put_surface;
+}
+
+#define gst_vaapi_texture_egl_finalize gst_vaapi_texture_egl_destroy
+GST_VAAPI_OBJECT_DEFINE_CLASS_WITH_CODE (GstVaapiTextureEGL,
+    gst_vaapi_texture_egl, gst_vaapi_texture_egl_class_init (&g_class));
+
+/**
+ * gst_vaapi_texture_egl_new:
+ * @display: a #GstVaapiDisplay
+ * @target: the target to which the texture is bound
+ * @format: the format of the pixel data
+ * @width: the requested width, in pixels
+ * @height: the requested height, in pixels
+ *
+ * Creates a texture with the specified dimensions, @target and
+ * @format. Note that only GL_TEXTURE_2D @target and GL_RGBA or
+ * GL_BGRA formats are supported at this time.
+ *
+ * The application shall maintain the live EGL context itself. That
+ * is, gst_vaapi_window_egl_make_current() must be called beforehand,
+ * or any other function like eglMakeCurrent() if the context is
+ * managed outside of this library.
+ *
+ * Return value: the newly created #GstVaapiTexture object
+ */
+GstVaapiTexture *
+gst_vaapi_texture_egl_new (GstVaapiDisplay * display, guint target,
+    guint format, guint width, guint height)
+{
+  g_return_val_if_fail (GST_VAAPI_IS_DISPLAY_EGL (display), NULL);
+
+  return gst_vaapi_texture_new_internal (GST_VAAPI_TEXTURE_CLASS
+      (gst_vaapi_texture_egl_class ()), display, GST_VAAPI_ID_INVALID, target,
+      format, width, height);
+}
+
+/**
+ * gst_vaapi_texture_egl_new_wrapped:
+ * @display: a #GstVaapiDisplay
+ * @texture_id: the foreign GL texture name to use
+ * @target: the target to which the texture is bound
+ * @format: the format of the pixel data
+ * @width: the texture width, in pixels
+ * @height: the texture height, in pixels
+ *
+ * Creates a texture from an existing GL texture, with the specified
+ * @target and @format. Note that only GL_TEXTURE_2D @target and
+ * GL_RGBA or GL_BGRA formats are supported at this time.
+ *
+ * The application shall maintain the live EGL context itself. That
+ * is, gst_vaapi_window_egl_make_current() must be called beforehand,
+ * or any other function like eglMakeCurrent() if the context is
+ * managed outside of this library.
+ *
+ * Return value: the newly created #GstVaapiTexture object
+ */
+GstVaapiTexture *
+gst_vaapi_texture_egl_new_wrapped (GstVaapiDisplay * display,
+    guint texture_id, guint target, GLenum format, guint width, guint height)
+{
+  g_return_val_if_fail (GST_VAAPI_IS_DISPLAY_EGL (display), NULL);
+  g_return_val_if_fail (texture_id != GL_NONE, NULL);
+
+  return gst_vaapi_texture_new_internal (GST_VAAPI_TEXTURE_CLASS
+      (gst_vaapi_texture_egl_class ()), display, texture_id, target, format,
+      width, height);
+}
diff -Nru gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapitexture_egl.h gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapitexture_egl.h
--- gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapitexture_egl.h	1970-01-01 00:00:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapitexture_egl.h	2015-07-15 12:47:43.000000000 +0000
@@ -0,0 +1,40 @@
+/*
+ *  gstvaapitexture_egl.h - VA/EGL texture abstraction
+ *
+ *  Copyright (C) 2014 Intel Corporation
+ *    Author: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public License
+ *  as published by the Free Software Foundation; either version 2.1
+ *  of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free
+ *  Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ *  Boston, MA 02110-1301 USA
+ */
+
+#ifndef GST_VAAPI_TEXTURE_EGL_H
+#define GST_VAAPI_TEXTURE_EGL_H
+
+#include <gst/vaapi/gstvaapitexture.h>
+
+G_BEGIN_DECLS
+
+GstVaapiTexture *
+gst_vaapi_texture_egl_new (GstVaapiDisplay * display, guint target,
+    guint format, guint width, guint height);
+
+GstVaapiTexture *
+gst_vaapi_texture_egl_new_wrapped (GstVaapiDisplay * display, guint id,
+    guint target, guint format, guint width, guint height);
+
+G_END_DECLS
+
+#endif /* GST_VAAPI_TEXTURE_EGL_H */
diff -Nru gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapitexture_glx.c gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapitexture_glx.c
--- gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapitexture_glx.c	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapitexture_glx.c	2015-07-15 12:47:43.000000000 +0000
@@ -312,6 +312,12 @@
   GLContextState old_cs;
   gboolean success = FALSE;
 
+  const GLfloat *txc, *tyc;
+  static const GLfloat g_texcoords[2][2] = {
+    {0.0f, 1.0f},
+    {1.0f, 0.0f},
+  };
+
   status = vaPutSurface (GST_VAAPI_OBJECT_VADISPLAY (texture),
       GST_VAAPI_OBJECT_ID (surface), texture->pixo->pixmap,
       crop_rect->x, crop_rect->y, crop_rect->width, crop_rect->height,
@@ -339,16 +345,20 @@
     goto out_unbind_fbo;
   }
 
+  flags = GST_VAAPI_TEXTURE_FLAGS (texture);
+  txc = g_texcoords[! !(flags & GST_VAAPI_TEXTURE_ORIENTATION_FLAG_X_INVERTED)];
+  tyc = g_texcoords[! !(flags & GST_VAAPI_TEXTURE_ORIENTATION_FLAG_Y_INVERTED)];
+
   glColor4f (1.0f, 1.0f, 1.0f, 1.0f);
   glBegin (GL_QUADS);
   {
-    glTexCoord2f (0.0f, 0.0f);
+    glTexCoord2f (txc[0], tyc[0]);
     glVertex2i (0, 0);
-    glTexCoord2f (0.0f, 1.0f);
+    glTexCoord2f (txc[0], tyc[1]);
     glVertex2i (0, base_texture->height);
-    glTexCoord2f (1.0f, 1.0f);
+    glTexCoord2f (txc[1], tyc[1]);
     glVertex2i (base_texture->width, base_texture->height);
-    glTexCoord2f (1.0f, 0.0f);
+    glTexCoord2f (txc[1], tyc[0]);
     glVertex2i (base_texture->width, 0);
   }
   glEnd ();
diff -Nru gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapitexture.h gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapitexture.h
--- gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapitexture.h	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapitexture.h	2015-07-15 12:47:43.000000000 +0000
@@ -80,6 +80,24 @@
 
 typedef struct _GstVaapiTexture GstVaapiTexture;
 
+/**
+ * GstVaapiTextureOrientationFlags:
+ * @GST_VAAPI_TEXTURE_ORIENTATION_FLAG_X_INVERTED: indicates whether
+ *   the right row comes first in memory.
+ * @GST_VAAPI_TEXTURE_ORIENTATION_FLAG_Y_INVERTED: indicates whether
+ *   the bottom line comes first in memory.
+ *
+ * Additional flags to indicate whether the texture data is organized
+ * in memory with the X or Y, or both, axis inverted. e.g. if only
+ * @GST_VAAPI_TEXTURE_ORIENTATION_FLAG_Y_INVERTED is set, this means
+ * that the bottom line comes first in memory, with pixels laid out
+ * from the left to the right.
+ */
+typedef enum {
+  GST_VAAPI_TEXTURE_ORIENTATION_FLAG_X_INVERTED = 1 << 31,
+  GST_VAAPI_TEXTURE_ORIENTATION_FLAG_Y_INVERTED = 1 << 30,
+} GstVaapiTextureOrientationFlags;
+
 GstVaapiTexture *
 gst_vaapi_texture_new (GstVaapiDisplay * display, guint target, guint format,
     guint width, guint height);
@@ -117,6 +135,13 @@
 gst_vaapi_texture_get_size (GstVaapiTexture * texture, guint * width_ptr,
     guint * height_ptr);
 
+guint
+gst_vaapi_texture_get_orientation_flags (GstVaapiTexture * texture);
+
+void
+gst_vaapi_texture_set_orientation_flags (GstVaapiTexture * texture,
+    guint flags);
+
 gboolean
 gst_vaapi_texture_put_surface (GstVaapiTexture * texture,
     GstVaapiSurface * surface, const GstVaapiRectangle * crop_rect,
diff -Nru gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapitexture_priv.h gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapitexture_priv.h
--- gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapitexture_priv.h	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapitexture_priv.h	2015-07-15 12:47:43.000000000 +0000
@@ -85,6 +85,11 @@
 #define GST_VAAPI_TEXTURE_HEIGHT(texture) \
   (GST_VAAPI_TEXTURE (texture)->height)
 
+#define GST_VAAPI_TEXTURE_FLAGS         GST_VAAPI_MINI_OBJECT_FLAGS
+#define GST_VAAPI_TEXTURE_FLAG_IS_SET   GST_VAAPI_MINI_OBJECT_FLAG_IS_SET
+#define GST_VAAPI_TEXTURE_FLAG_SET      GST_VAAPI_MINI_OBJECT_FLAG_SET
+#define GST_VAAPI_TEXTURE_FLAG_UNSET    GST_VAAPI_MINI_OBJECT_FLAG_UNSET
+
 /* GstVaapiTextureClass hooks */
 typedef gboolean (*GstVaapiTextureAllocateFunc) (GstVaapiTexture * texture);
 typedef gboolean (*GstVaapiTexturePutSurfaceFunc) (GstVaapiTexture * texture,
diff -Nru gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapiutils.c gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapiutils.c
--- gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapiutils.c	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapiutils.c	2015-07-15 12:47:43.000000000 +0000
@@ -364,12 +364,10 @@
 {
   guint flags = 0;
 
-#ifdef HAVE_GST_VIDEO_OVERLAY_HWCAPS
   if (ovl_flags & GST_VIDEO_OVERLAY_FORMAT_FLAG_PREMULTIPLIED_ALPHA)
     flags |= GST_VAAPI_SUBPICTURE_FLAG_PREMULTIPLIED_ALPHA;
   if (ovl_flags & GST_VIDEO_OVERLAY_FORMAT_FLAG_GLOBAL_ALPHA)
     flags |= GST_VAAPI_SUBPICTURE_FLAG_GLOBAL_ALPHA;
-#endif
   return flags;
 }
 
@@ -386,12 +384,10 @@
 {
   guint ovl_flags = 0;
 
-#ifdef HAVE_GST_VIDEO_OVERLAY_HWCAPS
   if (flags & GST_VAAPI_SUBPICTURE_FLAG_PREMULTIPLIED_ALPHA)
     ovl_flags |= GST_VIDEO_OVERLAY_FORMAT_FLAG_PREMULTIPLIED_ALPHA;
   if (flags & GST_VAAPI_SUBPICTURE_FLAG_GLOBAL_ALPHA)
     ovl_flags |= GST_VIDEO_OVERLAY_FORMAT_FLAG_GLOBAL_ALPHA;
-#endif
   return ovl_flags;
 }
 
diff -Nru gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapiutils_egl.c gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapiutils_egl.c
--- gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapiutils_egl.c	1970-01-01 00:00:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapiutils_egl.c	2015-07-15 12:47:43.000000000 +0000
@@ -0,0 +1,1407 @@
+/*
+ * gstvaapiutils_egl.c - EGL utilities
+ *
+ * Copyright (C) 2014 Intel Corporation
+ *   Author: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1
+ * of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301
+ */
+
+#include "sysdeps.h"
+#include "gstvaapiutils_egl.h"
+
+typedef struct egl_message_s EglMessage;
+struct egl_message_s
+{
+  EglObject base;
+  EglContextRunFunc func;
+  gpointer args;
+};
+
+static void
+egl_message_finalize (EglMessage * msg)
+{
+}
+
+/* ------------------------------------------------------------------------- */
+// Utility functions
+
+typedef struct gl_version_info_s GlVersionInfo;
+struct gl_version_info_s
+{
+  guint gles_version;
+  guint gl_api_bit;
+  guint gl_api;
+  const gchar *gl_api_name;
+};
+
+static const GlVersionInfo gl_version_info[] = {
+  {0, EGL_OPENGL_BIT, EGL_OPENGL_API, "OpenGL"},
+  {1, EGL_OPENGL_ES_BIT, EGL_OPENGL_ES_API, "OpenGL_ES"},
+  {2, EGL_OPENGL_ES2_BIT, EGL_OPENGL_ES_API, "OpenGL_ES2"},
+  {3, EGL_OPENGL_ES3_BIT_KHR, EGL_OPENGL_ES_API, "OpenGL_ES3"},
+  {0,}
+};
+
+static const GlVersionInfo *
+gl_version_info_lookup (guint gles_version)
+{
+  const GlVersionInfo *vinfo;
+
+  for (vinfo = gl_version_info; vinfo->gl_api_bit != 0; vinfo++) {
+    if (vinfo->gles_version == gles_version)
+      return vinfo;
+  }
+  return NULL;
+}
+
+static const GlVersionInfo *
+gl_version_info_lookup_by_api (guint api)
+{
+  const GlVersionInfo *vinfo;
+
+  for (vinfo = gl_version_info; vinfo->gl_api_bit != 0; vinfo++) {
+    if (api & vinfo->gl_api_bit)
+      return vinfo;
+  }
+  return NULL;
+}
+
+static const GlVersionInfo *
+gl_version_info_lookup_by_api_name (const gchar * name)
+{
+  const GlVersionInfo *vinfo;
+
+  for (vinfo = gl_version_info; vinfo->gl_api_bit != 0; vinfo++) {
+    if (g_strcmp0 (vinfo->gl_api_name, name) == 0)
+      return vinfo;
+  }
+  return NULL;
+}
+
+static gboolean
+g_strv_match_string (gchar ** extensions_list, const gchar * name)
+{
+  if (extensions_list) {
+    for (; *extensions_list != NULL; extensions_list++) {
+      if (g_strcmp0 (*extensions_list, name) == 0)
+        return TRUE;
+    }
+  }
+  return FALSE;
+}
+
+static gboolean
+egl_find_attrib_value (const EGLint * attribs, EGLint type, EGLint * value_ptr)
+{
+  while (attribs[0] != EGL_NONE) {
+    if (attribs[0] == type) {
+      if (value_ptr)
+        *value_ptr = attribs[1];
+      return TRUE;
+    }
+    attribs += 2;
+  }
+  return FALSE;
+}
+
+/* ------------------------------------------------------------------------- */
+// Basic objects
+
+#define EGL_OBJECT(object) ((EglObject *)(object))
+#define EGL_OBJECT_CLASS(klass) ((EglObjectClass *)(klass))
+
+#define EGL_OBJECT_DEFINE_CLASS_WITH_CODE(TN, t_n, code)        \
+static void                                                     \
+G_PASTE(t_n,_finalize) (TN * object);                           \
+                                                                \
+static inline const EglObjectClass *                            \
+G_PASTE(t_n,_class) (void)                                      \
+{                                                               \
+  static G_PASTE(TN,Class) g_class;                             \
+  static gsize g_class_init = FALSE;                            \
+                                                                \
+  if (g_once_init_enter (&g_class_init)) {                      \
+    GstVaapiMiniObjectClass *const object_class =               \
+        GST_VAAPI_MINI_OBJECT_CLASS (&g_class);                 \
+    code;                                                       \
+    object_class->size = sizeof (TN);                           \
+    object_class->finalize = (GDestroyNotify)                   \
+      G_PASTE(t_n,_finalize);                                   \
+    g_once_init_leave (&g_class_init, TRUE);                    \
+  }                                                             \
+  return EGL_OBJECT_CLASS (&g_class);                           \
+}
+
+#define EGL_OBJECT_DEFINE_CLASS(TN, t_n) \
+  EGL_OBJECT_DEFINE_CLASS_WITH_CODE (TN, t_n, /**/)
+
+static inline gpointer
+egl_object_new (const EglObjectClass * klass)
+{
+  return gst_vaapi_mini_object_new (GST_VAAPI_MINI_OBJECT_CLASS (klass));
+}
+
+static inline gpointer
+egl_object_new0 (const EglObjectClass * klass)
+{
+  return gst_vaapi_mini_object_new0 (GST_VAAPI_MINI_OBJECT_CLASS (klass));
+}
+
+typedef struct egl_object_class_s EglMessageClass;
+typedef struct egl_object_class_s EglVTableClass;
+typedef struct egl_object_class_s EglDisplayClass;
+typedef struct egl_object_class_s EglConfigClass;
+typedef struct egl_object_class_s EglContextClass;
+typedef struct egl_object_class_s EglSurfaceClass;
+typedef struct egl_object_class_s EglProgramClass;
+typedef struct egl_object_class_s EglWindowClass;
+
+EGL_OBJECT_DEFINE_CLASS (EglMessage, egl_message);
+EGL_OBJECT_DEFINE_CLASS (EglVTable, egl_vtable);
+EGL_OBJECT_DEFINE_CLASS (EglDisplay, egl_display);
+EGL_OBJECT_DEFINE_CLASS (EglConfig, egl_config);
+EGL_OBJECT_DEFINE_CLASS (EglContext, egl_context);
+EGL_OBJECT_DEFINE_CLASS (EglSurface, egl_surface);
+EGL_OBJECT_DEFINE_CLASS (EglProgram, egl_program);
+EGL_OBJECT_DEFINE_CLASS (EglWindow, egl_window);
+
+/* ------------------------------------------------------------------------- */
+// Desktop OpenGL and OpenGL|ES dispatcher (vtable)
+
+static GMutex gl_vtables_lock;
+static EglVTable *gl_vtables[4];
+
+#if (USE_GLES_VERSION_MASK & (1U << 0))
+static const gchar *gl_library_names[] = {
+  "libGL.la",
+  "libGL.so.1",
+  NULL
+};
+#endif
+
+#if (USE_GLES_VERSION_MASK & (1U << 1))
+static const gchar *gles1_library_names[] = {
+  "libGLESv1_CM.la",
+  "libGLESv1_CM.so.1",
+  NULL
+};
+#endif
+
+#if (USE_GLES_VERSION_MASK & (1U << 2))
+static const gchar *gles2_library_names[] = {
+  "libGLESv2.la",
+  "libGLESv2.so.2",
+  NULL
+};
+#endif
+
+static const gchar **gl_library_names_group[] = {
+#if (USE_GLES_VERSION_MASK & (1U << 0))
+  gl_library_names,
+#endif
+  NULL
+};
+
+static const gchar **gles1_library_names_group[] = {
+#if (USE_GLES_VERSION_MASK & (1U << 1))
+  gles1_library_names,
+#endif
+  NULL
+};
+
+static const gchar **gles2_library_names_group[] = {
+#if (USE_GLES_VERSION_MASK & (1U << 2))
+  gles2_library_names,
+#endif
+  NULL
+};
+
+static const gchar **gles3_library_names_group[] = {
+#if (USE_GLES_VERSION_MASK & (1U << 3))
+  gles2_library_names,
+#endif
+  NULL
+};
+
+static const gchar ***
+egl_vtable_get_library_names_group (guint gles_version)
+{
+  const gchar ***library_names_group;
+
+  switch (gles_version) {
+    case 0:
+      library_names_group = gl_library_names_group;
+      break;
+    case 1:
+      library_names_group = gles1_library_names_group;
+      break;
+    case 2:
+      library_names_group = gles2_library_names_group;
+      break;
+    case 3:
+      library_names_group = gles3_library_names_group;
+      break;
+    default:
+      library_names_group = NULL;
+      break;
+  }
+  return library_names_group;
+}
+
+static gboolean
+egl_vtable_check_extension (EglVTable * vtable, EGLDisplay display,
+    gboolean is_egl, const gchar * group_name, guint * group_ptr)
+{
+  gchar ***extensions_list;
+  const gchar *extensions;
+
+  g_return_val_if_fail (group_name != NULL, FALSE);
+  g_return_val_if_fail (group_ptr != NULL, FALSE);
+
+  if (*group_ptr > 0)
+    return TRUE;
+
+  GST_DEBUG ("check for %s extension %s", is_egl ? "EGL" : "GL", group_name);
+
+  if (is_egl) {
+    if (!vtable->egl_extensions) {
+      extensions = eglQueryString (display, EGL_EXTENSIONS);
+      if (!extensions)
+        return FALSE;
+      GST_DEBUG ("EGL extensions: %s", extensions);
+      vtable->egl_extensions = g_strsplit (extensions, " ", 0);
+    }
+    extensions_list = &vtable->egl_extensions;
+  } else {
+    if (!vtable->gl_extensions) {
+      extensions = (const gchar *) vtable->glGetString (GL_EXTENSIONS);
+      if (!extensions)
+        return FALSE;
+      GST_DEBUG ("GL extensions: %s", extensions);
+      vtable->gl_extensions = g_strsplit (extensions, " ", 0);
+    }
+    extensions_list = &vtable->gl_extensions;
+  }
+  if (!g_strv_match_string (*extensions_list, group_name))
+    return FALSE;
+
+  GST_LOG ("  found %s extension %s", is_egl ? "EGL" : "GL", group_name);
+  (*group_ptr)++;
+  return TRUE;
+}
+
+static gboolean
+egl_vtable_load_symbol (EglVTable * vtable, EGLDisplay display, gboolean is_egl,
+    const gchar * symbol_name, gpointer * symbol_ptr,
+    const gchar * group_name, guint * group_ptr)
+{
+  void (*symbol) (void);
+
+  if (group_ptr && !*group_ptr) {
+    if (!egl_vtable_check_extension (vtable, display, is_egl, group_name,
+            group_ptr))
+      return FALSE;
+  }
+
+  if (is_egl) {
+    symbol = eglGetProcAddress (symbol_name);
+  } else {
+    if (!g_module_symbol (vtable->base.handle.p, symbol_name,
+            (gpointer *) & symbol))
+      return FALSE;
+  }
+  if (!symbol)
+    return FALSE;
+
+  GST_LOG ("  found symbol %s", symbol_name);
+  if (symbol_ptr)
+    *symbol_ptr = symbol;
+  if (group_ptr)
+    (*group_ptr)++;
+  return TRUE;
+}
+
+static gboolean
+egl_vtable_load_egl_symbols (EglVTable * vtable, EGLDisplay display)
+{
+  guint n = 0;
+
+#define EGL_DEFINE_EXTENSION(NAME) do {                         \
+      egl_vtable_check_extension (vtable, display, TRUE,        \
+          "EGL_" G_STRINGIFY (NAME),                            \
+          &vtable->GL_PROTO_GEN_CONCAT(has_EGL_,NAME));         \
+    } while (0);
+
+#define EGL_PROTO_BEGIN(NAME, TYPE, EXTENSION) do {             \
+      n += egl_vtable_load_symbol (vtable, display, TRUE,       \
+          G_STRINGIFY(GL_PROTO_GEN_CONCAT(egl,NAME)),           \
+          (gpointer *) &vtable->GL_PROTO_GEN_CONCAT(egl,NAME),  \
+          "EGL_" G_STRINGIFY(EXTENSION),                        \
+          &vtable->GL_PROTO_GEN_CONCAT(has_EGL_,EXTENSION));    \
+    } while (0);
+
+#include "egl_vtable.h"
+
+  vtable->num_egl_symbols = n;
+  return TRUE;
+}
+
+static gboolean
+egl_vtable_load_gl_symbols (EglVTable * vtable, EGLDisplay display)
+{
+  guint n = 0;
+
+  vtable->has_GL_CORE_1_0 = 1;
+  vtable->has_GL_CORE_1_1 = 1;
+  vtable->has_GL_CORE_1_3 = 1;
+  vtable->has_GL_CORE_2_0 = 1;
+
+#define GL_DEFINE_EXTENSION(NAME) do {                          \
+      egl_vtable_check_extension (vtable, display, FALSE,       \
+          "GL_" G_STRINGIFY (NAME),                             \
+          &vtable->GL_PROTO_GEN_CONCAT(has_GL_,NAME));          \
+    } while (0);
+
+#define GL_PROTO_BEGIN(NAME, TYPE, EXTENSION) do {              \
+      n += egl_vtable_load_symbol (vtable, display, FALSE,      \
+          G_STRINGIFY(GL_PROTO_GEN_CONCAT(gl,NAME)),            \
+          (gpointer *) &vtable->GL_PROTO_GEN_CONCAT(gl,NAME),   \
+          "GL_" G_STRINGIFY(EXTENSION),                         \
+          &vtable->GL_PROTO_GEN_CONCAT(has_GL_,EXTENSION));     \
+    } while (0);
+
+#include "egl_vtable.h"
+
+  --vtable->has_GL_CORE_1_0;
+  --vtable->has_GL_CORE_1_1;
+  --vtable->has_GL_CORE_1_3;
+  --vtable->has_GL_CORE_2_0;
+
+  vtable->num_gl_symbols = n;
+  return TRUE;
+}
+
+static gboolean
+egl_vtable_try_load_library (EglVTable * vtable, const gchar * name)
+{
+  if (vtable->base.handle.p)
+    g_module_close (vtable->base.handle.p);
+  vtable->base.handle.p = g_module_open (name,
+      G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL);
+  if (!vtable->base.handle.p)
+    return FALSE;
+
+  GST_DEBUG ("loaded backend: %s", g_module_name (vtable->base.handle.p));
+  return TRUE;
+}
+
+static gboolean
+egl_vtable_find_library (EglVTable * vtable)
+{
+  const gchar ***library_names_ptr =
+      egl_vtable_get_library_names_group (vtable->gles_version);
+
+  if (!library_names_ptr)
+    return FALSE;
+
+  for (; *library_names_ptr != NULL; library_names_ptr++) {
+    const gchar **library_name_ptr = *library_names_ptr;
+    for (; *library_name_ptr != NULL; library_name_ptr++) {
+      if (egl_vtable_try_load_library (vtable, *library_name_ptr))
+        return TRUE;
+    }
+  }
+  return FALSE;
+}
+
+static gboolean
+egl_vtable_init (EglVTable * vtable, EGLDisplay display, guint gles_version)
+{
+  GST_DEBUG ("initialize for OpenGL|ES API version %d", gles_version);
+
+  vtable->gles_version = gles_version;
+  if (!egl_vtable_find_library (vtable))
+    return FALSE;
+  if (!egl_vtable_load_egl_symbols (vtable, display))
+    return FALSE;
+  return TRUE;
+}
+
+static void
+egl_vtable_finalize (EglVTable * vtable)
+{
+  g_strfreev (vtable->egl_extensions);
+  g_strfreev (vtable->gl_extensions);
+  if (vtable->base.handle.p)
+    g_module_close (vtable->base.handle.p);
+
+  if (vtable->base.is_wrapped) {
+    g_mutex_lock (&gl_vtables_lock);
+    gl_vtables[vtable->gles_version] = NULL;
+    g_mutex_unlock (&gl_vtables_lock);
+  }
+}
+
+static EglVTable *
+egl_vtable_new (EglDisplay * display, guint gles_version)
+{
+  EglVTable *vtable;
+
+  g_return_val_if_fail (display != NULL, NULL);
+
+  vtable = egl_object_new0 (egl_vtable_class ());
+  if (!vtable
+      || !egl_vtable_init (vtable, display->base.handle.p, gles_version))
+    goto error;
+  return vtable;
+
+error:
+  egl_object_replace (&vtable, NULL);
+  return NULL;
+}
+
+static EglVTable *
+egl_vtable_new_cached (EglDisplay * display, guint gles_version)
+{
+  EglVTable *vtable, **vtable_ptr;
+
+  g_return_val_if_fail (gles_version < G_N_ELEMENTS (gl_vtables), NULL);
+
+  vtable_ptr = &gl_vtables[gles_version];
+
+  g_mutex_lock (&gl_vtables_lock);
+  vtable = *vtable_ptr;
+  if (vtable)
+    egl_object_ref (vtable);
+  else {
+    vtable = egl_vtable_new (display, gles_version);
+    if (vtable) {
+      vtable->base.is_wrapped = TRUE;
+      *vtable_ptr = vtable;
+    }
+  }
+  g_mutex_unlock (&gl_vtables_lock);
+  return vtable;
+}
+
+/* ------------------------------------------------------------------------- */
+// EGL Display
+
+static gboolean
+egl_display_run (EglDisplay * display, EglContextRunFunc func, gpointer args)
+{
+  EglMessage *msg;
+
+  if (display->gl_thread == g_thread_self ()) {
+    func (args);
+    return TRUE;
+  }
+
+  msg = egl_object_new0 (egl_message_class ());
+  if (!msg)
+    return FALSE;
+
+  msg->base.is_valid = TRUE;
+  msg->func = func;
+  msg->args = args;
+  g_async_queue_push (display->gl_queue, egl_object_ref (msg));
+
+  g_mutex_lock (&display->mutex);
+  while (msg->base.is_valid)
+    g_cond_wait (&display->gl_thread_ready, &display->mutex);
+  g_mutex_unlock (&display->mutex);
+  egl_object_unref (msg);
+  return TRUE;
+}
+
+static gpointer
+egl_display_thread (gpointer data)
+{
+  EglDisplay *const display = data;
+  EGLDisplay gl_display = display->base.handle.p;
+  EGLint major_version, minor_version;
+  gchar **gl_apis, **gl_api;
+
+  if (!display->base.is_wrapped) {
+    gl_display = display->base.handle.p = eglGetDisplay (gl_display);
+    if (!gl_display)
+      goto error;
+    if (!eglInitialize (gl_display, &major_version, &minor_version))
+      goto error;
+  }
+
+  display->gl_vendor_string =
+      g_strdup (eglQueryString (gl_display, EGL_VENDOR));
+  display->gl_version_string =
+      g_strdup (eglQueryString (gl_display, EGL_VERSION));
+  display->gl_apis_string =
+      g_strdup (eglQueryString (gl_display, EGL_CLIENT_APIS));
+
+  GST_INFO ("EGL vendor: %s", display->gl_vendor_string);
+  GST_INFO ("EGL version: %s", display->gl_version_string);
+  GST_INFO ("EGL client APIs: %s", display->gl_apis_string);
+
+  gl_apis = g_strsplit (display->gl_apis_string, " ", 0);
+  if (!gl_apis)
+    goto error;
+  for (gl_api = gl_apis; *gl_api != NULL; gl_api++) {
+    const GlVersionInfo *const vinfo =
+        gl_version_info_lookup_by_api_name (*gl_api);
+
+    if (vinfo)
+      display->gl_apis |= vinfo->gl_api_bit;
+  }
+  g_strfreev (gl_apis);
+  if (!display->gl_apis)
+    goto error;
+
+  display->base.is_valid = TRUE;
+  g_cond_broadcast (&display->gl_thread_ready);
+
+  while (!display->gl_thread_cancel) {
+    EglMessage *const msg =
+        g_async_queue_timeout_pop (display->gl_queue, 100000);
+
+    if (msg) {
+      if (msg->base.is_valid) {
+        msg->func (msg->args);
+        msg->base.is_valid = FALSE;
+        g_cond_broadcast (&display->gl_thread_ready);
+      }
+      egl_object_unref (msg);
+    }
+  }
+
+done:
+  if (gl_display != EGL_NO_DISPLAY && !display->base.is_wrapped)
+    eglTerminate (gl_display);
+  display->base.handle.p = NULL;
+  g_cond_broadcast (&display->gl_thread_ready);
+  return NULL;
+
+error:
+  display->base.is_valid = FALSE;
+  goto done;
+}
+
+static gboolean
+egl_display_init (EglDisplay * display)
+{
+  display->gl_queue =
+      g_async_queue_new_full ((GDestroyNotify) gst_vaapi_mini_object_unref);
+  if (!display->gl_queue)
+    return FALSE;
+
+  g_mutex_init (&display->mutex);
+  g_cond_init (&display->gl_thread_ready);
+  display->gl_thread = g_thread_try_new ("OpenGL Thread", egl_display_thread,
+      display, NULL);
+  if (!display->gl_thread)
+    return FALSE;
+
+  g_mutex_lock (&display->mutex);
+  g_cond_wait (&display->gl_thread_ready, &display->mutex);
+  g_mutex_unlock (&display->mutex);
+  return display->base.is_valid;
+}
+
+static void
+egl_display_finalize (EglDisplay * display)
+{
+  display->gl_thread_cancel = TRUE;
+  g_thread_join (display->gl_thread);
+  g_cond_clear (&display->gl_thread_ready);
+  g_mutex_clear (&display->mutex);
+  g_async_queue_unref (display->gl_queue);
+
+  g_free (display->gl_vendor_string);
+  g_free (display->gl_version_string);
+  g_free (display->gl_apis_string);
+}
+
+static EglDisplay *
+egl_display_new_full (gpointer handle, gboolean is_wrapped)
+{
+  EglDisplay *display;
+
+  display = egl_object_new0 (egl_display_class ());
+  if (!display)
+    return NULL;
+
+  display->base.handle.p = handle;
+  display->base.is_wrapped = is_wrapped;
+  if (!egl_display_init (display))
+    goto error;
+  return display;
+
+error:
+  egl_object_unref (display);
+  return NULL;
+}
+
+EglDisplay *
+egl_display_new (gpointer native_display)
+{
+  g_return_val_if_fail (native_display != NULL, NULL);
+
+  return egl_display_new_full (native_display, FALSE);
+}
+
+EglDisplay *
+egl_display_new_wrapped (EGLDisplay gl_display)
+{
+  g_return_val_if_fail (gl_display != EGL_NO_DISPLAY, NULL);
+
+  return egl_display_new_full (gl_display, TRUE);
+}
+
+/* ------------------------------------------------------------------------- */
+// EGL Config
+
+static gboolean
+egl_config_init (EglConfig * config, EglDisplay * display,
+    const EGLint * attribs)
+{
+  EGLDisplay const gl_display = display->base.handle.p;
+  const GlVersionInfo *vinfo;
+  EGLConfig gl_config;
+  EGLint v, gl_apis, num_configs;
+
+  egl_object_replace (&config->display, display);
+
+  if (!eglChooseConfig (gl_display, attribs, &gl_config, 1, &num_configs))
+    return FALSE;
+  if (num_configs != 1)
+    return FALSE;
+  config->base.handle.p = gl_config;
+
+  if (!eglGetConfigAttrib (gl_display, gl_config, EGL_CONFIG_ID, &v))
+    return FALSE;
+  config->config_id = v;
+
+  if (!eglGetConfigAttrib (gl_display, gl_config, EGL_NATIVE_VISUAL_ID, &v))
+    return FALSE;
+  config->visual_id = v;
+
+  if (!eglGetConfigAttrib (gl_display, gl_config, EGL_RENDERABLE_TYPE, &v))
+    return FALSE;
+  if (!egl_find_attrib_value (attribs, EGL_RENDERABLE_TYPE, &gl_apis))
+    return FALSE;
+  vinfo = gl_version_info_lookup_by_api (v & gl_apis);
+  if (!vinfo)
+    return FALSE;
+  config->gles_version = vinfo->gles_version;
+  config->gl_api = vinfo->gles_version > 0 ? EGL_OPENGL_ES_API : EGL_OPENGL_API;
+  return TRUE;
+}
+
+static void
+egl_config_finalize (EglConfig * config)
+{
+  egl_object_replace (&config->display, NULL);
+}
+
+EglConfig *
+egl_config_new (EglDisplay * display, guint gles_version, GstVideoFormat format)
+{
+  EGLint attribs[2 * 6 + 1], *attrib = attribs;
+  const GstVideoFormatInfo *finfo;
+  const GlVersionInfo *vinfo;
+
+  g_return_val_if_fail (display != NULL, NULL);
+
+  finfo = gst_video_format_get_info (format);
+  if (!finfo || !GST_VIDEO_FORMAT_INFO_IS_RGB (finfo))
+    return NULL;
+
+  vinfo = gl_version_info_lookup (gles_version);
+  if (!vinfo)
+    return NULL;
+
+  *attrib++ = EGL_COLOR_BUFFER_TYPE;
+  *attrib++ = EGL_RGB_BUFFER;
+  *attrib++ = EGL_RED_SIZE;
+  *attrib++ = GST_VIDEO_FORMAT_INFO_DEPTH (finfo, GST_VIDEO_COMP_R);
+  *attrib++ = EGL_GREEN_SIZE;
+  *attrib++ = GST_VIDEO_FORMAT_INFO_DEPTH (finfo, GST_VIDEO_COMP_G);
+  *attrib++ = EGL_BLUE_SIZE;
+  *attrib++ = GST_VIDEO_FORMAT_INFO_DEPTH (finfo, GST_VIDEO_COMP_B);
+  *attrib++ = EGL_ALPHA_SIZE;
+  *attrib++ = GST_VIDEO_FORMAT_INFO_DEPTH (finfo, GST_VIDEO_COMP_A);
+  *attrib++ = EGL_RENDERABLE_TYPE;
+  *attrib++ = vinfo->gl_api_bit;
+  *attrib++ = EGL_NONE;
+  g_assert (attrib - attribs <= G_N_ELEMENTS (attribs));
+
+  return egl_config_new_with_attribs (display, attribs);
+}
+
+EglConfig *
+egl_config_new_with_attribs (EglDisplay * display, const EGLint * attribs)
+{
+  EglConfig *config;
+
+  g_return_val_if_fail (display != NULL, NULL);
+  g_return_val_if_fail (attribs != NULL, NULL);
+
+  config = egl_object_new0 (egl_config_class ());
+  if (!config || !egl_config_init (config, display, attribs))
+    goto error;
+  return config;
+
+error:
+  egl_object_replace (&config, NULL);
+  return NULL;
+}
+
+static EglConfig *
+egl_config_new_from_gl_context (EglDisplay * display, EGLContext gl_context)
+{
+  EGLDisplay const gl_display = display->base.handle.p;
+  EGLint attribs[3 * 2 + 1], *attrib = attribs;
+  EGLint config_id, api, v;
+  guint gles_version;
+  const GlVersionInfo *vinfo;
+
+  if (!eglQueryContext (gl_display, gl_context, EGL_CONFIG_ID, &config_id))
+    return NULL;
+  if (!eglQueryContext (gl_display, gl_context, EGL_CONTEXT_CLIENT_TYPE, &api))
+    return NULL;
+  if (!eglQueryContext (gl_display, gl_context, EGL_CONTEXT_CLIENT_VERSION, &v))
+    return NULL;
+
+  if (api == EGL_OPENGL_API)
+    gles_version = 0;
+  else if (api == EGL_OPENGL_ES_API)
+    gles_version = v;
+  else {
+    GST_ERROR ("unsupported EGL client API (%d)", api);
+    return NULL;
+  }
+
+  vinfo = gl_version_info_lookup (gles_version);
+  if (!vinfo)
+    return NULL;
+
+  *attrib++ = EGL_COLOR_BUFFER_TYPE;
+  *attrib++ = EGL_RGB_BUFFER;
+  *attrib++ = EGL_CONFIG_ID;
+  *attrib++ = config_id;
+  *attrib++ = EGL_RENDERABLE_TYPE;
+  *attrib++ = vinfo->gl_api_bit;
+  *attrib++ = EGL_NONE;
+  g_assert (attrib - attribs <= G_N_ELEMENTS (attribs));
+
+  return egl_config_new_with_attribs (display, attribs);
+}
+
+/* ------------------------------------------------------------------------- */
+// EGL Surface
+
+static void
+egl_surface_finalize (EglSurface * surface)
+{
+  if (surface->base.handle.p != EGL_NO_SURFACE && !surface->base.is_wrapped)
+    eglDestroySurface (surface->display->base.handle.p, surface->base.handle.p);
+  egl_object_replace (&surface->display, NULL);
+}
+
+static EglSurface *
+egl_surface_new_wrapped (EglDisplay * display, EGLSurface gl_surface)
+{
+  EglSurface *surface;
+
+  g_return_val_if_fail (display != NULL, NULL);
+
+  surface = egl_object_new (egl_surface_class ());
+  if (!surface)
+    return NULL;
+
+  surface->base.is_wrapped = TRUE;
+  surface->base.handle.p = gl_surface;
+  surface->display = egl_object_ref (display);
+  return surface;
+}
+
+/* ------------------------------------------------------------------------- */
+// EGL Context
+
+static void
+egl_context_state_get_current (EglContextState * cs);
+
+static gboolean
+egl_context_state_set_current (EglContextState * new_cs,
+    EglContextState * old_cs);
+
+static gboolean
+ensure_vtable (EglContext * ctx)
+{
+  if (!ctx->vtable) {
+    ctx->vtable = egl_vtable_new_cached (ctx->display,
+        ctx->config ? ctx->config->gles_version : 0);
+    if (!ctx->vtable)
+      return FALSE;
+  }
+  return TRUE;
+}
+
+static gboolean
+ensure_context (EglContext * ctx, EGLContext gl_parent_context)
+{
+  EGLDisplay *const gl_display = ctx->display->base.handle.p;
+  EGLContext gl_context = ctx->base.handle.p;
+  EGLint gles_attribs[3], *attribs = NULL;
+
+  if (!gl_context) {
+    if (ctx->config->gles_version >= 2) {
+      attribs = gles_attribs;
+      attribs[0] = EGL_CONTEXT_CLIENT_VERSION;
+      attribs[1] = ctx->config->gles_version;
+      attribs[2] = EGL_NONE;
+    }
+
+    gl_context = eglCreateContext (gl_display, ctx->config->base.handle.p,
+        gl_parent_context, attribs);
+    if (!gl_context)
+      goto error_create_context;
+    ctx->base.handle.p = gl_context;
+  }
+  return TRUE;
+
+  /* ERRORS */
+error_create_context:
+  GST_ERROR ("failed to create EGL context");
+  return FALSE;
+}
+
+static inline gboolean
+ensure_gl_is_surfaceless (EglContext * ctx)
+{
+  return ctx->vtable->has_EGL_KHR_surfaceless_context ||
+      (ctx->read_surface && ctx->draw_surface);
+}
+
+static gboolean
+ensure_gl_scene (EglContext * ctx)
+{
+  EglVTable *vtable;
+
+  if (!ensure_gl_is_surfaceless (ctx))
+    return FALSE;
+
+  if (ctx->base.is_valid)
+    return TRUE;
+
+  vtable = egl_context_get_vtable (ctx, TRUE);
+  if (!vtable)
+    return FALSE;
+
+  vtable->glClearColor (0.0, 0.0, 0.0, 1.0);
+  if (ctx->config && ctx->config->gles_version == 0)
+    vtable->glEnable (GL_TEXTURE_2D);
+  vtable->glDisable (GL_BLEND);
+  vtable->glDisable (GL_DEPTH_TEST);
+
+  ctx->base.is_valid = TRUE;
+  return TRUE;
+}
+
+/**
+ * egl_context_state_get_current:
+ * @cs: return location to the current #EglContextState
+ *
+ * Retrieves the current EGL context, display and surface to pack into
+ * the #EglContextState struct.
+ */
+static void
+egl_context_state_get_current (EglContextState * cs)
+{
+  cs->display = eglGetCurrentDisplay ();
+  cs->context = eglGetCurrentContext ();
+  if (cs->context) {
+    cs->read_surface = eglGetCurrentSurface (EGL_READ);
+    cs->draw_surface = eglGetCurrentSurface (EGL_DRAW);
+  } else {
+    cs->read_surface = EGL_NO_SURFACE;
+    cs->draw_surface = EGL_NO_SURFACE;
+  }
+}
+
+/**
+ * egl_context_state_set_current:
+ * @new_cs: the requested new #EglContextState
+ * @old_cs: return location to the context that was previously current
+ *
+ * Makes the @new_cs EGL context the current EGL rendering context of
+ * the calling thread, replacing the previously current context if
+ * there was one.
+ *
+ * If @old_cs is non %NULL, the previously current EGL context and
+ * surface are recorded.
+ *
+ * Return value: %TRUE on success
+ */
+static gboolean
+egl_context_state_set_current (EglContextState * new_cs,
+    EglContextState * old_cs)
+{
+  /* If display is NULL, this could be that new_cs was retrieved from
+     egl_context_state_get_current() with none set previously. If that case,
+     the other fields are also NULL and we don't return an error */
+  if (!new_cs->display)
+    return !new_cs->context && !new_cs->read_surface && !new_cs->draw_surface;
+
+  if (old_cs) {
+    if (old_cs == new_cs)
+      return TRUE;
+    egl_context_state_get_current (old_cs);
+    if (old_cs->display == new_cs->display &&
+        old_cs->context == new_cs->context &&
+        old_cs->read_surface == new_cs->read_surface &&
+        old_cs->draw_surface == new_cs->draw_surface)
+      return TRUE;
+  }
+  return eglMakeCurrent (new_cs->display, new_cs->draw_surface,
+      new_cs->read_surface, new_cs->context);
+}
+
+static gboolean
+egl_context_init (EglContext * ctx, EglDisplay * display, EglConfig * config,
+    EGLContext gl_parent_context)
+{
+  egl_object_replace (&ctx->display, display);
+  egl_object_replace (&ctx->config, config);
+
+  if (config)
+    eglBindAPI (config->gl_api);
+
+  if (!ensure_vtable (ctx))
+    return FALSE;
+  if (!ensure_context (ctx, gl_parent_context))
+    return FALSE;
+  return TRUE;
+}
+
+static void
+egl_context_finalize (EglContext * ctx)
+{
+  if (ctx->base.handle.p && !ctx->base.is_wrapped)
+    eglDestroyContext (ctx->display->base.handle.p, ctx->base.handle.p);
+  egl_object_replace (&ctx->read_surface, NULL);
+  egl_object_replace (&ctx->draw_surface, NULL);
+  egl_object_replace (&ctx->config, NULL);
+  egl_object_replace (&ctx->display, NULL);
+  egl_object_replace (&ctx->vtable, NULL);
+}
+
+typedef struct
+{
+  EglDisplay *display;
+  EglConfig *config;
+  EGLContext gl_parent_context;
+  EglContext *context;          /* result */
+} CreateContextArgs;
+
+static void
+do_egl_context_new (CreateContextArgs * args)
+{
+  EglContext *ctx;
+
+  ctx = egl_object_new0 (egl_context_class ());
+  if (!ctx || !egl_context_init (ctx, args->display, args->config,
+          args->gl_parent_context))
+    goto error;
+  args->context = ctx;
+  return;
+
+error:
+  egl_object_replace (&ctx, NULL);
+  args->context = NULL;
+}
+
+EglContext *
+egl_context_new (EglDisplay * display, EglConfig * config, EglContext * parent)
+{
+  CreateContextArgs args;
+
+  g_return_val_if_fail (display != NULL, NULL);
+  g_return_val_if_fail (config != NULL, NULL);
+
+  args.display = display;
+  args.config = config;
+  args.gl_parent_context = parent ? parent->base.handle.p : EGL_NO_CONTEXT;
+  if (!egl_display_run (display, (EglContextRunFunc) do_egl_context_new, &args))
+    return NULL;
+  return args.context;
+}
+
+EglContext *
+egl_context_new_wrapped (EglDisplay * display, EGLContext gl_context)
+{
+  CreateContextArgs args;
+  EglConfig *config;
+  gboolean success;
+
+  g_return_val_if_fail (display != NULL, NULL);
+  g_return_val_if_fail (gl_context != EGL_NO_CONTEXT, NULL);
+
+  config = egl_config_new_from_gl_context (display, gl_context);
+  if (!config)
+    return NULL;
+
+  args.display = display;
+  args.config = config;
+  args.gl_parent_context = gl_context;
+  success = egl_display_run (display, (EglContextRunFunc) do_egl_context_new,
+      &args);
+  egl_object_unref (config);
+  if (!success)
+    return NULL;
+  return args.context;
+}
+
+EglVTable *
+egl_context_get_vtable (EglContext * ctx, gboolean need_gl_symbols)
+{
+  g_return_val_if_fail (ctx != NULL, NULL);
+  g_return_val_if_fail (ctx->display->gl_thread == g_thread_self (), NULL);
+
+  if (!ensure_vtable (ctx))
+    return NULL;
+
+  if (need_gl_symbols && !(ctx->vtable->num_gl_symbols > 0 ||
+          egl_vtable_load_gl_symbols (ctx->vtable,
+              ctx->display->base.handle.p)))
+    return NULL;
+  return ctx->vtable;
+}
+
+static void
+egl_context_set_surface (EglContext * ctx, EglSurface * surface)
+{
+  g_return_if_fail (ctx != NULL);
+  g_return_if_fail (surface != NULL);
+
+  egl_object_replace (&ctx->read_surface, surface);
+  egl_object_replace (&ctx->draw_surface, surface);
+}
+
+gboolean
+egl_context_set_current (EglContext * ctx, gboolean activate,
+    EglContextState * old_cs)
+{
+  EglContextState cs, *new_cs;
+
+  g_return_val_if_fail (ctx != NULL, FALSE);
+  g_return_val_if_fail (ctx->display->gl_thread == g_thread_self (), FALSE);
+
+  if (activate) {
+    new_cs = &cs;
+    new_cs->display = ctx->display->base.handle.p;
+    new_cs->context = ctx->base.handle.p;
+    new_cs->draw_surface = ctx->draw_surface ?
+        ctx->draw_surface->base.handle.p : EGL_NO_SURFACE;
+    new_cs->read_surface = ctx->read_surface ?
+        ctx->read_surface->base.handle.p : EGL_NO_SURFACE;
+  } else if (old_cs) {
+    new_cs = old_cs;
+    old_cs = NULL;
+  } else {
+    new_cs = &cs;
+    new_cs->display = ctx->display->base.handle.p;
+    new_cs->context = EGL_NO_CONTEXT;
+    new_cs->draw_surface = EGL_NO_SURFACE;
+    new_cs->read_surface = EGL_NO_SURFACE;
+    old_cs = NULL;
+  }
+
+  if (!egl_context_state_set_current (new_cs, old_cs))
+    return FALSE;
+  if (activate && !ensure_gl_scene (ctx))
+    return FALSE;
+  return TRUE;
+}
+
+gboolean
+egl_context_run (EglContext * ctx, EglContextRunFunc func, gpointer args)
+{
+  g_return_val_if_fail (ctx != NULL, FALSE);
+  g_return_val_if_fail (func != NULL, FALSE);
+
+  return egl_display_run (ctx->display, func, args);
+}
+
+/* ------------------------------------------------------------------------- */
+// EGL Program
+
+static GLuint
+egl_compile_shader (EglContext * ctx, GLenum type, const char *source)
+{
+  EglVTable *const vtable = egl_context_get_vtable (ctx, TRUE);
+  GLuint shader;
+  GLint status;
+  char log[BUFSIZ];
+  GLsizei log_length;
+
+  shader = vtable->glCreateShader (type);
+  vtable->glShaderSource (shader, 1, &source, NULL);
+  vtable->glCompileShader (shader);
+  vtable->glGetShaderiv (shader, GL_COMPILE_STATUS, &status);
+  if (!status) {
+    GST_ERROR ("failed to compile %s shader",
+        type == GL_FRAGMENT_SHADER ? "fragment" :
+        type == GL_VERTEX_SHADER ? "vertex" : "<unknown>");
+
+    vtable->glGetShaderInfoLog (shader, sizeof (log), &log_length, log);
+    GST_ERROR ("info log: %s", log);
+    return 0;
+  }
+  return shader;
+}
+
+static void
+egl_program_finalize (EglProgram * program)
+{
+  EglVTable *const vtable = program->vtable;
+
+  if (program->base.handle.u)
+    vtable->glDeleteProgram (program->base.handle.u);
+  if (program->frag_shader)
+    vtable->glDeleteShader (program->frag_shader);
+  if (program->vert_shader)
+    vtable->glDeleteShader (program->vert_shader);
+  egl_object_replace (&program->vtable, NULL);
+}
+
+static gboolean
+egl_program_init (EglProgram * program, EglContext * ctx,
+    const gchar * frag_shader_text, const gchar * vert_shader_text)
+{
+  EglVTable *const vtable = egl_context_get_vtable (ctx, TRUE);
+  GLuint prog_id;
+  char msg[BUFSIZ];
+  GLsizei msglen;
+  GLint status;
+
+  if (ctx->config->gles_version == 1)
+    goto error_unsupported_gles_version;
+
+  program->vtable = egl_object_ref (vtable);
+
+  program->frag_shader =
+      egl_compile_shader (ctx, GL_FRAGMENT_SHADER, frag_shader_text);
+  if (!program->frag_shader)
+    return FALSE;
+
+  program->vert_shader =
+      egl_compile_shader (ctx, GL_VERTEX_SHADER, vert_shader_text);
+  if (!program->vert_shader)
+    return FALSE;
+
+  prog_id = vtable->glCreateProgram ();
+  if (!prog_id)
+    return FALSE;
+  program->base.handle.u = prog_id;
+
+  vtable->glAttachShader (prog_id, program->frag_shader);
+  vtable->glAttachShader (prog_id, program->vert_shader);
+  vtable->glBindAttribLocation (prog_id, 0, "position");
+  vtable->glBindAttribLocation (prog_id, 1, "texcoord");
+  vtable->glLinkProgram (prog_id);
+
+  vtable->glGetProgramiv (prog_id, GL_LINK_STATUS, &status);
+  if (!status)
+    goto error_link_program;
+  return TRUE;
+
+  /* ERRORS */
+error_unsupported_gles_version:
+  GST_ERROR ("unsupported shader with OpenGL|ES version 1");
+  return FALSE;
+error_link_program:
+  vtable->glGetProgramInfoLog (prog_id, sizeof (msg), &msglen, msg);
+  GST_ERROR ("failed to link program: %s", msg);
+  return FALSE;
+}
+
+EglProgram *
+egl_program_new (EglContext * ctx, const gchar * frag_shader_text,
+    const gchar * vert_shader_text)
+{
+  EglProgram *program;
+
+  g_return_val_if_fail (ctx != NULL, NULL);
+  g_return_val_if_fail (frag_shader_text != NULL, NULL);
+  g_return_val_if_fail (vert_shader_text != NULL, NULL);
+
+  program = egl_object_new0 (egl_program_class ());
+  if (!program
+      || !egl_program_init (program, ctx, frag_shader_text, vert_shader_text))
+    goto error;
+  return program;
+
+error:
+  egl_object_replace (&program, NULL);
+  return NULL;
+}
+
+/* ------------------------------------------------------------------------- */
+// EGL Window
+
+static gboolean
+egl_window_init (EglWindow * window, EglContext * ctx, gpointer native_window)
+{
+  EGLSurface gl_surface;
+
+  window->context = egl_context_new (ctx->display, ctx->config, ctx);
+  if (!window->context)
+    return FALSE;
+  ctx = window->context;
+
+  gl_surface = eglCreateWindowSurface (ctx->display->base.handle.p,
+      ctx->config->base.handle.p, (EGLNativeWindowType) native_window, NULL);
+  if (!gl_surface)
+    return FALSE;
+
+  window->surface = egl_surface_new_wrapped (ctx->display, gl_surface);
+  if (!window->surface)
+    goto error_create_surface;
+  window->base.handle.p = gl_surface;
+  window->base.is_wrapped = FALSE;
+
+  egl_context_set_surface (ctx, window->surface);
+  return TRUE;
+
+  /* ERRORS */
+error_create_surface:
+  GST_ERROR ("failed to create EGL wrapper surface");
+  eglDestroySurface (ctx->display->base.handle.p, gl_surface);
+  return FALSE;
+}
+
+static void
+egl_window_finalize (EglWindow * window)
+{
+  if (window->context && window->base.handle.p)
+    eglDestroySurface (window->context->display->base.handle.p,
+        window->base.handle.p);
+
+  egl_object_replace (&window->surface, NULL);
+  egl_object_replace (&window->context, NULL);
+}
+
+EglWindow *
+egl_window_new (EglContext * ctx, gpointer native_window)
+{
+  EglWindow *window;
+
+  g_return_val_if_fail (ctx != NULL, NULL);
+  g_return_val_if_fail (native_window != NULL, NULL);
+
+  window = egl_object_new0 (egl_window_class ());
+  if (!window || !egl_window_init (window, ctx, native_window))
+    goto error;
+  return window;
+
+error:
+  egl_object_replace (&window, NULL);
+  return NULL;
+}
+
+/* ------------------------------------------------------------------------- */
+// Misc utility functions
+
+void
+egl_matrix_set_identity (gfloat m[16])
+{
+#define MAT(m,r,c) (m)[(c) * 4 + (r)]
+  MAT(m,0,0) = 1.0; MAT(m,0,1) = 0.0; MAT(m,0,2) = 0.0; MAT(m,0,3) = 0.0;
+  MAT(m,1,0) = 0.0; MAT(m,1,1) = 1.0; MAT(m,1,2) = 0.0; MAT(m,1,3) = 0.0;
+  MAT(m,2,0) = 0.0; MAT(m,2,1) = 0.0; MAT(m,2,2) = 1.0; MAT(m,2,3) = 0.0;
+  MAT(m,3,0) = 0.0; MAT(m,3,1) = 0.0; MAT(m,3,2) = 0.0; MAT(m,3,3) = 1.0;
+#undef MAT
+}
+
+/**
+ * egl_create_texture:
+ * @ctx: the parent #EglContext object
+ * @target: the target to which the texture is bound
+ * @format: the format of the pixel data
+ * @width: the requested width, in pixels
+ * @height: the requested height, in pixels
+ *
+ * Creates a texture with the specified dimensions and @format. The
+ * internal format will be automatically derived from @format.
+ *
+ * Return value: the newly created texture name
+ */
+guint
+egl_create_texture (EglContext * ctx, guint target, guint format,
+    guint width, guint height)
+{
+  EglVTable *const vtable = egl_context_get_vtable (ctx, TRUE);
+  guint internal_format, texture, bytes_per_component;
+
+  internal_format = format;
+  switch (format) {
+    case GL_LUMINANCE:
+      bytes_per_component = 1;
+      break;
+    case GL_LUMINANCE_ALPHA:
+      bytes_per_component = 2;
+      break;
+    case GL_RGBA:
+    case GL_BGRA_EXT:
+      internal_format = GL_RGBA;
+      bytes_per_component = 4;
+      break;
+    default:
+      bytes_per_component = 0;
+      break;
+  }
+  g_assert (bytes_per_component > 0);
+
+  vtable->glGenTextures (1, &texture);
+  vtable->glBindTexture (target, texture);
+
+  if (width > 0 && height > 0)
+    vtable->glTexImage2D (target, 0, internal_format, width, height, 0,
+        format, GL_UNSIGNED_BYTE, NULL);
+
+  vtable->glTexParameteri (target, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+  vtable->glTexParameteri (target, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+  vtable->glTexParameteri (target, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+  vtable->glTexParameteri (target, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+  vtable->glPixelStorei (GL_UNPACK_ALIGNMENT, bytes_per_component);
+
+  return texture;
+}
+
+/**
+ * egl_destroy_texture:
+ * @ctx: the parent #EglContext object
+ * @texture: the texture name to delete
+ *
+ * Destroys the supplied @texture name.
+ */
+void
+egl_destroy_texture (EglContext * ctx, guint texture)
+{
+  EglVTable *const vtable = egl_context_get_vtable (ctx, TRUE);
+
+  vtable->glDeleteTextures (1, &texture);
+}
diff -Nru gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapiutils_egl.h gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapiutils_egl.h
--- gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapiutils_egl.h	1970-01-01 00:00:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapiutils_egl.h	2015-07-15 12:47:43.000000000 +0000
@@ -0,0 +1,251 @@
+/*
+ * gstvaapiutils_egl.h - EGL utilities
+ *
+ * Copyright (C) 2014 Intel Corporation
+ *   Author: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1
+ * of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301
+ */
+
+#ifndef GST_VAAPI_UTILS_EGL_H
+#define GST_VAAPI_UTILS_EGL_H
+
+#include <gmodule.h>
+#include <gst/gstinfo.h>
+#include <gst/video/video-format.h>
+#include "egl_compat.h"
+#include "gstvaapiminiobject.h"
+
+GST_DEBUG_CATEGORY_EXTERN (gst_debug_vaapidisplay_egl);
+#define GST_CAT_DEFAULT gst_debug_vaapidisplay_egl
+
+typedef union egl_handle_s                      EglHandle;
+typedef struct egl_object_s                     EglObject;
+typedef struct egl_object_class_s               EglObjectClass;
+typedef struct egl_vtable_s                     EglVTable;
+typedef struct egl_display_s                    EglDisplay;
+typedef struct egl_config_s                     EglConfig;
+typedef struct egl_context_state_s              EglContextState;
+typedef struct egl_context_s                    EglContext;
+typedef struct egl_surface_s                    EglSurface;
+typedef struct egl_program_s                    EglProgram;
+typedef struct egl_window_s                     EglWindow;
+
+#define EGL_PROTO_BEGIN(NAME, TYPE, EXTENSION) \
+  typedef TYPE (*GL_PROTO_GEN_CONCAT3(Egl,NAME,Proc))
+#define EGL_PROTO_END()                         ;
+#define GL_PROTO_BEGIN(NAME, TYPE, EXTENSION) \
+  typedef TYPE (*GL_PROTO_GEN_CONCAT3(Gl,NAME,Proc))
+#define GL_PROTO_ARG_LIST(...)                  (__VA_ARGS__)
+#define GL_PROTO_ARG(NAME, TYPE)                TYPE NAME
+#define GL_PROTO_END()                          ;
+#include "egl_vtable.h"
+
+union egl_handle_s
+{
+  gpointer p;
+  guintptr u;
+  gintptr i;
+};
+
+struct egl_object_s
+{
+  /*< private >*/
+  GstVaapiMiniObject parent_instance;
+
+  EglHandle handle;
+  guint is_wrapped:1;
+  guint is_valid:1;
+};
+
+struct egl_object_class_s
+{
+  /*< private >*/
+  GstVaapiMiniObjectClass parent_class;
+};
+
+struct egl_vtable_s
+{
+  EglObject base;
+
+  gchar **egl_extensions;
+  guint num_egl_symbols;
+  gchar **gl_extensions;
+  guint num_gl_symbols;
+  guint gles_version;
+
+#define EGL_PROTO_BEGIN(NAME, TYPE, EXTENSION) \
+  GL_PROTO_BEGIN_I(NAME, TYPE, EXTENSION, Egl, egl)
+#define GL_PROTO_BEGIN(NAME, TYPE, EXTENSION) \
+  GL_PROTO_BEGIN_I(NAME, TYPE, EXTENSION,  Gl,  gl)
+#define GL_PROTO_BEGIN_I(NAME, TYPE, EXTENSION, Prefix, prefix) \
+  GL_PROTO_GEN_CONCAT3(Prefix,NAME,Proc) GL_PROTO_GEN_CONCAT(prefix,NAME);
+#include "egl_vtable.h"
+
+#define EGL_DEFINE_EXTENSION(EXTENSION) \
+  GL_DEFINE_EXTENSION_I(EXTENSION, EGL)
+#define GL_DEFINE_EXTENSION(EXTENSION) \
+  GL_DEFINE_EXTENSION_I(EXTENSION,  GL)
+#define GL_DEFINE_EXTENSION_I(EXTENSION, PREFIX) \
+  guint GL_PROTO_GEN_CONCAT4(has_,PREFIX,_,EXTENSION);
+#include "egl_vtable.h"
+};
+
+struct egl_display_s
+{
+  EglObject base;
+
+  gchar *gl_vendor_string;
+  gchar *gl_version_string;
+  gchar *gl_apis_string;
+  guint gl_apis;                /* EGL_*_BIT mask */
+
+  GMutex mutex;
+  GThread *gl_thread;
+  GCond gl_thread_ready;
+  volatile gboolean gl_thread_cancel;
+  GAsyncQueue *gl_queue;
+};
+
+struct egl_config_s
+{
+  EglObject base;
+
+  EglDisplay *display;
+  guint gl_api;                 /* EGL_*_API value */
+  guint gles_version;
+  gint config_id;
+  gint visual_id;
+};
+
+typedef void (*EglContextRunFunc) (gpointer args);
+
+struct egl_context_state_s
+{
+  EGLDisplay display;
+  EGLContext context;
+  EGLSurface read_surface;
+  EGLSurface draw_surface;
+};
+
+struct egl_context_s
+{
+  EglObject base;
+
+  EglVTable *vtable;
+  EglDisplay *display;
+  EglConfig *config;
+  EglSurface *read_surface;
+  EglSurface *draw_surface;
+};
+
+struct egl_surface_s
+{
+  EglObject base;
+
+  EglDisplay *display;
+};
+
+/* Defined to the maximum number of uniforms for a shader program */
+#define EGL_MAX_UNIFORMS 16
+
+struct egl_program_s
+{
+  EglObject base;
+
+  EglVTable *vtable;
+  guint frag_shader;
+  guint vert_shader;
+  gint uniforms[EGL_MAX_UNIFORMS];
+};
+
+struct egl_window_s
+{
+  EglObject base;
+
+  EglContext *context;
+  EglSurface *surface;
+};
+
+#define egl_object_ref(obj) \
+  ((gpointer)gst_vaapi_mini_object_ref ((GstVaapiMiniObject *)(obj)))
+#define egl_object_unref(obj) \
+  gst_vaapi_mini_object_unref ((GstVaapiMiniObject *)(obj))
+#define egl_object_replace(old_obj_ptr, new_obj) \
+  gst_vaapi_mini_object_replace ((GstVaapiMiniObject **)(old_obj_ptr), \
+      (GstVaapiMiniObject *)(new_obj))
+
+G_GNUC_INTERNAL
+EglDisplay *
+egl_display_new (gpointer native_display);
+
+G_GNUC_INTERNAL
+EglDisplay *
+egl_display_new_wrapped (EGLDisplay gl_display);
+
+G_GNUC_INTERNAL
+EglConfig *
+egl_config_new (EglDisplay * display, guint gles_version,
+    GstVideoFormat format);
+
+G_GNUC_INTERNAL
+EglConfig *
+egl_config_new_with_attribs (EglDisplay * display, const EGLint * attribs);
+
+G_GNUC_INTERNAL
+EglContext *
+egl_context_new (EglDisplay * display, EglConfig * config, EglContext * parent);
+
+G_GNUC_INTERNAL
+EglContext *
+egl_context_new_wrapped (EglDisplay * display, EGLContext gl_context);
+
+G_GNUC_INTERNAL
+EglVTable *
+egl_context_get_vtable (EglContext * ctx, gboolean need_gl_symbols);
+
+G_GNUC_INTERNAL
+gboolean
+egl_context_set_current (EglContext * ctx, gboolean activate,
+    EglContextState * old_cs);
+
+G_GNUC_INTERNAL
+gboolean
+egl_context_run (EglContext * ctx, EglContextRunFunc func, gpointer args);
+
+G_GNUC_INTERNAL
+EglProgram *
+egl_program_new (EglContext * ctx, const gchar * frag_shader_text,
+    const gchar * vert_shader_text);
+
+G_GNUC_INTERNAL
+EglWindow *
+egl_window_new (EglContext * ctx, gpointer native_window);
+
+G_GNUC_INTERNAL
+guint
+egl_create_texture (EglContext * ctx, guint target, guint format,
+    guint width, guint height);
+
+G_GNUC_INTERNAL
+void
+egl_destroy_texture (EglContext * ctx, guint texture);
+
+G_GNUC_INTERNAL
+void
+egl_matrix_set_identity (gfloat m[16]);
+
+#endif /* GST_VAAPI_UTILS_EGL_H */
diff -Nru gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapiutils_h265.c gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapiutils_h265.c
--- gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapiutils_h265.c	1970-01-01 00:00:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapiutils_h265.c	2015-07-15 12:47:43.000000000 +0000
@@ -0,0 +1,353 @@
+/*
+ *  gstvaapiutils_h265.c - H.265 related utilities
+ *
+ *  Copyright (C) 2015 Intel Corporation
+ *    Author: Sreerenj Balachandran <sreerenj.balachandran@intel.com>
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public License
+ *  as published by the Free Software Foundation; either version 2.1
+ *  of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free
+ *  Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ *  Boston, MA 02110-1301 USA
+ */
+
+#include "sysdeps.h"
+#include <gst/codecparsers/gsth265parser.h>
+#include "gstvaapiutils_h265_priv.h"
+
+struct map
+{
+  guint value;
+  const gchar *name;
+};
+
+/* Profile string map */
+static const struct map gst_vaapi_h265_profile_map[] = {
+/* *INDENT-OFF* */
+  { GST_VAAPI_PROFILE_H265_MAIN,                 "main"                 },
+  { GST_VAAPI_PROFILE_H265_MAIN10,               "main-10"              },
+  { GST_VAAPI_PROFILE_H265_MAIN_STILL_PICTURE,   "main-still-picture"   },
+  { 0, NULL }
+/* *INDENT-ON* */
+};
+
+/* Tier string map */
+static const struct map gst_vaapi_h265_tier_map[] = {
+/* *INDENT-OFF* */
+  { GST_VAAPI_TIER_H265_MAIN,    "main" },
+  { GST_VAAPI_TIER_H265_HIGH,    "high"},
+  { GST_VAAPI_TIER_H265_UNKNOWN, "unknown"}
+/* *INDENT-ON* */
+};
+
+/* Level string map */
+static const struct map gst_vaapi_h265_level_map[] = {
+/* *INDENT-OFF* */
+  { GST_VAAPI_LEVEL_H265_L1,    "1"     },
+  { GST_VAAPI_LEVEL_H265_L2,    "2"     },
+  { GST_VAAPI_LEVEL_H265_L2_1,  "2.1"   },
+  { GST_VAAPI_LEVEL_H265_L3,    "3"     },
+  { GST_VAAPI_LEVEL_H265_L3_1,  "3.1"   },
+  { GST_VAAPI_LEVEL_H265_L4,    "4"     },
+  { GST_VAAPI_LEVEL_H265_L4_1,  "4.1"   },
+  { GST_VAAPI_LEVEL_H265_L5,    "5"     },
+  { GST_VAAPI_LEVEL_H265_L5_1,  "5.1"   },
+  { GST_VAAPI_LEVEL_H265_L5_2,  "5.2"   },
+  { GST_VAAPI_LEVEL_H265_L6,    "6"     },
+  { GST_VAAPI_LEVEL_H265_L6_1,  "6.1"   },
+  { GST_VAAPI_LEVEL_H265_L6_2,  "6.2"   },
+  { 0, NULL }
+/* *INDENT-ON* */
+};
+
+/* Table A-1 - Level limits */
+/* *INDENT-OFF* */
+static const GstVaapiH265LevelLimits gst_vaapi_h265_level_limits[] = {
+  /* level                     idc   MaxLumaPs  MCPBMt  MCPBHt MSlSeg MTR MTC   MaxLumaSr   MBRMt   MBRHt MinCr*/
+  { GST_VAAPI_LEVEL_H265_L1,    30,     36864,    350,      0,    16,  1,  1,     552960,    128,      0,  2},
+  { GST_VAAPI_LEVEL_H265_L2,    60,    122880,   1500,      0,    16,  1,  1,    3686400,   1500,      0,  2},
+  { GST_VAAPI_LEVEL_H265_L2_1,  63,    245760,   3000,      0,    20,  1,  1,    7372800,   3000,      0,  2},
+  { GST_VAAPI_LEVEL_H265_L3,    90,    552960,   6000,      0,    30,  2,  2,   16588800,   6000,      0,  2},
+  { GST_VAAPI_LEVEL_H265_L3_1,  93,    983040,  10000,      0,    40,  3,  3,   33177600,  10000,      0,  2},
+  { GST_VAAPI_LEVEL_H265_L4,    120,  2228224,  12000,  30000,    75,  5,  5,   66846720,  12000,  30000,  4},
+  { GST_VAAPI_LEVEL_H265_L4_1,  123,  2228224,  20000,  50000,    75,  5,  5,  133693440,  20000,  50000,  4},
+  { GST_VAAPI_LEVEL_H265_L5,    150,  8912896,  25000, 100000,   200, 11, 10,  267386880,  25000, 100000,  6},
+  { GST_VAAPI_LEVEL_H265_L5_1,  153,  8912896,  40000, 160000,   200, 11, 10,  534773760,  40000, 160000,  8},
+  { GST_VAAPI_LEVEL_H265_L5_2,  156,  8912896,  60000, 240000,   200, 11, 10, 1069547520,  60000, 240000,  8},
+  { GST_VAAPI_LEVEL_H265_L6,    180, 35651584,  60000, 240000,   600, 22, 20, 1069547520,  60000, 240000,  8},
+  { GST_VAAPI_LEVEL_H265_L6_1,  183, 35651584, 120000, 480000,   600, 22, 20, 2139095040, 120000, 480000,  8},
+  { GST_VAAPI_LEVEL_H265_L6_2,  186, 35651584, 240000, 800000,   600, 22, 20, 4278190080, 240000, 800000,  6},
+  { 0, }
+};
+/* *INDENT-ON* */
+
+/* Lookup value in map */
+static const struct map *
+map_lookup_value (const struct map *m, guint value)
+{
+  g_return_val_if_fail (m != NULL, NULL);
+
+  for (; m->name != NULL; m++) {
+    if (m->value == value)
+      return m;
+  }
+  return NULL;
+}
+
+/* Lookup name in map */
+static const struct map *
+map_lookup_name (const struct map *m, const gchar * name)
+{
+  g_return_val_if_fail (m != NULL, NULL);
+
+  if (!name)
+    return NULL;
+
+  for (; m->name != NULL; m++) {
+    if (strcmp (m->name, name) == 0)
+      return m;
+  }
+  return NULL;
+}
+
+/** Returns a relative score for the supplied GstVaapiProfile */
+guint
+gst_vaapi_utils_h265_get_profile_score (GstVaapiProfile profile)
+{
+  const struct map *const m =
+      map_lookup_value (gst_vaapi_h265_profile_map, profile);
+
+  return m ? 1 + (m - gst_vaapi_h265_profile_map) : 0;
+}
+
+/** Returns GstVaapiProfile from H.265 profile_idc value */
+GstVaapiProfile
+gst_vaapi_utils_h265_get_profile (guint8 profile_idc)
+{
+  GstVaapiProfile profile;
+
+  switch (profile_idc) {
+    case GST_H265_PROFILE_MAIN:
+      profile = GST_VAAPI_PROFILE_H265_MAIN;
+      break;
+    case GST_H265_PROFILE_MAIN_10:
+      profile = GST_VAAPI_PROFILE_H265_MAIN10;
+      break;
+    case GST_H265_PROFILE_MAIN_STILL_PICTURE:
+      profile = GST_VAAPI_PROFILE_H265_MAIN_STILL_PICTURE;
+      break;
+    default:
+      g_debug ("unsupported profile_idc value");
+      profile = GST_VAAPI_PROFILE_UNKNOWN;
+      break;
+  }
+  return profile;
+}
+
+/** Returns H.265 profile_idc value from GstVaapiProfile */
+guint8
+gst_vaapi_utils_h265_get_profile_idc (GstVaapiProfile profile)
+{
+  guint8 profile_idc;
+
+  switch (profile) {
+    case GST_VAAPI_PROFILE_H265_MAIN:
+      profile_idc = GST_H265_PROFILE_MAIN;
+      break;
+    case GST_VAAPI_PROFILE_H265_MAIN10:
+      profile_idc = GST_H265_PROFILE_MAIN_10;
+      break;
+    case GST_VAAPI_PROFILE_H265_MAIN_STILL_PICTURE:
+      profile_idc = GST_H265_PROFILE_MAIN_STILL_PICTURE;
+      break;
+    default:
+      g_debug ("unsupported GstVaapiProfile value");
+      profile_idc = 0;
+      break;
+  }
+  return profile_idc;
+}
+
+/** Returns GstVaapiProfile from a string representation */
+GstVaapiProfile
+gst_vaapi_utils_h265_get_profile_from_string (const gchar * str)
+{
+  const struct map *const m = map_lookup_name (gst_vaapi_h265_profile_map, str);
+
+  return m ? (GstVaapiProfile) m->value : GST_VAAPI_PROFILE_UNKNOWN;
+}
+
+/** Returns a string representation for the supplied H.265 profile */
+const gchar *
+gst_vaapi_utils_h265_get_profile_string (GstVaapiProfile profile)
+{
+  const struct map *const m =
+      map_lookup_value (gst_vaapi_h265_profile_map, profile);
+
+  return m ? m->name : NULL;
+}
+
+/** Returns GstVaapiLevelH265 from H.265 level_idc value */
+GstVaapiLevelH265
+gst_vaapi_utils_h265_get_level (guint8 level_idc)
+{
+  const GstVaapiH265LevelLimits *llp;
+
+  for (llp = gst_vaapi_h265_level_limits; llp->level != 0; llp++) {
+    if (llp->level_idc == level_idc)
+      return llp->level;
+  }
+  g_debug ("unsupported level_idc value");
+  return (GstVaapiLevelH265) 0;
+}
+
+/** Returns H.265 level_idc value from GstVaapiLevelH265 */
+guint8
+gst_vaapi_utils_h265_get_level_idc (GstVaapiLevelH265 level)
+{
+  const GstVaapiH265LevelLimits *const llp =
+      gst_vaapi_utils_h265_get_level_limits (level);
+
+  return llp ? llp->level_idc : 0;
+}
+
+/** Returns GstVaapiLevelH265 from a string representation */
+GstVaapiLevelH265
+gst_vaapi_utils_h265_get_level_from_string (const gchar * str)
+{
+  gint v, level_idc = 0;
+
+  if (!str || !str[0])
+    goto not_found;
+
+  v = g_ascii_digit_value (str[0]);
+  if (v < 0)
+    goto not_found;
+  level_idc = v * 30;
+
+  switch (str[1]) {
+    case '\0':
+      break;
+    case '.':
+      v = g_ascii_digit_value (str[2]);
+      if (v < 0 || str[3] != '\0')
+        goto not_found;
+      level_idc += v;
+      break;
+    default:
+      goto not_found;
+  }
+  return gst_vaapi_utils_h265_get_level (level_idc);
+
+not_found:
+  return (GstVaapiLevelH265) 0;
+}
+
+/** Returns a string representation for the supplied H.265 level */
+const gchar *
+gst_vaapi_utils_h265_get_level_string (GstVaapiLevelH265 level)
+{
+  if (level < GST_VAAPI_LEVEL_H265_L1 || level > GST_VAAPI_LEVEL_H265_L6_2)
+    return NULL;
+  return gst_vaapi_h265_level_map[level - GST_VAAPI_LEVEL_H265_L1].name;
+}
+
+/** Returns level limits as specified in Table A-1 of the H.265 standard */
+const GstVaapiH265LevelLimits *
+gst_vaapi_utils_h265_get_level_limits (GstVaapiLevelH265 level)
+{
+  if (level < GST_VAAPI_LEVEL_H265_L1 || level > GST_VAAPI_LEVEL_H265_L6_2)
+    return NULL;
+  return &gst_vaapi_h265_level_limits[level - GST_VAAPI_LEVEL_H265_L1];
+}
+
+/** Returns the Table A-1 & A-2 specification */
+const GstVaapiH265LevelLimits *
+gst_vaapi_utils_h265_get_level_limits_table (guint * out_length_ptr)
+{
+  if (out_length_ptr)
+    *out_length_ptr = G_N_ELEMENTS (gst_vaapi_h265_level_limits) - 1;
+  return gst_vaapi_h265_level_limits;
+}
+
+/** Returns GstVaapiChromaType from H.265 chroma_format_idc value */
+GstVaapiChromaType
+gst_vaapi_utils_h265_get_chroma_type (guint chroma_format_idc)
+{
+  GstVaapiChromaType chroma_type;
+
+  switch (chroma_format_idc) {
+    case 0:
+      chroma_type = GST_VAAPI_CHROMA_TYPE_YUV400;
+      break;
+    case 1:
+      chroma_type = GST_VAAPI_CHROMA_TYPE_YUV420;
+      break;
+    case 2:
+      chroma_type = GST_VAAPI_CHROMA_TYPE_YUV422;
+      break;
+    case 3:
+      chroma_type = GST_VAAPI_CHROMA_TYPE_YUV444;
+      break;
+    default:
+      g_debug ("unsupported chroma_format_idc value");
+      chroma_type = (GstVaapiChromaType) 0;
+      break;
+  }
+  return chroma_type;
+}
+
+/** Returns H.265 chroma_format_idc value from GstVaapiChromaType */
+guint
+gst_vaapi_utils_h265_get_chroma_format_idc (GstVaapiChromaType chroma_type)
+{
+  guint chroma_format_idc;
+
+  switch (chroma_type) {
+    case GST_VAAPI_CHROMA_TYPE_YUV400:
+      chroma_format_idc = 0;
+      break;
+    case GST_VAAPI_CHROMA_TYPE_YUV420:
+      chroma_format_idc = 1;
+      break;
+    case GST_VAAPI_CHROMA_TYPE_YUV422:
+      chroma_format_idc = 2;
+      break;
+    case GST_VAAPI_CHROMA_TYPE_YUV444:
+      chroma_format_idc = 3;
+      break;
+    default:
+      g_debug ("unsupported GstVaapiChromaType value");
+      chroma_format_idc = 1;
+      break;
+  }
+  return chroma_format_idc;
+}
+
+/** Returns GstVaapiTierH265 from a string representation */
+GstVaapiTierH265
+gst_vaapi_utils_h265_get_tier_from_string (const gchar * str)
+{
+  const struct map *const m = map_lookup_name (gst_vaapi_h265_tier_map, str);
+
+  return m ? (GstVaapiTierH265) m->value : GST_VAAPI_TIER_H265_UNKNOWN;
+}
+
+/** Returns a string representation for the supplied H.265 tier */
+const gchar *
+gst_vaapi_utils_h265_get_tier_string (GstVaapiTierH265 tier)
+{
+  const struct map *const m =
+      map_lookup_value (gst_vaapi_h265_tier_map, tier);
+
+  return m ? m->name : NULL;
+}
diff -Nru gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapiutils_h265.h gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapiutils_h265.h
--- gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapiutils_h265.h	1970-01-01 00:00:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapiutils_h265.h	2015-07-15 12:47:43.000000000 +0000
@@ -0,0 +1,110 @@
+/*
+ *  gstvaapiutils_h265.h - H.265 related utilities
+ *
+ *  Copyright (C) 2015 Intel Corporation
+ *    Author: Sreerenj Balachandran <sreerenj.balachandran@intel.com>
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public License
+ *  as published by the Free Software Foundation; either version 2.1
+ *  of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free
+ *  Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ *  Boston, MA 02110-1301 USA
+ */
+
+#ifndef GST_VAAPI_UTILS_H265_H
+#define GST_VAAPI_UTILS_H265_H
+
+#include <va/va.h>
+#include <gst/vaapi/gstvaapiprofile.h>
+#include <gst/vaapi/gstvaapisurface.h>
+
+G_BEGIN_DECLS
+
+/**
+ * GstVaapiLevelH265:
+ * @GST_VAAPI_LEVEL_H265_L1: H.265 level 1.
+ * @GST_VAAPI_LEVEL_H265_L2: H.265 level 2.
+ * @GST_VAAPI_LEVEL_H265_L2_1: H.265 level 2.1.
+ * @GST_VAAPI_LEVEL_H265_L3: H.265 level 3.
+ * @GST_VAAPI_LEVEL_H265_L3_1: H.265 level 3.1.
+ * @GST_VAAPI_LEVEL_H265_L4: H.265 level 4.
+ * @GST_VAAPI_LEVEL_H265_L4_1: H.265 level 4.1.
+ * @GST_VAAPI_LEVEL_H265_L5: H.265 level 5.
+ * @GST_VAAPI_LEVEL_H265_L5_1: H.265 level 5.1.
+ * @GST_VAAPI_LEVEL_H265_L5_2: H.265 level 5.2.
+ * @GST_VAAPI_LEVEL_H265_L6: H.265 level 6.
+ * @GST_VAAPI_LEVEL_H265_L6_1: H.265 level 6.1.
+ * @GST_VAAPI_LEVEL_H265_L6_2: H.265 level 6.2.
+ *
+ * The set of all levels for #GstVaapiLevelH265.
+ */
+typedef enum {
+  GST_VAAPI_LEVEL_H265_L1 = 1,
+  GST_VAAPI_LEVEL_H265_L2,
+  GST_VAAPI_LEVEL_H265_L2_1,
+  GST_VAAPI_LEVEL_H265_L3,
+  GST_VAAPI_LEVEL_H265_L3_1,
+  GST_VAAPI_LEVEL_H265_L4,
+  GST_VAAPI_LEVEL_H265_L4_1,
+  GST_VAAPI_LEVEL_H265_L5,
+  GST_VAAPI_LEVEL_H265_L5_1,
+  GST_VAAPI_LEVEL_H265_L5_2,
+  GST_VAAPI_LEVEL_H265_L6,
+  GST_VAAPI_LEVEL_H265_L6_1,
+  GST_VAAPI_LEVEL_H265_L6_2,
+} GstVaapiLevelH265;
+
+/**
+ * GstVaapiTierH265:
+ * GST_VAAPI_TIER_H265_MAIN: H265 Tier 0
+ * GST_VAAPI_TIER_H265_HIGH: H265 Tier 1
+ * GST_VAAPI_TIER_H265_UNKNOWN: Unknown Tier
+ *
+ * The set of all Tier for #GstVaapiTierH265.
+ */
+typedef enum {
+  GST_VAAPI_TIER_H265_MAIN,
+  GST_VAAPI_TIER_H265_HIGH,
+  GST_VAAPI_TIER_H265_UNKNOWN = -1
+} GstVaapiTierH265;
+
+/* Returns a relative score for the supplied GstVaapiProfile */
+guint
+gst_vaapi_utils_h265_get_profile_score (GstVaapiProfile profile);
+
+/* Returns GstVaapiProfile from a string representation */
+GstVaapiProfile
+gst_vaapi_utils_h265_get_profile_from_string (const gchar * str);
+
+/* Returns a string representation for the supplied H.265 profile */
+const gchar *
+gst_vaapi_utils_h265_get_profile_string (GstVaapiProfile profile);
+
+/* Returns GstVaapiLevelH265 from a string representation */
+GstVaapiLevelH265
+gst_vaapi_utils_h265_get_level_from_string (const gchar * str);
+
+/* Returns a string representation for the supplied H.265 level */
+const gchar *
+gst_vaapi_utils_h265_get_level_string (GstVaapiLevelH265 level);
+
+/* Returns GstVaapiTierH265 from a string representation */
+GstVaapiTierH265
+gst_vaapi_utils_h265_get_tier_from_string (const gchar * str);
+
+/* Returns a string representation for the supplied H.265 Tier */
+const gchar *
+gst_vaapi_utils_h265_get_tier_string (GstVaapiTierH265 tier);
+
+G_END_DECLS
+
+#endif /* GST_VAAPI_UTILS_H265_H */
diff -Nru gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapiutils_h265_priv.h gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapiutils_h265_priv.h
--- gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapiutils_h265_priv.h	1970-01-01 00:00:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapiutils_h265_priv.h	2015-07-15 12:47:43.000000000 +0000
@@ -0,0 +1,105 @@
+/*
+ *  gstvaapiutils_h265_priv.h - H.265 related utilities
+ *
+ *  Copyright (C) 2015 Intel Corporation
+ *    Author: Sreerenj Balachandran <sreerenj.balachandran@intel.com>
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public License
+ *  as published by the Free Software Foundation; either version 2.1
+ *  of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free
+ *  Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ *  Boston, MA 02110-1301 USA
+ */
+
+#ifndef GST_VAAPI_UTILS_H265_PRIV_H
+#define GST_VAAPI_UTILS_H265_PRIV_H
+
+#include "gstvaapiutils_h265.h"
+#include "libgstvaapi_priv_check.h"
+
+G_BEGIN_DECLS
+
+/**
+ * GstVaapiH265LevelLimits:
+ * @level: the #GstVaapiLevelH265
+ * @level_idc: the H.265 level_idc value
+ * @MaxLumaPs: the maximum luma picture size
+ * @MaxCPBTierMain: the maximum CPB size for Main tier(kbits)
+ * @MaxCPBTierHigh: the maximum CPB size for High tier(kbits)
+ * @MaxSliceSegPic: the maximum slice segments per picture
+ * @MaxTileRows: the maximum number of Tile Rows
+ * @MaxTileColumns: the maximum number of Tile Columns
+ * @MaxLumaSr: the maximum luma sample rate (samples/sec)
+ * @MaxBRTierMain: the maximum video bit rate for Main Tier(kbps)
+ * @MaxBRTierHigh: the maximum video bit rate for High Tier(kbps)
+ * @MinCr: the mimimum compression ratio
+ *
+ * The data structure that describes the limits of an H.265 level.
+ */
+typedef struct {
+  GstVaapiLevelH265 level;
+  guint8 level_idc;
+  guint32 MaxLumaPs;
+  guint32 MaxCPBTierMain;
+  guint32 MaxCPBTierHigh;
+  guint32 MaxSliceSegPic;
+  guint32 MaxTileRows;
+  guint32 MaxTileColumns;
+  guint32 MaxLumaSr;
+  guint32 MaxBRTierMain;
+  guint32 MaxBRTierHigh;
+  guint32 MinCr;
+} GstVaapiH265LevelLimits;
+
+/* Returns GstVaapiProfile from H.265 profile_idc value */
+G_GNUC_INTERNAL
+GstVaapiProfile
+gst_vaapi_utils_h265_get_profile (guint8 profile_idc);
+
+/* Returns H.265 profile_idc value from GstVaapiProfile */
+G_GNUC_INTERNAL
+guint8
+gst_vaapi_utils_h265_get_profile_idc (GstVaapiProfile profile);
+
+/* Returns GstVaapiLevelH265 from H.265 level_idc value */
+G_GNUC_INTERNAL
+GstVaapiLevelH265
+gst_vaapi_utils_h265_get_level (guint8 level_idc);
+
+/* Returns H.265 level_idc value from GstVaapiLevelH265 */
+G_GNUC_INTERNAL
+guint8
+gst_vaapi_utils_h265_get_level_idc (GstVaapiLevelH265 level);
+
+/* Returns level limits as specified in Table A-1 of the H.265 standard */
+G_GNUC_INTERNAL
+const GstVaapiH265LevelLimits *
+gst_vaapi_utils_h265_get_level_limits (GstVaapiLevelH265 level);
+
+/* Returns the Table A-1 specification */
+G_GNUC_INTERNAL
+const GstVaapiH265LevelLimits *
+gst_vaapi_utils_h265_get_level_limits_table (guint * out_length_ptr);
+
+/* Returns GstVaapiChromaType from H.265 chroma_format_idc value */
+G_GNUC_INTERNAL
+GstVaapiChromaType
+gst_vaapi_utils_h265_get_chroma_type (guint chroma_format_idc);
+
+/* Returns H.265 chroma_format_idc value from GstVaapiChromaType */
+G_GNUC_INTERNAL
+guint
+gst_vaapi_utils_h265_get_chroma_format_idc (GstVaapiChromaType chroma_type);
+
+G_END_DECLS
+
+#endif /* GST_VAAPI_UTILS_H265_PRIV_H */
diff -Nru gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapivalue.c gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapivalue.c
--- gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapivalue.c	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapivalue.c	2015-07-15 12:47:43.000000000 +0000
@@ -32,172 +32,175 @@
 #include "gstvaapivalue.h"
 
 static gpointer
-default_copy_func(gpointer data)
+default_copy_func (gpointer data)
 {
-    return data;
+  return data;
 }
 
 static void
-default_free_func(gpointer data)
+default_free_func (gpointer data)
 {
 }
 
 /* --- GstVaapiPoint --- */
 
 GType
-gst_vaapi_point_get_type(void)
+gst_vaapi_point_get_type (void)
 {
-    static volatile gsize g_type = 0;
+  static volatile gsize g_type = 0;
 
-    if (g_once_init_enter(&g_type)) {
-        GType type = g_boxed_type_register_static(
-            g_intern_static_string("GstVaapiPoint"),
-            default_copy_func, default_free_func);
-        g_once_init_leave(&g_type, type);
-    }
-    return g_type;
+  if (g_once_init_enter (&g_type)) {
+    GType type =
+        g_boxed_type_register_static (g_intern_static_string ("GstVaapiPoint"),
+        default_copy_func, default_free_func);
+    g_once_init_leave (&g_type, type);
+  }
+  return g_type;
 }
 
 /* --- GstVaapiRectangle --- */
 
 GType
-gst_vaapi_rectangle_get_type(void)
+gst_vaapi_rectangle_get_type (void)
 {
-    static volatile gsize g_type = 0;
+  static volatile gsize g_type = 0;
 
-    if (g_once_init_enter(&g_type)) {
-        GType type = g_boxed_type_register_static(
-            g_intern_static_string("GstVaapiRectangle"),
-            default_copy_func, default_free_func);
-        g_once_init_leave(&g_type, type);
-    }
-    return g_type;
+  if (g_once_init_enter (&g_type)) {
+    GType type =
+        g_boxed_type_register_static (g_intern_static_string
+        ("GstVaapiRectangle"),
+        default_copy_func, default_free_func);
+    g_once_init_leave (&g_type, type);
+  }
+  return g_type;
 }
 
 /* --- GstVaapiRenderMode --- */
 
 GType
-gst_vaapi_render_mode_get_type(void)
+gst_vaapi_render_mode_get_type (void)
 {
-    static GType render_mode_type = 0;
+  static volatile gsize g_type = 0;
 
-    static const GEnumValue render_modes[] = {
-        { GST_VAAPI_RENDER_MODE_OVERLAY,
-          "Overlay render mode", "overlay" },
-        { GST_VAAPI_RENDER_MODE_TEXTURE,
-          "Textured-blit render mode", "texture" },
-        { 0, NULL, NULL }
-    };
-
-    if (!render_mode_type) {
-        render_mode_type =
-            g_enum_register_static("GstVaapiRenderMode", render_modes);
-    }
-    return render_mode_type;
+  static const GEnumValue render_modes[] = {
+    {GST_VAAPI_RENDER_MODE_OVERLAY,
+        "Overlay render mode", "overlay"},
+    {GST_VAAPI_RENDER_MODE_TEXTURE,
+        "Textured-blit render mode", "texture"},
+    {0, NULL, NULL}
+  };
+
+  if (g_once_init_enter (&g_type)) {
+    GType type = g_enum_register_static ("GstVaapiRenderMode", render_modes);
+    g_once_init_leave (&g_type, type);
+  }
+  return g_type;
 }
 
 /* --- GstVaapiRotation --- */
 
 GType
-gst_vaapi_rotation_get_type(void)
+gst_vaapi_rotation_get_type (void)
 {
-    static GType g_type = 0;
+  static volatile gsize g_type = 0;
 
-    static const GEnumValue rotation_values[] = {
-        { GST_VAAPI_ROTATION_0,
-          "Unrotated mode", "0" },
-        { GST_VAAPI_ROTATION_90,
-          "Rotated by 90°, clockwise", "90" },
-        { GST_VAAPI_ROTATION_180,
-          "Rotated by 180°, clockwise", "180" },
-        { GST_VAAPI_ROTATION_270,
-          "Rotated by 270°, clockwise", "270" },
-        { 0, NULL, NULL },
-    };
-
-    if (!g_type)
-        g_type = g_enum_register_static("GstVaapiRotation", rotation_values);
-    return g_type;
+  static const GEnumValue rotation_values[] = {
+    {GST_VAAPI_ROTATION_0,
+        "Unrotated mode", "0"},
+    {GST_VAAPI_ROTATION_90,
+        "Rotated by 90°, clockwise", "90"},
+    {GST_VAAPI_ROTATION_180,
+        "Rotated by 180°, clockwise", "180"},
+    {GST_VAAPI_ROTATION_270,
+        "Rotated by 270°, clockwise", "270"},
+    {0, NULL, NULL},
+  };
+
+  if (g_once_init_enter (&g_type)) {
+    GType type = g_enum_register_static ("GstVaapiRotation", rotation_values);
+    g_once_init_leave (&g_type, type);
+  }
+  return g_type;
 }
 
 /* --- GstVaapiRateControl --- */
 
 GType
-gst_vaapi_rate_control_get_type(void)
+gst_vaapi_rate_control_get_type (void)
 {
-    static volatile gsize g_type = 0;
+  static volatile gsize g_type = 0;
 
-    static const GEnumValue rate_control_values[] = {
-        { GST_VAAPI_RATECONTROL_NONE,
-          "None", "none" },
-        { GST_VAAPI_RATECONTROL_CQP,
-          "Constant QP", "cqp" },
-        { GST_VAAPI_RATECONTROL_CBR,
-          "Constant bitrate", "cbr" },
-        { GST_VAAPI_RATECONTROL_VCM,
-          "Video conference", "vcm" },
-        { GST_VAAPI_RATECONTROL_VBR,
-          "Variable bitrate", "vbr" },
-        { GST_VAAPI_RATECONTROL_VBR_CONSTRAINED,
-          "Variable bitrate - Constrained", "vbr_constrained" },
-        { 0, NULL, NULL },
-    };
-
-    if (g_once_init_enter(&g_type)) {
-        GType type = g_enum_register_static("GstVaapiRateControl",
-            rate_control_values);
-        g_once_init_leave(&g_type, type);
-    }
-    return g_type;
+  static const GEnumValue rate_control_values[] = {
+    {GST_VAAPI_RATECONTROL_NONE,
+        "None", "none"},
+    {GST_VAAPI_RATECONTROL_CQP,
+        "Constant QP", "cqp"},
+    {GST_VAAPI_RATECONTROL_CBR,
+        "Constant bitrate", "cbr"},
+    {GST_VAAPI_RATECONTROL_VCM,
+        "Video conference", "vcm"},
+    {GST_VAAPI_RATECONTROL_VBR,
+        "Variable bitrate", "vbr"},
+    {GST_VAAPI_RATECONTROL_VBR_CONSTRAINED,
+        "Variable bitrate - Constrained", "vbr_constrained"},
+    {0, NULL, NULL},
+  };
+
+  if (g_once_init_enter (&g_type)) {
+    GType type = g_enum_register_static ("GstVaapiRateControl",
+        rate_control_values);
+    g_once_init_leave (&g_type, type);
+  }
+  return g_type;
 }
 
 static gboolean
-build_enum_subset_values_from_mask (GstVaapiEnumSubset *subset, guint32 mask)
+build_enum_subset_values_from_mask (GstVaapiEnumSubset * subset, guint32 mask)
 {
-    GEnumClass *enum_class;
-    const GEnumValue *value;
-    guint i, n;
-
-    enum_class = g_type_class_ref(subset->parent_type);
-    if (!enum_class)
-        return FALSE;
-
-    for (i = 0, n = 0; i < 32 && n < subset->num_values; i++) {
-        if (!(mask & (1U << i)))
-            continue;
-        value = g_enum_get_value(enum_class, i);
-        if (!value)
-            continue;
-        subset->values[n++] = *value;
-    }
-    g_type_class_unref(enum_class);
-    if (n != subset->num_values - 1)
-        goto error_invalid_num_values;
-    return TRUE;
+  GEnumClass *enum_class;
+  const GEnumValue *value;
+  guint i, n;
+
+  enum_class = g_type_class_ref (subset->parent_type);
+  if (!enum_class)
+    return FALSE;
+
+  for (i = 0, n = 0; i < 32 && n < subset->num_values; i++) {
+    if (!(mask & (1U << i)))
+      continue;
+    value = g_enum_get_value (enum_class, i);
+    if (!value)
+      continue;
+    subset->values[n++] = *value;
+  }
+  g_type_class_unref (enum_class);
+  if (n != subset->num_values - 1)
+    goto error_invalid_num_values;
+  return TRUE;
 
-    /* ERRORS */
+  /* ERRORS */
 error_invalid_num_values:
-    {
-        g_error("invalid number of static values for `%s'", subset->type_name);
-        return FALSE;
-    }
+  {
+    g_error ("invalid number of static values for `%s'", subset->type_name);
+    return FALSE;
+  }
 }
 
 GType
-gst_vaapi_type_define_enum_subset_from_mask(GstVaapiEnumSubset *subset,
+gst_vaapi_type_define_enum_subset_from_mask (GstVaapiEnumSubset * subset,
     guint32 mask)
 {
-    if (g_once_init_enter(&subset->type)) {
-        GType type;
+  if (g_once_init_enter (&subset->type)) {
+    GType type;
 
-        build_enum_subset_values_from_mask(subset, mask);
-        memset(&subset->type_info, 0, sizeof(subset->type_info));
-        g_enum_complete_type_info(subset->parent_type, &subset->type_info,
-            subset->values);
-
-        type = g_type_register_static (G_TYPE_ENUM, subset->type_name,
-            &subset->type_info, 0);
-        g_once_init_leave(&subset->type, type);
-    }
-    return subset->type;
+    build_enum_subset_values_from_mask (subset, mask);
+    memset (&subset->type_info, 0, sizeof (subset->type_info));
+    g_enum_complete_type_info (subset->parent_type, &subset->type_info,
+        subset->values);
+
+    type = g_type_register_static (G_TYPE_ENUM, subset->type_name,
+        &subset->type_info, 0);
+    g_once_init_leave (&subset->type, type);
+  }
+  return subset->type;
 }
diff -Nru gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapiversion.h gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapiversion.h
--- gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapiversion.h	2015-02-03 08:41:14.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapiversion.h	2015-07-15 12:51:21.000000000 +0000
@@ -28,6 +28,6 @@
  * The full version identifier of gstreamer-vaapi, in string form
  * (suitable for string concatenation).
  */
-#define GST_VAAPI_VERSION_ID "0.5.10"
+#define GST_VAAPI_VERSION_ID "0.6.0"
 
 #endif /* GST_VAAPI_VERSION_H */
diff -Nru gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapivideopool.c gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapivideopool.c
--- gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapivideopool.c	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapivideopool.c	2015-07-15 12:47:43.000000000 +0000
@@ -177,7 +177,9 @@
 
   object = g_queue_pop_head (&pool->free_objects);
   if (!object) {
+    g_mutex_unlock (&pool->mutex);
     object = gst_vaapi_video_pool_alloc_object (pool);
+    g_mutex_lock (&pool->mutex);
     if (!object)
       return NULL;
   }
@@ -354,7 +356,11 @@
     n = pool->capacity;
 
   for (i = num_allocated; i < n; i++) {
-    gpointer const object = gst_vaapi_video_pool_alloc_object (pool);
+    gpointer object;
+
+    g_mutex_unlock (&pool->mutex);
+    object = gst_vaapi_video_pool_alloc_object (pool);
+    g_mutex_lock (&pool->mutex);
     if (!object)
       return FALSE;
     g_queue_push_tail (&pool->free_objects, object);
diff -Nru gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapiwindow.c gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapiwindow.c
--- gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapiwindow.c	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapiwindow.c	2015-07-15 12:47:43.000000000 +0000
@@ -509,3 +509,45 @@
   window->check_geometry = TRUE;
   gst_vaapi_window_ensure_size (window);
 }
+
+/**
+ * gst_vaapi_window_unblock:
+ * @window: a #GstVaapiWindow
+ *
+ * Unblocks a rendering surface operation.
+ */
+gboolean
+gst_vaapi_window_unblock (GstVaapiWindow * window)
+{
+  const GstVaapiWindowClass *klass;
+
+  g_return_val_if_fail (window != NULL, FALSE);
+
+  klass = GST_VAAPI_WINDOW_GET_CLASS (window);
+
+  if (klass->unblock)
+    return klass->unblock (window);
+
+  return TRUE;
+}
+
+/**
+ * gst_vaapi_window_unblock_cancel:
+ * @window: a #GstVaapiWindow
+ *
+ * Cancels the previous unblock request.
+ */
+gboolean
+gst_vaapi_window_unblock_cancel (GstVaapiWindow * window)
+{
+  const GstVaapiWindowClass *klass;
+
+  g_return_val_if_fail (window != NULL, FALSE);
+
+  klass = GST_VAAPI_WINDOW_GET_CLASS (window);
+
+  if (klass->unblock_cancel)
+    return klass->unblock_cancel (window);
+
+  return TRUE;
+}
diff -Nru gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapiwindow_egl.c gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapiwindow_egl.c
--- gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapiwindow_egl.c	1970-01-01 00:00:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapiwindow_egl.c	2015-07-15 12:47:43.000000000 +0000
@@ -0,0 +1,565 @@
+/*
+ *  gstvaapiwindow_egl.c - VA/EGL window abstraction
+ *
+ *  Copyright (C) 2014 Intel Corporation
+ *    Author: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public License
+ *  as published by the Free Software Foundation; either version 2.1
+ *  of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free
+ *  Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ *  Boston, MA 02110-1301 USA
+ */
+
+/**
+ * SECTION:gstvaapiwindow_egl
+ * @short_description: VA/EGL window abstraction
+ */
+
+#include "sysdeps.h"
+#include "gstvaapiwindow_egl.h"
+#include "gstvaapiwindow_priv.h"
+#include "gstvaapitexture_egl.h"
+#include "gstvaapitexture_priv.h"
+#include "gstvaapidisplay_egl_priv.h"
+
+#define GST_VAAPI_WINDOW_EGL(obj) \
+  ((GstVaapiWindowEGL *)(obj))
+
+#define GST_VAAPI_WINDOW_EGL_CLASS(klass) \
+  ((GstVaapiWindowEGLClass *)(klass))
+
+#define GST_VAAPI_WINDOW_EGL_GET_CLASS(obj) \
+  GST_VAAPI_WINDOW_EGL_CLASS (GST_VAAPI_WINDOW_GET_CLASS (obj))
+
+typedef struct _GstVaapiWindowEGL GstVaapiWindowEGL;
+typedef struct _GstVaapiWindowEGLClass GstVaapiWindowEGLClass;
+
+enum
+{
+  RENDER_PROGRAM_VAR_PROJ = 0,
+  RENDER_PROGRAM_VAR_TEX0,
+  RENDER_PROGRAM_VAR_TEX1,
+  RENDER_PROGRAM_VAR_TEX2,
+};
+
+struct _GstVaapiWindowEGL
+{
+  GstVaapiWindow parent_instance;
+
+  GstVaapiWindow *window;
+  GstVaapiTexture *texture;
+  EglWindow *egl_window;
+  EglVTable *egl_vtable;
+  EglProgram *render_program;
+  gfloat render_projection[16];
+};
+
+struct _GstVaapiWindowEGLClass
+{
+  GstVaapiWindowClass parent_class;
+};
+
+typedef struct
+{
+  GstVaapiWindowEGL *window;
+  guint width;
+  guint height;
+  EglContext *egl_context;
+  gboolean success;             /* result */
+} CreateObjectsArgs;
+
+typedef struct
+{
+  GstVaapiWindowEGL *window;
+  guint width;
+  guint height;
+  gboolean success;             /* result */
+} ResizeWindowArgs;
+
+typedef struct
+{
+  GstVaapiWindowEGL *window;
+  GstVaapiSurface *surface;
+  const GstVaapiRectangle *src_rect;
+  const GstVaapiRectangle *dst_rect;
+  guint flags;
+  gboolean success;             /* result */
+} UploadSurfaceArgs;
+
+static const gchar *vert_shader_text =
+    "#ifdef GL_ES\n"
+    "precision mediump float;\n"
+    "#endif\n"
+    "\n"
+    "uniform mat4 proj;\n"
+    "\n"
+    "attribute vec2 position;\n"
+    "attribute vec2 texcoord;\n"
+    "varying vec2 v_texcoord;\n"
+    "\n"
+    "void main () {\n"
+    "  gl_Position = proj * vec4 (position, 0.0, 1.0);\n"
+    "  v_texcoord  = texcoord;\n"
+    "}\n";
+
+static const gchar *frag_shader_text_rgba =
+    "#ifdef GL_ES\n"
+    "precision mediump float;\n"
+    "#endif\n"
+    "\n"
+    "uniform sampler2D tex0;\n"
+    "\n"
+    "varying vec2 v_texcoord;\n"
+    "\n"
+    "void main () {\n"
+    "  gl_FragColor = texture2D (tex0, v_texcoord);\n"
+    "}\n";
+
+static gboolean
+ensure_texture (GstVaapiWindowEGL * window, guint width, guint height)
+{
+  GstVaapiTexture *texture;
+
+  if (window->texture &&
+      GST_VAAPI_TEXTURE_WIDTH (window->texture) == width &&
+      GST_VAAPI_TEXTURE_HEIGHT (window->texture) == height)
+    return TRUE;
+
+  texture = gst_vaapi_texture_egl_new (GST_VAAPI_OBJECT_DISPLAY (window),
+      GL_TEXTURE_2D, GL_RGBA, width, height);
+  gst_vaapi_texture_replace (&window->texture, texture);
+  gst_vaapi_texture_replace (&texture, NULL);
+  return window->texture != NULL;
+}
+
+static gboolean
+ensure_shaders (GstVaapiWindowEGL * window)
+{
+  EglVTable *const vtable = window->egl_vtable;
+  EglProgram *program;
+  GLuint prog_id;
+
+  g_return_val_if_fail (window->texture != NULL, FALSE);
+  g_return_val_if_fail (GST_VAAPI_TEXTURE_FORMAT (window->texture) == GL_RGBA,
+      FALSE);
+
+  if (window->render_program)
+    return TRUE;
+
+  program = egl_program_new (window->egl_window->context,
+      frag_shader_text_rgba, vert_shader_text);
+  if (!program)
+    return FALSE;
+
+  prog_id = program->base.handle.u;
+
+  vtable->glUseProgram (prog_id);
+  program->uniforms[RENDER_PROGRAM_VAR_PROJ] =
+      vtable->glGetUniformLocation (prog_id, "proj");
+  program->uniforms[RENDER_PROGRAM_VAR_TEX0] =
+      vtable->glGetUniformLocation (prog_id, "tex0");
+  program->uniforms[RENDER_PROGRAM_VAR_TEX1] =
+      vtable->glGetUniformLocation (prog_id, "tex1");
+  program->uniforms[RENDER_PROGRAM_VAR_TEX2] =
+      vtable->glGetUniformLocation (prog_id, "tex2");
+  vtable->glUseProgram (0);
+
+  egl_matrix_set_identity (window->render_projection);
+
+  egl_object_replace (&window->render_program, program);
+  egl_object_replace (&program, NULL);
+  return TRUE;
+}
+
+static gboolean
+do_create_objects_unlocked (GstVaapiWindowEGL * window, guint width,
+    guint height, EglContext * egl_context)
+{
+  EglWindow *egl_window;
+  EglVTable *egl_vtable;
+
+  egl_window = egl_window_new (egl_context,
+      GSIZE_TO_POINTER (GST_VAAPI_OBJECT_ID (window->window)));
+  if (!egl_window)
+    return FALSE;
+  window->egl_window = egl_window;
+
+  egl_vtable = egl_context_get_vtable (egl_window->context, TRUE);
+  if (!egl_vtable)
+    return FALSE;
+  window->egl_vtable = egl_object_ref (egl_vtable);
+  return TRUE;
+}
+
+static void
+do_create_objects (CreateObjectsArgs * args)
+{
+  GstVaapiWindowEGL *const window = args->window;
+  EglContextState old_cs;
+
+  args->success = FALSE;
+
+  GST_VAAPI_OBJECT_LOCK_DISPLAY (window);
+  if (egl_context_set_current (args->egl_context, TRUE, &old_cs)) {
+    args->success = do_create_objects_unlocked (window, args->width,
+        args->height, args->egl_context);
+    egl_context_set_current (args->egl_context, FALSE, &old_cs);
+  }
+  GST_VAAPI_OBJECT_UNLOCK_DISPLAY (window);
+}
+
+static gboolean
+gst_vaapi_window_egl_create (GstVaapiWindowEGL * window,
+    guint * width, guint * height)
+{
+  GstVaapiDisplayEGL *const display =
+      GST_VAAPI_DISPLAY_EGL (GST_VAAPI_OBJECT_DISPLAY (window));
+  const GstVaapiDisplayClass *const native_dpy_class =
+      GST_VAAPI_DISPLAY_GET_CLASS (display->display);
+  CreateObjectsArgs args;
+
+  g_return_val_if_fail (native_dpy_class != NULL, FALSE);
+
+  window->window = native_dpy_class->create_window (GST_VAAPI_DISPLAY (display),
+      GST_VAAPI_ID_INVALID, *width, *height);
+  if (!window->window)
+    return FALSE;
+
+  gst_vaapi_window_get_size (window->window, width, height);
+
+  args.window = window;
+  args.width = *width;
+  args.height = *height;
+  args.egl_context = GST_VAAPI_DISPLAY_EGL_CONTEXT (display);
+  return egl_context_run (args.egl_context,
+      (EglContextRunFunc) do_create_objects, &args) && args.success;
+}
+
+static void
+do_destroy_objects_unlocked (GstVaapiWindowEGL * window)
+{
+  egl_object_replace (&window->render_program, NULL);
+  egl_object_replace (&window->egl_vtable, NULL);
+  egl_object_replace (&window->egl_window, NULL);
+}
+
+static void
+do_destroy_objects (GstVaapiWindowEGL * window)
+{
+  EglContext *const egl_context =
+      GST_VAAPI_DISPLAY_EGL_CONTEXT (GST_VAAPI_OBJECT_DISPLAY (window));
+  EglContextState old_cs;
+
+  if (!window->egl_window)
+    return;
+
+  GST_VAAPI_OBJECT_LOCK_DISPLAY (window);
+  if (egl_context_set_current (egl_context, TRUE, &old_cs)) {
+    do_destroy_objects_unlocked (window);
+    egl_context_set_current (egl_context, FALSE, &old_cs);
+  }
+  GST_VAAPI_OBJECT_UNLOCK_DISPLAY (window);
+}
+
+static void
+gst_vaapi_window_egl_destroy (GstVaapiWindowEGL * window)
+{
+  egl_context_run (window->egl_window->context,
+      (EglContextRunFunc) do_destroy_objects, window);
+  gst_vaapi_window_replace (&window->window, NULL);
+  gst_vaapi_texture_replace (&window->texture, NULL);
+}
+
+static gboolean
+gst_vaapi_window_egl_show (GstVaapiWindowEGL * window)
+{
+  const GstVaapiWindowClass *const klass =
+      GST_VAAPI_WINDOW_GET_CLASS (window->window);
+
+  g_return_val_if_fail (klass->show, FALSE);
+
+  return klass->show (window->window);
+}
+
+static gboolean
+gst_vaapi_window_egl_hide (GstVaapiWindowEGL * window)
+{
+  const GstVaapiWindowClass *const klass =
+      GST_VAAPI_WINDOW_GET_CLASS (window->window);
+
+  g_return_val_if_fail (klass->hide, FALSE);
+
+  return klass->hide (window->window);
+}
+
+static gboolean
+gst_vaapi_window_egl_get_geometry (GstVaapiWindowEGL * window,
+    gint * x_ptr, gint * y_ptr, guint * width_ptr, guint * height_ptr)
+{
+  const GstVaapiWindowClass *const klass =
+      GST_VAAPI_WINDOW_GET_CLASS (window->window);
+
+  return klass->get_geometry ? klass->get_geometry (window->window,
+      x_ptr, y_ptr, width_ptr, height_ptr) : FALSE;
+}
+
+static gboolean
+gst_vaapi_window_egl_set_fullscreen (GstVaapiWindowEGL * window,
+    gboolean fullscreen)
+{
+  const GstVaapiWindowClass *const klass =
+      GST_VAAPI_WINDOW_GET_CLASS (window->window);
+
+  return klass->set_fullscreen ? klass->set_fullscreen (window->window,
+      fullscreen) : FALSE;
+}
+
+static gboolean
+do_resize_window_unlocked (GstVaapiWindowEGL * window, guint width,
+    guint height)
+{
+  EglVTable *const vtable = window->egl_vtable;
+
+  vtable->glViewport (0, 0, width, height);
+  vtable->glClearColor (0.0f, 0.0f, 0.0f, 1.0f);
+  vtable->glClear (GL_COLOR_BUFFER_BIT);
+  return TRUE;
+}
+
+static void
+do_resize_window (ResizeWindowArgs * args)
+{
+  GstVaapiWindowEGL *const window = args->window;
+  EglContextState old_cs;
+
+  GST_VAAPI_OBJECT_LOCK_DISPLAY (window);
+  if (egl_context_set_current (window->egl_window->context, TRUE, &old_cs)) {
+    args->success = do_resize_window_unlocked (window, args->width,
+        args->height);
+    egl_context_set_current (window->egl_window->context, FALSE, &old_cs);
+  }
+  GST_VAAPI_OBJECT_UNLOCK_DISPLAY (window);
+}
+
+static gboolean
+gst_vaapi_window_egl_resize (GstVaapiWindowEGL * window, guint width,
+    guint height)
+{
+  const GstVaapiWindowClass *const klass =
+      GST_VAAPI_WINDOW_GET_CLASS (window->window);
+  ResizeWindowArgs args = { window, width, height };
+
+  g_return_val_if_fail (klass->resize, FALSE);
+
+  if (!klass->resize (window->window, width, height))
+    return FALSE;
+
+  return egl_context_run (window->egl_window->context,
+      (EglContextRunFunc) do_resize_window, &args) && args.success;
+}
+
+static gboolean
+do_render_texture (GstVaapiWindowEGL * window, const GstVaapiRectangle * rect)
+{
+  const GLuint tex_id = GST_VAAPI_OBJECT_ID (window->texture);
+  EglVTable *const vtable = window->egl_vtable;
+  GLfloat x0, y0, x1, y1;
+  GLfloat texcoords[4][2];
+  GLfloat positions[4][2];
+  guint tex_width, tex_height;
+
+  if (!ensure_shaders (window))
+    return FALSE;
+
+  tex_width = GST_VAAPI_TEXTURE_WIDTH (window->texture);
+  tex_height = GST_VAAPI_TEXTURE_HEIGHT (window->texture);
+
+  // Source coords in VA surface
+  x0 = 0.0f;
+  y0 = 0.0f;
+  x1 = 1.0f;
+  y1 = 1.0f;
+  texcoords[0][0] = x0;
+  texcoords[0][1] = y1;
+  texcoords[1][0] = x1;
+  texcoords[1][1] = y1;
+  texcoords[2][0] = x1;
+  texcoords[2][1] = y0;
+  texcoords[3][0] = x0;
+  texcoords[3][1] = y0;
+
+  // Target coords in EGL surface
+  x0 =  2.0f * ((GLfloat) rect->x / tex_width) - 1.0f;
+  y1 = -2.0f * ((GLfloat) rect->y / tex_height) + 1.0f;
+  x1 =  2.0f * ((GLfloat) (rect->x + rect->width) / tex_width) - 1.0f;
+  y0 = -2.0f * ((GLfloat) (rect->y + rect->height) / tex_height) + 1.0f;
+  positions[0][0] = x0;
+  positions[0][1] = y0;
+  positions[1][0] = x1;
+  positions[1][1] = y0;
+  positions[2][0] = x1;
+  positions[2][1] = y1;
+  positions[3][0] = x0;
+  positions[3][1] = y1;
+
+  vtable->glClear (GL_COLOR_BUFFER_BIT);
+
+  if (G_UNLIKELY (window->egl_window->context->config->gles_version == 1)) {
+    vtable->glBindTexture (GST_VAAPI_TEXTURE_TARGET (window->texture), tex_id);
+    vtable->glEnableClientState (GL_VERTEX_ARRAY);
+    vtable->glVertexPointer (2, GL_FLOAT, 0, positions);
+    vtable->glEnableClientState (GL_TEXTURE_COORD_ARRAY);
+    vtable->glTexCoordPointer (2, GL_FLOAT, 0, texcoords);
+
+    vtable->glDrawArrays (GL_TRIANGLE_FAN, 0, 4);
+
+    vtable->glDisableClientState (GL_VERTEX_ARRAY);
+    vtable->glDisableClientState (GL_TEXTURE_COORD_ARRAY);
+  } else {
+    EglProgram *const program = window->render_program;
+
+    vtable->glUseProgram (program->base.handle.u);
+    vtable->glUniformMatrix4fv (program->uniforms[RENDER_PROGRAM_VAR_PROJ],
+        1, GL_FALSE, window->render_projection);
+    vtable->glEnableVertexAttribArray (0);
+    vtable->glVertexAttribPointer (0, 2, GL_FLOAT, GL_FALSE, 0, positions);
+    vtable->glEnableVertexAttribArray (1);
+    vtable->glVertexAttribPointer (1, 2, GL_FLOAT, GL_FALSE, 0, texcoords);
+
+    vtable->glBindTexture (GST_VAAPI_TEXTURE_TARGET (window->texture), tex_id);
+    vtable->glUniform1i (program->uniforms[RENDER_PROGRAM_VAR_TEX0], 0);
+    vtable->glDrawArrays (GL_TRIANGLE_FAN, 0, 4);
+
+    vtable->glDisableVertexAttribArray (1);
+    vtable->glDisableVertexAttribArray (0);
+    vtable->glUseProgram (0);
+  }
+
+  eglSwapBuffers (window->egl_window->context->display->base.handle.p,
+      window->egl_window->base.handle.p);
+  return TRUE;
+}
+
+static gboolean
+do_upload_surface_unlocked (GstVaapiWindowEGL * window,
+    GstVaapiSurface * surface, const GstVaapiRectangle * src_rect,
+    const GstVaapiRectangle * dst_rect, guint flags)
+{
+  if (!ensure_texture (window, dst_rect->width, dst_rect->height))
+    return FALSE;
+  if (!gst_vaapi_texture_put_surface (window->texture, surface, src_rect,
+          flags))
+    return FALSE;
+  if (!do_render_texture (window, dst_rect))
+    return FALSE;
+  return TRUE;
+}
+
+static void
+do_upload_surface (UploadSurfaceArgs * args)
+{
+  GstVaapiWindowEGL *const window = args->window;
+  EglContextState old_cs;
+
+  args->success = FALSE;
+
+  GST_VAAPI_OBJECT_LOCK_DISPLAY (window);
+  if (egl_context_set_current (window->egl_window->context, TRUE, &old_cs)) {
+    args->success = do_upload_surface_unlocked (window, args->surface,
+        args->src_rect, args->dst_rect, args->flags);
+    egl_context_set_current (window->egl_window->context, FALSE, &old_cs);
+  }
+  GST_VAAPI_OBJECT_UNLOCK_DISPLAY (window);
+}
+
+static gboolean
+gst_vaapi_window_egl_render (GstVaapiWindowEGL * window,
+    GstVaapiSurface * surface, const GstVaapiRectangle * src_rect,
+    const GstVaapiRectangle * dst_rect, guint flags)
+{
+  UploadSurfaceArgs args = { window, surface, src_rect, dst_rect, flags };
+
+  return egl_context_run (window->egl_window->context,
+      (EglContextRunFunc) do_upload_surface, &args) && args.success;
+}
+
+static gboolean
+gst_vaapi_window_egl_render_pixmap (GstVaapiWindowEGL * window,
+    GstVaapiPixmap * pixmap,
+    const GstVaapiRectangle * src_rect, const GstVaapiRectangle * dst_rect)
+{
+  const GstVaapiWindowClass *const klass =
+      GST_VAAPI_WINDOW_GET_CLASS (window->window);
+
+  if (!klass->render_pixmap)
+    return FALSE;
+  return klass->render_pixmap (window->window, pixmap, src_rect, dst_rect);
+}
+
+void
+gst_vaapi_window_egl_class_init (GstVaapiWindowEGLClass * klass)
+{
+  GstVaapiObjectClass *const object_class = GST_VAAPI_OBJECT_CLASS (klass);
+  GstVaapiWindowClass *const window_class = GST_VAAPI_WINDOW_CLASS (klass);
+
+  object_class->finalize = (GstVaapiObjectFinalizeFunc)
+      gst_vaapi_window_egl_destroy;
+
+  window_class->create = (GstVaapiWindowCreateFunc)
+      gst_vaapi_window_egl_create;
+  window_class->show = (GstVaapiWindowShowFunc)
+      gst_vaapi_window_egl_show;
+  window_class->hide = (GstVaapiWindowHideFunc)
+      gst_vaapi_window_egl_hide;
+  window_class->get_geometry = (GstVaapiWindowGetGeometryFunc)
+      gst_vaapi_window_egl_get_geometry;
+  window_class->set_fullscreen = (GstVaapiWindowSetFullscreenFunc)
+      gst_vaapi_window_egl_set_fullscreen;
+  window_class->resize = (GstVaapiWindowResizeFunc)
+      gst_vaapi_window_egl_resize;
+  window_class->render = (GstVaapiWindowRenderFunc)
+      gst_vaapi_window_egl_render;
+  window_class->render_pixmap = (GstVaapiWindowRenderPixmapFunc)
+      gst_vaapi_window_egl_render_pixmap;
+}
+
+#define gst_vaapi_window_egl_finalize \
+    gst_vaapi_window_egl_destroy
+
+GST_VAAPI_OBJECT_DEFINE_CLASS_WITH_CODE (GstVaapiWindowEGL,
+    gst_vaapi_window_egl, gst_vaapi_window_egl_class_init (&g_class));
+
+/**
+ * gst_vaapi_window_egl_new:
+ * @display: a #GstVaapiDisplay
+ * @width: the requested window width, in pixels
+ * @height: the requested windo height, in pixels
+ *
+ * Creates a window with the specified @width and @height. The window
+ * will be attached to the @display and remains invisible to the user
+ * until gst_vaapi_window_show() is called.
+ *
+ * Return value: the newly allocated #GstVaapiWindow object
+ */
+GstVaapiWindow *
+gst_vaapi_window_egl_new (GstVaapiDisplay * display, guint width, guint height)
+{
+  GST_DEBUG ("new window, size %ux%u", width, height);
+
+  g_return_val_if_fail (GST_VAAPI_IS_DISPLAY_EGL (display), NULL);
+
+  return
+      gst_vaapi_window_new_internal (GST_VAAPI_WINDOW_CLASS
+      (gst_vaapi_window_egl_class ()), display, GST_VAAPI_ID_INVALID, width,
+      height);
+}
diff -Nru gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapiwindow_egl.h gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapiwindow_egl.h
--- gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapiwindow_egl.h	1970-01-01 00:00:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapiwindow_egl.h	2015-07-15 12:47:43.000000000 +0000
@@ -0,0 +1,39 @@
+/*
+ *  gstvaapiwindow_egl.h - VA/EGL window abstraction
+ *
+ *  Copyright (C) 2014 Intel Corporation
+ *    Author: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public License
+ *  as published by the Free Software Foundation; either version 2.1
+ *  of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free
+ *  Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ *  Boston, MA 02110-1301 USA
+ */
+
+#ifndef GST_VAAPI_WINDOW_EGL_H
+#define GST_VAAPI_WINDOW_EGL_H
+
+#include <gst/vaapi/gstvaapidisplay.h>
+#include <gst/vaapi/gstvaapiwindow.h>
+
+G_BEGIN_DECLS
+
+#define GST_VAAPI_WINDOW_EGL(obj) \
+    ((GstVaapiWindowEGL *)(obj))
+
+GstVaapiWindow *
+gst_vaapi_window_egl_new (GstVaapiDisplay * display, guint width, guint height);
+
+G_END_DECLS
+
+#endif /* GST_VAAPI_WINDOW_EGL_H */
diff -Nru gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapiwindow.h gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapiwindow.h
--- gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapiwindow.h	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapiwindow.h	2015-07-15 12:47:43.000000000 +0000
@@ -99,6 +99,12 @@
 void
 gst_vaapi_window_reconfigure (GstVaapiWindow * window);
 
+gboolean
+gst_vaapi_window_unblock (GstVaapiWindow * window);
+
+gboolean
+gst_vaapi_window_unblock_cancel (GstVaapiWindow * window);
+
 G_END_DECLS
 
 #endif /* GST_VAAPI_WINDOW_H */
diff -Nru gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapiwindow_priv.h gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapiwindow_priv.h
--- gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapiwindow_priv.h	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapiwindow_priv.h	2015-07-15 12:47:43.000000000 +0000
@@ -54,6 +54,8 @@
     const GstVaapiRectangle * dst_rect);
 typedef guintptr (*GstVaapiWindowGetVisualIdFunc) (GstVaapiWindow * window);
 typedef guintptr (*GstVaapiWindowGetColormapFunc) (GstVaapiWindow * window);
+typedef gboolean (*GstVaapiWindowSetUnblockFunc) (GstVaapiWindow * window);
+typedef gboolean (*GstVaapiWindowSetUnblockCancelFunc) (GstVaapiWindow * window);
 
 /**
  * GstVaapiWindow:
@@ -88,6 +90,9 @@
  *   create the window
  * @get_colormap: virtual function to get the desired colormap used to
  *   create the window, or the currently allocated one
+ * @unblock: virtual function to unblock a rendering surface operation
+ * @unblock_cancel: virtual function to cancel the previous unblock
+ *   request.
  *
  * Base class for system-dependent windows.
  */
@@ -107,11 +112,13 @@
   GstVaapiWindowRenderPixmapFunc render_pixmap;
   GstVaapiWindowGetVisualIdFunc get_visual_id;
   GstVaapiWindowGetColormapFunc get_colormap;
+  GstVaapiWindowSetUnblockFunc unblock;
+  GstVaapiWindowSetUnblockCancelFunc unblock_cancel;
 };
 
 GstVaapiWindow *
 gst_vaapi_window_new_internal (const GstVaapiWindowClass * window_class,
-    GstVaapiDisplay * display, guintptr handle, guint width, guint height);
+    GstVaapiDisplay * display, GstVaapiID handle, guint width, guint height);
 
 /* Inline reference counting for core libgstvaapi library */
 #ifdef IN_LIBGSTVAAPI_CORE
diff -Nru gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapiwindow_wayland.c gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapiwindow_wayland.c
--- gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/gstvaapiwindow_wayland.c	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/gstvaapiwindow_wayland.c	2015-07-15 12:47:43.000000000 +0000
@@ -55,7 +55,6 @@
   GstVaapiWindow *window;
   GstVaapiSurface *surface;
   GstVaapiVideoPool *surface_pool;
-  struct wl_buffer *buffer;
   struct wl_callback *callback;
 };
 
@@ -71,7 +70,6 @@
   frame->window = window;
   frame->surface = NULL;
   frame->surface_pool = NULL;
-  frame->buffer = NULL;
   frame->callback = NULL;
   return frame;
 }
@@ -89,11 +87,6 @@
   }
   gst_vaapi_video_pool_replace (&frame->surface_pool, NULL);
 
-  if (frame->buffer) {
-    wl_buffer_destroy (frame->buffer);
-    frame->buffer = NULL;
-  }
-
   if (frame->callback) {
     wl_callback_destroy (frame->callback);
     frame->callback = NULL;
@@ -107,13 +100,17 @@
   struct wl_surface *surface;
   struct wl_region *opaque_region;
   struct wl_event_queue *event_queue;
-  FrameState *frame;
+  FrameState *last_frame;
   GstVideoFormat surface_format;
   GstVaapiVideoPool *surface_pool;
   GstVaapiFilter *filter;
+  GstPoll *poll;
+  GstPollFD pollfd;
   guint is_shown:1;
   guint fullscreen_on_show:1;
   guint use_vpp:1;
+  guint is_cancelled:1;
+  volatile guint num_frames_pending;
 };
 
 /**
@@ -161,17 +158,51 @@
 {
   GstVaapiWindowWaylandPrivate *const priv =
       GST_VAAPI_WINDOW_WAYLAND_GET_PRIVATE (window);
+  struct wl_display *const wl_display =
+      GST_VAAPI_OBJECT_NATIVE_DISPLAY (window);
 
-  if (priv->frame) {
-    struct wl_display *const wl_display =
-        GST_VAAPI_OBJECT_NATIVE_DISPLAY (window);
-
-    do {
-      if (wl_display_dispatch_queue (wl_display, priv->event_queue) < 0)
-        return FALSE;
-    } while (priv->frame);
+  if (priv->is_cancelled)
+    return FALSE;
+
+  if (priv->pollfd.fd < 0) {
+    priv->pollfd.fd = wl_display_get_fd (wl_display);
+    gst_poll_add_fd (priv->poll, &priv->pollfd);
+    gst_poll_fd_ctl_read (priv->poll, &priv->pollfd, TRUE);
+  }
+
+  while (g_atomic_int_get (&priv->num_frames_pending) > 0) {
+    while (wl_display_prepare_read_queue (wl_display, priv->event_queue) < 0) {
+      if (wl_display_dispatch_queue_pending (wl_display, priv->event_queue) < 0)
+        goto error;
+    }
+
+    if (wl_display_flush (wl_display) < 0)
+      goto error;
+
+  again:
+    if (gst_poll_wait (priv->poll, GST_CLOCK_TIME_NONE) < 0) {
+      int saved_errno = errno;
+      if (saved_errno == EAGAIN || saved_errno == EINTR)
+        goto again;
+      if (saved_errno == EBUSY) {       /* closing */
+        wl_display_cancel_read (wl_display);
+        priv->is_cancelled = TRUE;
+        break;
+      }
+      goto error;
+    }
+
+    if (wl_display_read_events (wl_display) < 0)
+      goto error;
+    if (wl_display_dispatch_queue_pending (wl_display, priv->event_queue) < 0)
+      goto error;
   }
   return TRUE;
+
+error:
+  priv->is_cancelled = TRUE;
+  GST_ERROR ("Error on dispatching events: %s", g_strerror (errno));
+  return FALSE;
 }
 
 static void
@@ -260,6 +291,9 @@
       &shell_surface_listener, priv);
   wl_shell_surface_set_toplevel (priv->shell_surface);
 
+  priv->poll = gst_poll_new (TRUE);
+  gst_poll_fd_init (&priv->pollfd);
+
   if (priv->fullscreen_on_show)
     gst_vaapi_window_wayland_set_fullscreen (window, TRUE);
 
@@ -276,9 +310,12 @@
   GstVaapiWindowWaylandPrivate *const priv =
       GST_VAAPI_WINDOW_WAYLAND_GET_PRIVATE (window);
 
-  if (priv->frame) {
-    frame_state_free (priv->frame);
-    priv->frame = NULL;
+  /* Wait for the last frame to complete redraw */
+  gst_vaapi_window_wayland_sync (window);
+
+  if (priv->last_frame) {
+    frame_state_free (priv->last_frame);
+    priv->last_frame = NULL;
   }
 
   if (priv->shell_surface) {
@@ -298,6 +335,8 @@
 
   gst_vaapi_filter_replace (&priv->filter, NULL);
   gst_vaapi_video_pool_replace (&priv->surface_pool, NULL);
+
+  gst_poll_free (priv->poll);
 }
 
 static gboolean
@@ -311,6 +350,7 @@
 
   GST_DEBUG ("resize window, new size %ux%u", width, height);
 
+  gst_vaapi_video_pool_replace (&priv->surface_pool, NULL);
   if (priv->opaque_region)
     wl_region_destroy (priv->opaque_region);
   GST_VAAPI_OBJECT_LOCK_DISPLAY (window);
@@ -322,19 +362,29 @@
 }
 
 static void
-frame_redraw_callback (void *data, struct wl_callback *callback, uint32_t time)
+frame_done_callback (void *data, struct wl_callback *callback, uint32_t time)
 {
   FrameState *const frame = data;
   GstVaapiWindowWaylandPrivate *const priv =
       GST_VAAPI_WINDOW_WAYLAND_GET_PRIVATE (frame->window);
 
+  g_atomic_pointer_compare_and_exchange (&priv->last_frame, frame, NULL);
   frame_state_free (frame);
-  if (priv->frame == frame)
-    priv->frame = NULL;
+  g_atomic_int_dec_and_test (&priv->num_frames_pending);
 }
 
 static const struct wl_callback_listener frame_callback_listener = {
-  frame_redraw_callback
+  frame_done_callback
+};
+
+static void
+frame_release_callback (void *data, struct wl_buffer *wl_buffer)
+{
+  wl_buffer_destroy (wl_buffer);
+}
+
+static const struct wl_buffer_listener frame_buffer_listener = {
+  frame_release_callback
 };
 
 static GstVaapiSurface *
@@ -466,13 +516,21 @@
   }
 
   /* Wait for the previous frame to complete redraw */
-  if (!gst_vaapi_window_wayland_sync (window))
+  if (!gst_vaapi_window_wayland_sync (window)) {
+    wl_buffer_destroy (buffer);
     return FALSE;
+  }
+
+  if (priv->is_cancelled) {
+    wl_buffer_destroy (buffer);
+    return TRUE;
+  }
 
   frame = frame_state_new (window);
   if (!frame)
     return FALSE;
-  priv->frame = frame;
+  g_atomic_pointer_set (&priv->last_frame, frame);
+  g_atomic_int_inc (&priv->num_frames_pending);
 
   if (need_vpp && priv->use_vpp) {
     frame->surface = surface;
@@ -490,7 +548,12 @@
     priv->opaque_region = NULL;
   }
 
-  frame->buffer = buffer;
+  /* @TODO: It is not OK to use internal event_queue here, since there
+   * may still be a WL_BUFFER_RELEASE event when we destroy the
+   * event_queue in gst_vaapi_window_wayland_destroy (). */
+  wl_proxy_set_queue ((struct wl_proxy *) buffer, priv->event_queue);
+  wl_buffer_add_listener (buffer, &frame_buffer_listener, NULL);
+
   frame->callback = wl_surface_frame (priv->surface);
   wl_callback_add_listener (frame->callback, &frame_callback_listener, frame);
 
@@ -500,6 +563,28 @@
   return TRUE;
 }
 
+static gboolean
+gst_vaapi_window_wayland_unblock (GstVaapiWindow * window)
+{
+  GstVaapiWindowWaylandPrivate *const priv =
+      GST_VAAPI_WINDOW_WAYLAND_GET_PRIVATE (window);
+
+  gst_poll_set_flushing (priv->poll, TRUE);
+
+  return TRUE;
+}
+
+static gboolean
+gst_vaapi_window_wayland_unblock_cancel (GstVaapiWindow * window)
+{
+  GstVaapiWindowWaylandPrivate *const priv =
+      GST_VAAPI_WINDOW_WAYLAND_GET_PRIVATE (window);
+
+  gst_poll_set_flushing (priv->poll, FALSE);
+
+  return TRUE;
+}
+
 static void
 gst_vaapi_window_wayland_class_init (GstVaapiWindowWaylandClass * klass)
 {
@@ -515,6 +600,8 @@
   window_class->render = gst_vaapi_window_wayland_render;
   window_class->resize = gst_vaapi_window_wayland_resize;
   window_class->set_fullscreen = gst_vaapi_window_wayland_set_fullscreen;
+  window_class->unblock = gst_vaapi_window_wayland_unblock;
+  window_class->unblock_cancel = gst_vaapi_window_wayland_unblock_cancel;
 }
 
 #define gst_vaapi_window_wayland_finalize \
diff -Nru gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/Makefile.am gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/Makefile.am
--- gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/Makefile.am	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/Makefile.am	2015-07-15 12:47:43.000000000 +0000
@@ -12,6 +12,10 @@
 lib_LTLIBRARIES += libgstvaapi-glx-@GST_API_VERSION@.la
 endif
 
+if USE_EGL
+lib_LTLIBRARIES += libgstvaapi-egl-@GST_API_VERSION@.la
+endif
+
 if USE_WAYLAND
 lib_LTLIBRARIES += libgstvaapi-wayland-@GST_API_VERSION@.la
 endif
@@ -41,7 +45,6 @@
 	$(GST_CODEC_PARSERS_LIBS)		\
 	$(LIBVA_LIBS)				\
 	$(top_builddir)/gst-libs/gst/base/libgstvaapi-baseutils.la \
-	$(top_builddir)/gst-libs/gst/video/libgstvaapi-videoutils.la \
 	$(top_builddir)/gst-libs/gst/codecparsers/libgstvaapi-codecparsers.la
 
 libgstvaapi_source_c =				\
@@ -87,6 +90,7 @@
 	gstvaapibufferproxy.h			\
 	gstvaapidecoder.h			\
 	gstvaapidecoder_h264.h			\
+	gstvaapidecoder_h265.h			\
 	gstvaapidecoder_mpeg2.h			\
 	gstvaapidecoder_mpeg4.h			\
 	gstvaapidecoder_vc1.h			\
@@ -114,7 +118,6 @@
 
 libgstvaapi_source_priv_h =			\
 	glibcompat.h				\
-	gstcompat.h				\
 	gstvaapibufferproxy_priv.h		\
 	gstvaapicodec_objects.h			\
 	gstvaapicompat.h			\
@@ -161,6 +164,17 @@
 libgstvaapi_source_h += $(libgstvaapi_vp8dec_source_h)
 endif
 
+libgstvaapi_hevcdec_source_c = 			\
+	gstvaapidecoder_h265.c			\
+	gstvaapiutils_h265.c
+libgstvaapi_hevcdec_source_h = gstvaapiutils_h265.h
+libgstvaapi_hevcdec_source_priv_h = gstvaapiutils_h265_priv.h
+if USE_HEVC_DECODER
+libgstvaapi_source_c += $(libgstvaapi_hevcdec_source_c)
+libgstvaapi_source_h += $(libgstvaapi_hevcdec_source_h)
+libgstvaapi_source_priv_h += $(libgstvaapi_hevcdec_source_priv_h)
+endif
+
 libgstvaapi_enc_source_c =			\
 	gstvaapicodedbuffer.c			\
 	gstvaapicodedbufferpool.c		\
@@ -194,6 +208,27 @@
 libgstvaapi_source_priv_h += $(libgstvaapi_enc_source_priv_h)
 endif
 
+libgstvaapi_jpegenc_source_c = gstvaapiencoder_jpeg.c
+libgstvaapi_jpegenc_source_h = gstvaapiencoder_jpeg.h
+if USE_JPEG_ENCODER
+libgstvaapi_source_c += $(libgstvaapi_jpegenc_source_c)
+libgstvaapi_source_h += $(libgstvaapi_jpegenc_source_h)
+endif
+
+libgstvaapi_vp8enc_source_c = gstvaapiencoder_vp8.c
+libgstvaapi_vp8enc_source_h = gstvaapiencoder_vp8.h
+if USE_VP8_ENCODER
+libgstvaapi_source_c += $(libgstvaapi_vp8enc_source_c)
+libgstvaapi_source_h += $(libgstvaapi_vp8enc_source_h)
+endif
+
+libgstvaapi_h265enc_source_c = gstvaapiencoder_h265.c
+libgstvaapi_h265enc_source_h = gstvaapiencoder_h265.h
+if USE_H265_ENCODER
+libgstvaapi_source_c += $(libgstvaapi_h265enc_source_c)
+libgstvaapi_source_h += $(libgstvaapi_h265enc_source_h)
+endif
+
 libgstvaapi_drm_source_c =			\
 	gstvaapidisplay_drm.c			\
 	gstvaapiwindow_drm.c			\
@@ -257,6 +292,29 @@
 	gstvaapiutils_x11.h			\
 	$(NULL)
 
+libgstvaapi_egl_source_c =			\
+	gstvaapidisplay_egl.c			\
+	gstvaapisurface_egl.c			\
+	gstvaapitexture_egl.c			\
+	gstvaapiutils_egl.c			\
+	gstvaapiwindow_egl.c			\
+	$(NULL)
+
+libgstvaapi_egl_source_h =			\
+	gstvaapidisplay_egl.h			\
+	gstvaapisurface_egl.h			\
+	gstvaapitexture_egl.h			\
+	gstvaapiwindow_egl.h			\
+	$(NULL)
+
+libgstvaapi_egl_source_priv_h =			\
+	egl_compat.h				\
+	egl_vtable.h				\
+	gstvaapidisplay_egl_priv.h		\
+	gstvaapiutils_egl.h			\
+	ogl_compat.h				\
+	$(NULL)
+
 libgstvaapi_wayland_source_c =			\
 	gstvaapidisplay_wayland.c		\
 	gstvaapiutils.c				\
@@ -419,6 +477,44 @@
 	$(GST_VAAPI_LT_LDFLAGS)			\
 	$(NULL)
 
+libgstvaapi_egl_@GST_API_VERSION@_la_SOURCES =	\
+	$(libgstvaapi_egl_source_c)		\
+	$(libgstvaapi_egl_source_priv_h)	\
+	$(NULL)
+
+libgstvaapi_egl_@GST_API_VERSION@include_HEADERS = \
+	$(libgstvaapi_egl_source_h)		\
+	$(NULL)
+
+libgstvaapi_egl_@GST_API_VERSION@includedir =	\
+	$(libgstvaapi_includedir)
+
+libgstvaapi_egl_@GST_API_VERSION@_la_CFLAGS =	\
+	-DIN_LIBGSTVAAPI			\
+	-DGST_USE_UNSTABLE_API			\
+	-I$(top_srcdir)/gst-libs		\
+	$(GLIB_CFLAGS)				\
+	$(GST_BASE_CFLAGS)			\
+	$(GST_VIDEO_CFLAGS)			\
+	$(LIBVA_CFLAGS)				\
+	$(EGL_CFLAGS)				\
+	$(NULL)
+
+libgstvaapi_egl_@GST_API_VERSION@_la_LIBADD =	\
+	$(GLIB_LIBS)				\
+	$(GST_LIBS)				\
+	$(GST_BASE_LIBS)			\
+	$(GST_VIDEO_LIBS)			\
+	libgstvaapi-$(GST_API_VERSION).la	\
+	$(EGL_LIBS)				\
+	$(DLOPEN_LIBS)				\
+	$(NULL)
+
+libgstvaapi_egl_@GST_API_VERSION@_la_LDFLAGS =	\
+	$(GST_ALL_LDFLAGS)			\
+	$(GST_VAAPI_LT_LDFLAGS)			\
+	$(NULL)
+
 libgstvaapi_wayland_@GST_API_VERSION@_la_SOURCES = \
 	$(libgstvaapi_wayland_source_c)		\
 	$(libgstvaapi_wayland_source_priv_h)	\
@@ -440,7 +536,6 @@
 	$(GST_VIDEO_CFLAGS)			\
 	$(WAYLAND_CFLAGS)			\
 	$(LIBVA_WAYLAND_CFLAGS)			\
-	$(top_builddir)/gst-libs/gst/video/libgstvaapi-videoutils.la \
 	$(NULL)
 
 libgstvaapi_wayland_@GST_API_VERSION@_la_LIBADD = \
@@ -486,6 +581,7 @@
 
 BUILT_SOURCES	= gstvaapiversion.h
 EXTRA_DIST	= gstvaapiversion.h.in $(PKG_VERSION_FILE)
+DISTCLEANFILES	= $(BUILT_SOURCES)
 
 EXTRA_DIST += \
 	$(libgstvaapi_enc_source_c)		\
@@ -495,6 +591,18 @@
 	$(libgstvaapi_jpegdec_source_h)		\
 	$(libgstvaapi_vp8dec_source_c)		\
 	$(libgstvaapi_vp8dec_source_h)		\
+	$(libgstvaapi_hevcdec_source_c)		\
+	$(libgstvaapi_hevcdec_source_h)		\
+	$(libgstvaapi_hevcdec_source_priv_h)	\
+	$(libgstvaapi_jpegenc_source_h)		\
+	$(libgstvaapi_jpegenc_source_c)		\
+	$(libgstvaapi_vp8enc_source_h)		\
+	$(libgstvaapi_vp8enc_source_c)		\
+	$(libgstvaapi_h265enc_source_h)		\
+	$(libgstvaapi_h265enc_source_c)		\
+	$(libgstvaapi_egl_source_c)		\
+	$(libgstvaapi_egl_source_h)		\
+	$(libgstvaapi_egl_source_priv_h)	\
 	$(NULL)
 
 CLEANFILES = \
@@ -503,5 +611,4 @@
 	$(PKG_VERSION_FILE)	\
 	$(NULL)
 
-# Extra clean files so that maintainer-clean removes *everything*
-MAINTAINERCLEANFILES = Makefile.in
+-include $(top_srcdir)/git.mk
diff -Nru gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/Makefile.in gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/Makefile.in
--- gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/Makefile.in	2015-02-03 08:39:54.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/Makefile.in	2015-07-15 12:50:34.000000000 +0000
@@ -83,19 +83,30 @@
 @USE_DRM_TRUE@am__append_1 = libgstvaapi-drm-@GST_API_VERSION@.la
 @USE_X11_TRUE@am__append_2 = libgstvaapi-x11-@GST_API_VERSION@.la
 @USE_GLX_TRUE@am__append_3 = libgstvaapi-glx-@GST_API_VERSION@.la
-@USE_WAYLAND_TRUE@am__append_4 = libgstvaapi-wayland-@GST_API_VERSION@.la
-@USE_JPEG_DECODER_TRUE@am__append_5 = $(libgstvaapi_jpegdec_source_c)
-@USE_JPEG_DECODER_TRUE@am__append_6 = $(libgstvaapi_jpegdec_source_h)
-@USE_VP8_DECODER_TRUE@am__append_7 = $(libgstvaapi_vp8dec_source_c)
-@USE_VP8_DECODER_TRUE@am__append_8 = $(libgstvaapi_vp8dec_source_h)
-@USE_ENCODERS_TRUE@am__append_9 = $(libgstvaapi_enc_source_c)
-@USE_ENCODERS_TRUE@am__append_10 = $(libgstvaapi_enc_source_h)
-@USE_ENCODERS_TRUE@am__append_11 = $(libgstvaapi_enc_source_priv_h)
+@USE_EGL_TRUE@am__append_4 = libgstvaapi-egl-@GST_API_VERSION@.la
+@USE_WAYLAND_TRUE@am__append_5 = libgstvaapi-wayland-@GST_API_VERSION@.la
+@USE_JPEG_DECODER_TRUE@am__append_6 = $(libgstvaapi_jpegdec_source_c)
+@USE_JPEG_DECODER_TRUE@am__append_7 = $(libgstvaapi_jpegdec_source_h)
+@USE_VP8_DECODER_TRUE@am__append_8 = $(libgstvaapi_vp8dec_source_c)
+@USE_VP8_DECODER_TRUE@am__append_9 = $(libgstvaapi_vp8dec_source_h)
+@USE_HEVC_DECODER_TRUE@am__append_10 = $(libgstvaapi_hevcdec_source_c)
+@USE_HEVC_DECODER_TRUE@am__append_11 = $(libgstvaapi_hevcdec_source_h)
+@USE_HEVC_DECODER_TRUE@am__append_12 = $(libgstvaapi_hevcdec_source_priv_h)
+@USE_ENCODERS_TRUE@am__append_13 = $(libgstvaapi_enc_source_c)
+@USE_ENCODERS_TRUE@am__append_14 = $(libgstvaapi_enc_source_h)
+@USE_ENCODERS_TRUE@am__append_15 = $(libgstvaapi_enc_source_priv_h)
+@USE_JPEG_ENCODER_TRUE@am__append_16 = $(libgstvaapi_jpegenc_source_c)
+@USE_JPEG_ENCODER_TRUE@am__append_17 = $(libgstvaapi_jpegenc_source_h)
+@USE_VP8_ENCODER_TRUE@am__append_18 = $(libgstvaapi_vp8enc_source_c)
+@USE_VP8_ENCODER_TRUE@am__append_19 = $(libgstvaapi_vp8enc_source_h)
+@USE_H265_ENCODER_TRUE@am__append_20 = $(libgstvaapi_h265enc_source_c)
+@USE_H265_ENCODER_TRUE@am__append_21 = $(libgstvaapi_h265enc_source_h)
 subdir = gst-libs/gst/vaapi
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(top_srcdir)/build-aux/depcomp \
 	$(am__libgstvaapi_@GST_API_VERSION@include_HEADERS_DIST) \
 	$(libgstvaapi_drm_@GST_API_VERSION@include_HEADERS) \
+	$(libgstvaapi_egl_@GST_API_VERSION@include_HEADERS) \
 	$(libgstvaapi_glx_@GST_API_VERSION@include_HEADERS) \
 	$(libgstvaapi_wayland_@GST_API_VERSION@include_HEADERS) \
 	$(libgstvaapi_x11_@GST_API_VERSION@include_HEADERS)
@@ -140,6 +151,7 @@
 am__installdirs = "$(DESTDIR)$(libdir)" \
 	"$(DESTDIR)$(libgstvaapi_@GST_API_VERSION@includedir)" \
 	"$(DESTDIR)$(libgstvaapi_drm_@GST_API_VERSION@includedir)" \
+	"$(DESTDIR)$(libgstvaapi_egl_@GST_API_VERSION@includedir)" \
 	"$(DESTDIR)$(libgstvaapi_glx_@GST_API_VERSION@includedir)" \
 	"$(DESTDIR)$(libgstvaapi_wayland_@GST_API_VERSION@includedir)" \
 	"$(DESTDIR)$(libgstvaapi_x11_@GST_API_VERSION@includedir)"
@@ -149,7 +161,6 @@
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(top_builddir)/gst-libs/gst/base/libgstvaapi-baseutils.la \
-	$(top_builddir)/gst-libs/gst/video/libgstvaapi-videoutils.la \
 	$(top_builddir)/gst-libs/gst/codecparsers/libgstvaapi-codecparsers.la
 libgstvaapi_@GST_API_VERSION@_la_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am__libgstvaapi_@GST_API_VERSION@_la_SOURCES_DIST =  \
@@ -167,24 +178,27 @@
 	gstvaapiutils_core.c gstvaapiutils_h264.c \
 	gstvaapiutils_mpeg2.c gstvaapivalue.c gstvaapivideopool.c \
 	gstvaapiwindow.c video-format.c gstvaapidecoder_jpeg.c \
-	gstvaapidecoder_vp8.c gstvaapicodedbuffer.c \
+	gstvaapidecoder_vp8.c gstvaapidecoder_h265.c \
+	gstvaapiutils_h265.c gstvaapicodedbuffer.c \
 	gstvaapicodedbufferpool.c gstvaapicodedbufferproxy.c \
 	gstvaapiencoder.c gstvaapiencoder_h264.c \
-	gstvaapiencoder_mpeg2.c gstvaapiencoder_objects.c glibcompat.h \
-	gstcompat.h gstvaapibufferproxy_priv.h gstvaapicodec_objects.h \
-	gstvaapicompat.h gstvaapicontext.h gstvaapicontext_overlay.h \
-	gstvaapidebug.h gstvaapidecoder_dpb.h \
-	gstvaapidecoder_objects.h gstvaapidecoder_priv.h \
-	gstvaapidecoder_unit.h gstvaapidisplay_priv.h \
-	gstvaapidisplaycache.h gstvaapiimage_priv.h \
-	gstvaapiminiobject.h gstvaapiobject_priv.h \
-	gstvaapiparser_frame.h gstvaapipixmap_priv.h \
-	gstvaapisurface_priv.h gstvaapisurfaceproxy_priv.h \
-	gstvaapitexture_priv.h gstvaapiutils.h gstvaapiutils_core.h \
-	gstvaapiutils_h264_priv.h gstvaapiutils_mpeg2_priv.h \
-	gstvaapiversion.h gstvaapivideopool_priv.h \
-	gstvaapiwindow_priv.h gstvaapiworkarounds.h \
-	libgstvaapi_priv_check.h sysdeps.h gstvaapicodedbuffer_priv.h \
+	gstvaapiencoder_mpeg2.c gstvaapiencoder_objects.c \
+	gstvaapiencoder_jpeg.c gstvaapiencoder_vp8.c \
+	gstvaapiencoder_h265.c glibcompat.h gstvaapibufferproxy_priv.h \
+	gstvaapicodec_objects.h gstvaapicompat.h gstvaapicontext.h \
+	gstvaapicontext_overlay.h gstvaapidebug.h \
+	gstvaapidecoder_dpb.h gstvaapidecoder_objects.h \
+	gstvaapidecoder_priv.h gstvaapidecoder_unit.h \
+	gstvaapidisplay_priv.h gstvaapidisplaycache.h \
+	gstvaapiimage_priv.h gstvaapiminiobject.h \
+	gstvaapiobject_priv.h gstvaapiparser_frame.h \
+	gstvaapipixmap_priv.h gstvaapisurface_priv.h \
+	gstvaapisurfaceproxy_priv.h gstvaapitexture_priv.h \
+	gstvaapiutils.h gstvaapiutils_core.h gstvaapiutils_h264_priv.h \
+	gstvaapiutils_mpeg2_priv.h gstvaapiversion.h \
+	gstvaapivideopool_priv.h gstvaapiwindow_priv.h \
+	gstvaapiworkarounds.h libgstvaapi_priv_check.h sysdeps.h \
+	gstvaapiutils_h265_priv.h gstvaapicodedbuffer_priv.h \
 	gstvaapicodedbufferproxy_priv.h gstvaapiencoder_mpeg2_priv.h \
 	gstvaapiencoder_objects.h gstvaapiencoder_priv.h
 am__objects_1 =  \
@@ -194,6 +208,10 @@
 	libgstvaapi_@GST_API_VERSION@_la-gstvaapidecoder_vp8.lo
 @USE_VP8_DECODER_TRUE@am__objects_4 = $(am__objects_3)
 am__objects_5 =  \
+	libgstvaapi_@GST_API_VERSION@_la-gstvaapidecoder_h265.lo \
+	libgstvaapi_@GST_API_VERSION@_la-gstvaapiutils_h265.lo
+@USE_HEVC_DECODER_TRUE@am__objects_6 = $(am__objects_5)
+am__objects_7 =  \
 	libgstvaapi_@GST_API_VERSION@_la-gstvaapicodedbuffer.lo \
 	libgstvaapi_@GST_API_VERSION@_la-gstvaapicodedbufferpool.lo \
 	libgstvaapi_@GST_API_VERSION@_la-gstvaapicodedbufferproxy.lo \
@@ -201,8 +219,17 @@
 	libgstvaapi_@GST_API_VERSION@_la-gstvaapiencoder_h264.lo \
 	libgstvaapi_@GST_API_VERSION@_la-gstvaapiencoder_mpeg2.lo \
 	libgstvaapi_@GST_API_VERSION@_la-gstvaapiencoder_objects.lo
-@USE_ENCODERS_TRUE@am__objects_6 = $(am__objects_5)
-am__objects_7 =  \
+@USE_ENCODERS_TRUE@am__objects_8 = $(am__objects_7)
+am__objects_9 =  \
+	libgstvaapi_@GST_API_VERSION@_la-gstvaapiencoder_jpeg.lo
+@USE_JPEG_ENCODER_TRUE@am__objects_10 = $(am__objects_9)
+am__objects_11 =  \
+	libgstvaapi_@GST_API_VERSION@_la-gstvaapiencoder_vp8.lo
+@USE_VP8_ENCODER_TRUE@am__objects_12 = $(am__objects_11)
+am__objects_13 =  \
+	libgstvaapi_@GST_API_VERSION@_la-gstvaapiencoder_h265.lo
+@USE_H265_ENCODER_TRUE@am__objects_14 = $(am__objects_13)
+am__objects_15 =  \
 	libgstvaapi_@GST_API_VERSION@_la-gstvaapibufferproxy.lo \
 	libgstvaapi_@GST_API_VERSION@_la-gstvaapicodec_objects.lo \
 	libgstvaapi_@GST_API_VERSION@_la-gstvaapicontext.lo \
@@ -239,12 +266,15 @@
 	libgstvaapi_@GST_API_VERSION@_la-gstvaapivideopool.lo \
 	libgstvaapi_@GST_API_VERSION@_la-gstvaapiwindow.lo \
 	libgstvaapi_@GST_API_VERSION@_la-video-format.lo \
-	$(am__objects_2) $(am__objects_4) $(am__objects_6)
-am__objects_8 =
-@USE_ENCODERS_TRUE@am__objects_9 = $(am__objects_8)
-am__objects_10 = $(am__objects_9)
-am_libgstvaapi_@GST_API_VERSION@_la_OBJECTS = $(am__objects_7) \
-	$(am__objects_10)
+	$(am__objects_2) $(am__objects_4) $(am__objects_6) \
+	$(am__objects_8) $(am__objects_10) $(am__objects_12) \
+	$(am__objects_14)
+am__objects_16 =
+@USE_HEVC_DECODER_TRUE@am__objects_17 = $(am__objects_16)
+@USE_ENCODERS_TRUE@am__objects_18 = $(am__objects_16)
+am__objects_19 = $(am__objects_17) $(am__objects_18)
+am_libgstvaapi_@GST_API_VERSION@_la_OBJECTS = $(am__objects_15) \
+	$(am__objects_19)
 libgstvaapi_@GST_API_VERSION@_la_OBJECTS =  \
 	$(am_libgstvaapi_@GST_API_VERSION@_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
@@ -259,12 +289,12 @@
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) libgstvaapi-$(GST_API_VERSION).la
-am__objects_11 =  \
+am__objects_20 =  \
 	libgstvaapi_drm_@GST_API_VERSION@_la-gstvaapidisplay_drm.lo \
 	libgstvaapi_drm_@GST_API_VERSION@_la-gstvaapiwindow_drm.lo \
 	libgstvaapi_drm_@GST_API_VERSION@_la-gstvaapiutils.lo
-am_libgstvaapi_drm_@GST_API_VERSION@_la_OBJECTS = $(am__objects_11) \
-	$(am__objects_8)
+am_libgstvaapi_drm_@GST_API_VERSION@_la_OBJECTS = $(am__objects_20) \
+	$(am__objects_16)
 libgstvaapi_drm_@GST_API_VERSION@_la_OBJECTS =  \
 	$(am_libgstvaapi_drm_@GST_API_VERSION@_la_OBJECTS)
 libgstvaapi_drm_@GST_API_VERSION@_la_LINK = $(LIBTOOL) $(AM_V_lt) \
@@ -274,21 +304,43 @@
 	$(LDFLAGS) -o $@
 @USE_DRM_TRUE@am_libgstvaapi_drm_@GST_API_VERSION@_la_rpath = -rpath \
 @USE_DRM_TRUE@	$(libdir)
+libgstvaapi_egl_@GST_API_VERSION@_la_DEPENDENCIES =  \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	libgstvaapi-$(GST_API_VERSION).la $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
+am__objects_21 =  \
+	libgstvaapi_egl_@GST_API_VERSION@_la-gstvaapidisplay_egl.lo \
+	libgstvaapi_egl_@GST_API_VERSION@_la-gstvaapisurface_egl.lo \
+	libgstvaapi_egl_@GST_API_VERSION@_la-gstvaapitexture_egl.lo \
+	libgstvaapi_egl_@GST_API_VERSION@_la-gstvaapiutils_egl.lo \
+	libgstvaapi_egl_@GST_API_VERSION@_la-gstvaapiwindow_egl.lo
+am_libgstvaapi_egl_@GST_API_VERSION@_la_OBJECTS = $(am__objects_21) \
+	$(am__objects_16)
+libgstvaapi_egl_@GST_API_VERSION@_la_OBJECTS =  \
+	$(am_libgstvaapi_egl_@GST_API_VERSION@_la_OBJECTS)
+libgstvaapi_egl_@GST_API_VERSION@_la_LINK = $(LIBTOOL) $(AM_V_lt) \
+	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
+	$(CCLD) $(libgstvaapi_egl_@GST_API_VERSION@_la_CFLAGS) \
+	$(CFLAGS) $(libgstvaapi_egl_@GST_API_VERSION@_la_LDFLAGS) \
+	$(LDFLAGS) -o $@
+@USE_EGL_TRUE@am_libgstvaapi_egl_@GST_API_VERSION@_la_rpath = -rpath \
+@USE_EGL_TRUE@	$(libdir)
 libgstvaapi_glx_@GST_API_VERSION@_la_DEPENDENCIES =  \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) libgstvaapi-x11-$(GST_API_VERSION).la \
 	libgstvaapi-$(GST_API_VERSION).la $(am__DEPENDENCIES_1)
-am__objects_12 =  \
+am__objects_22 =  \
 	libgstvaapi_glx_@GST_API_VERSION@_la-gstvaapidisplay_glx.lo \
 	libgstvaapi_glx_@GST_API_VERSION@_la-gstvaapitexture_glx.lo \
 	libgstvaapi_glx_@GST_API_VERSION@_la-gstvaapiutils.lo \
 	libgstvaapi_glx_@GST_API_VERSION@_la-gstvaapiutils_glx.lo \
 	libgstvaapi_glx_@GST_API_VERSION@_la-gstvaapiutils_x11.lo \
 	libgstvaapi_glx_@GST_API_VERSION@_la-gstvaapiwindow_glx.lo
-am_libgstvaapi_glx_@GST_API_VERSION@_la_OBJECTS = $(am__objects_12) \
-	$(am__objects_8)
+am_libgstvaapi_glx_@GST_API_VERSION@_la_OBJECTS = $(am__objects_22) \
+	$(am__objects_16)
 libgstvaapi_glx_@GST_API_VERSION@_la_OBJECTS =  \
 	$(am_libgstvaapi_glx_@GST_API_VERSION@_la_OBJECTS)
 libgstvaapi_glx_@GST_API_VERSION@_la_LINK = $(LIBTOOL) $(AM_V_lt) \
@@ -302,11 +354,11 @@
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) libgstvaapi-$(GST_API_VERSION).la
-am__objects_13 = libgstvaapi_wayland_@GST_API_VERSION@_la-gstvaapidisplay_wayland.lo \
+am__objects_23 = libgstvaapi_wayland_@GST_API_VERSION@_la-gstvaapidisplay_wayland.lo \
 	libgstvaapi_wayland_@GST_API_VERSION@_la-gstvaapiutils.lo \
 	libgstvaapi_wayland_@GST_API_VERSION@_la-gstvaapiwindow_wayland.lo
 am_libgstvaapi_wayland_@GST_API_VERSION@_la_OBJECTS =  \
-	$(am__objects_13) $(am__objects_8)
+	$(am__objects_23) $(am__objects_16)
 libgstvaapi_wayland_@GST_API_VERSION@_la_OBJECTS =  \
 	$(am_libgstvaapi_wayland_@GST_API_VERSION@_la_OBJECTS)
 libgstvaapi_wayland_@GST_API_VERSION@_la_LINK = $(LIBTOOL) $(AM_V_lt) \
@@ -321,14 +373,14 @@
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	libgstvaapi-$(GST_API_VERSION).la
-am__objects_14 =  \
+am__objects_24 =  \
 	libgstvaapi_x11_@GST_API_VERSION@_la-gstvaapidisplay_x11.lo \
 	libgstvaapi_x11_@GST_API_VERSION@_la-gstvaapipixmap_x11.lo \
 	libgstvaapi_x11_@GST_API_VERSION@_la-gstvaapiutils.lo \
 	libgstvaapi_x11_@GST_API_VERSION@_la-gstvaapiutils_x11.lo \
 	libgstvaapi_x11_@GST_API_VERSION@_la-gstvaapiwindow_x11.lo
-am_libgstvaapi_x11_@GST_API_VERSION@_la_OBJECTS = $(am__objects_14) \
-	$(am__objects_8)
+am_libgstvaapi_x11_@GST_API_VERSION@_la_OBJECTS = $(am__objects_24) \
+	$(am__objects_16)
 libgstvaapi_x11_@GST_API_VERSION@_la_OBJECTS =  \
 	$(am_libgstvaapi_x11_@GST_API_VERSION@_la_OBJECTS)
 libgstvaapi_x11_@GST_API_VERSION@_la_LINK = $(LIBTOOL) $(AM_V_lt) \
@@ -374,11 +426,13 @@
 am__v_CCLD_1 = 
 SOURCES = $(libgstvaapi_@GST_API_VERSION@_la_SOURCES) \
 	$(libgstvaapi_drm_@GST_API_VERSION@_la_SOURCES) \
+	$(libgstvaapi_egl_@GST_API_VERSION@_la_SOURCES) \
 	$(libgstvaapi_glx_@GST_API_VERSION@_la_SOURCES) \
 	$(libgstvaapi_wayland_@GST_API_VERSION@_la_SOURCES) \
 	$(libgstvaapi_x11_@GST_API_VERSION@_la_SOURCES)
 DIST_SOURCES = $(am__libgstvaapi_@GST_API_VERSION@_la_SOURCES_DIST) \
 	$(libgstvaapi_drm_@GST_API_VERSION@_la_SOURCES) \
+	$(libgstvaapi_egl_@GST_API_VERSION@_la_SOURCES) \
 	$(libgstvaapi_glx_@GST_API_VERSION@_la_SOURCES) \
 	$(libgstvaapi_wayland_@GST_API_VERSION@_la_SOURCES) \
 	$(libgstvaapi_x11_@GST_API_VERSION@_la_SOURCES)
@@ -389,20 +443,24 @@
   esac
 am__libgstvaapi_@GST_API_VERSION@include_HEADERS_DIST =  \
 	gstvaapibufferproxy.h gstvaapidecoder.h gstvaapidecoder_h264.h \
-	gstvaapidecoder_mpeg2.h gstvaapidecoder_mpeg4.h \
-	gstvaapidecoder_vc1.h gstvaapidisplay.h gstvaapifilter.h \
-	gstvaapiimage.h gstvaapiimagepool.h gstvaapiobject.h \
-	gstvaapipixmap.h gstvaapiprofile.h gstvaapisubpicture.h \
-	gstvaapisurface.h gstvaapisurface_drm.h gstvaapisurfacepool.h \
+	gstvaapidecoder_h265.h gstvaapidecoder_mpeg2.h \
+	gstvaapidecoder_mpeg4.h gstvaapidecoder_vc1.h \
+	gstvaapidisplay.h gstvaapifilter.h gstvaapiimage.h \
+	gstvaapiimagepool.h gstvaapiobject.h gstvaapipixmap.h \
+	gstvaapiprofile.h gstvaapisubpicture.h gstvaapisurface.h \
+	gstvaapisurface_drm.h gstvaapisurfacepool.h \
 	gstvaapisurfaceproxy.h gstvaapitexture.h gstvaapitypes.h \
 	gstvaapiutils_h264.h gstvaapiutils_mpeg2.h gstvaapivalue.h \
 	gstvaapivideopool.h gstvaapiwindow.h video-format.h \
 	gstvaapidecoder_jpeg.h gstvaapidecoder_vp8.h \
-	gstvaapicodedbuffer.h gstvaapicodedbufferpool.h \
-	gstvaapicodedbufferproxy.h gstvaapiencoder.h \
-	gstvaapiencoder_h264.h gstvaapiencoder_mpeg2.h
+	gstvaapiutils_h265.h gstvaapicodedbuffer.h \
+	gstvaapicodedbufferpool.h gstvaapicodedbufferproxy.h \
+	gstvaapiencoder.h gstvaapiencoder_h264.h \
+	gstvaapiencoder_mpeg2.h gstvaapiencoder_jpeg.h \
+	gstvaapiencoder_vp8.h gstvaapiencoder_h265.h
 HEADERS = $(libgstvaapi_@GST_API_VERSION@include_HEADERS) \
 	$(libgstvaapi_drm_@GST_API_VERSION@include_HEADERS) \
+	$(libgstvaapi_egl_@GST_API_VERSION@include_HEADERS) \
 	$(libgstvaapi_glx_@GST_API_VERSION@include_HEADERS) \
 	$(libgstvaapi_wayland_@GST_API_VERSION@include_HEADERS) \
 	$(libgstvaapi_x11_@GST_API_VERSION@include_HEADERS)
@@ -433,10 +491,16 @@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
+EGL_CFLAGS = @EGL_CFLAGS@
+EGL_LIBS = @EGL_LIBS@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GIT = @GIT@
+GLES2_CFLAGS = @GLES2_CFLAGS@
+GLES2_LIBS = @GLES2_LIBS@
+GLES3_CFLAGS = @GLES3_CFLAGS@
+GLES3_LIBS = @GLES3_LIBS@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_VERSION_REQUIRED = @GLIB_VERSION_REQUIRED@
@@ -454,6 +518,8 @@
 GST_CFLAGS = @GST_CFLAGS@
 GST_CODEC_PARSERS_CFLAGS = @GST_CODEC_PARSERS_CFLAGS@
 GST_CODEC_PARSERS_LIBS = @GST_CODEC_PARSERS_LIBS@
+GST_GL_CFLAGS = @GST_GL_CFLAGS@
+GST_GL_LIBS = @GST_GL_LIBS@
 GST_INTERFACES_CFLAGS = @GST_INTERFACES_CFLAGS@
 GST_INTERFACES_LIBS = @GST_INTERFACES_LIBS@
 GST_LIBS = @GST_LIBS@
@@ -463,7 +529,6 @@
 GST_PLUGINS_BASE_LIBS = @GST_PLUGINS_BASE_LIBS@
 GST_PLUGINS_BASE_VERSION_REQUIRED = @GST_PLUGINS_BASE_VERSION_REQUIRED@
 GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
-GST_PLUGIN_PATH = @GST_PLUGIN_PATH@
 GST_PLUGIN_PATH_1_0 = @GST_PLUGIN_PATH_1_0@
 GST_VAAPI_LT_LDFLAGS = @GST_VAAPI_LT_LDFLAGS@
 GST_VAAPI_LT_VERSION = @GST_VAAPI_LT_VERSION@
@@ -601,7 +666,8 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 lib_LTLIBRARIES = libgstvaapi-@GST_API_VERSION@.la $(am__append_1) \
-	$(am__append_2) $(am__append_3) $(am__append_4)
+	$(am__append_2) $(am__append_3) $(am__append_4) \
+	$(am__append_5)
 libgstvaapi_includedir = \
 	$(includedir)/gstreamer-$(GST_PKG_VERSION)/gst/vaapi
 
@@ -627,7 +693,6 @@
 	$(GST_CODEC_PARSERS_LIBS)		\
 	$(LIBVA_LIBS)				\
 	$(top_builddir)/gst-libs/gst/base/libgstvaapi-baseutils.la \
-	$(top_builddir)/gst-libs/gst/video/libgstvaapi-videoutils.la \
 	$(top_builddir)/gst-libs/gst/codecparsers/libgstvaapi-codecparsers.la
 
 libgstvaapi_source_c = gstvaapibufferproxy.c gstvaapicodec_objects.c \
@@ -643,38 +708,47 @@
 	gstvaapisurfaceproxy.c gstvaapitexture.c gstvaapiutils.c \
 	gstvaapiutils_core.c gstvaapiutils_h264.c \
 	gstvaapiutils_mpeg2.c gstvaapivalue.c gstvaapivideopool.c \
-	gstvaapiwindow.c video-format.c $(NULL) $(am__append_5) \
-	$(am__append_7) $(am__append_9)
+	gstvaapiwindow.c video-format.c $(NULL) $(am__append_6) \
+	$(am__append_8) $(am__append_10) $(am__append_13) \
+	$(am__append_16) $(am__append_18) $(am__append_20)
 libgstvaapi_source_h = gstvaapibufferproxy.h gstvaapidecoder.h \
-	gstvaapidecoder_h264.h gstvaapidecoder_mpeg2.h \
-	gstvaapidecoder_mpeg4.h gstvaapidecoder_vc1.h \
-	gstvaapidisplay.h gstvaapifilter.h gstvaapiimage.h \
-	gstvaapiimagepool.h gstvaapiobject.h gstvaapipixmap.h \
-	gstvaapiprofile.h gstvaapisubpicture.h gstvaapisurface.h \
-	gstvaapisurface_drm.h gstvaapisurfacepool.h \
+	gstvaapidecoder_h264.h gstvaapidecoder_h265.h \
+	gstvaapidecoder_mpeg2.h gstvaapidecoder_mpeg4.h \
+	gstvaapidecoder_vc1.h gstvaapidisplay.h gstvaapifilter.h \
+	gstvaapiimage.h gstvaapiimagepool.h gstvaapiobject.h \
+	gstvaapipixmap.h gstvaapiprofile.h gstvaapisubpicture.h \
+	gstvaapisurface.h gstvaapisurface_drm.h gstvaapisurfacepool.h \
 	gstvaapisurfaceproxy.h gstvaapitexture.h gstvaapitypes.h \
 	gstvaapiutils_h264.h gstvaapiutils_mpeg2.h gstvaapivalue.h \
 	gstvaapivideopool.h gstvaapiwindow.h video-format.h $(NULL) \
-	$(am__append_6) $(am__append_8) $(am__append_10)
-libgstvaapi_source_priv_h = glibcompat.h gstcompat.h \
-	gstvaapibufferproxy_priv.h gstvaapicodec_objects.h \
-	gstvaapicompat.h gstvaapicontext.h gstvaapicontext_overlay.h \
-	gstvaapidebug.h gstvaapidecoder_dpb.h \
-	gstvaapidecoder_objects.h gstvaapidecoder_priv.h \
-	gstvaapidecoder_unit.h gstvaapidisplay_priv.h \
-	gstvaapidisplaycache.h gstvaapiimage_priv.h \
-	gstvaapiminiobject.h gstvaapiobject_priv.h \
-	gstvaapiparser_frame.h gstvaapipixmap_priv.h \
-	gstvaapisurface_priv.h gstvaapisurfaceproxy_priv.h \
-	gstvaapitexture_priv.h gstvaapiutils.h gstvaapiutils_core.h \
-	gstvaapiutils_h264_priv.h gstvaapiutils_mpeg2_priv.h \
-	gstvaapiversion.h gstvaapivideopool_priv.h \
-	gstvaapiwindow_priv.h gstvaapiworkarounds.h \
-	libgstvaapi_priv_check.h sysdeps.h $(NULL) $(am__append_11)
+	$(am__append_7) $(am__append_9) $(am__append_11) \
+	$(am__append_14) $(am__append_17) $(am__append_19) \
+	$(am__append_21)
+libgstvaapi_source_priv_h = glibcompat.h gstvaapibufferproxy_priv.h \
+	gstvaapicodec_objects.h gstvaapicompat.h gstvaapicontext.h \
+	gstvaapicontext_overlay.h gstvaapidebug.h \
+	gstvaapidecoder_dpb.h gstvaapidecoder_objects.h \
+	gstvaapidecoder_priv.h gstvaapidecoder_unit.h \
+	gstvaapidisplay_priv.h gstvaapidisplaycache.h \
+	gstvaapiimage_priv.h gstvaapiminiobject.h \
+	gstvaapiobject_priv.h gstvaapiparser_frame.h \
+	gstvaapipixmap_priv.h gstvaapisurface_priv.h \
+	gstvaapisurfaceproxy_priv.h gstvaapitexture_priv.h \
+	gstvaapiutils.h gstvaapiutils_core.h gstvaapiutils_h264_priv.h \
+	gstvaapiutils_mpeg2_priv.h gstvaapiversion.h \
+	gstvaapivideopool_priv.h gstvaapiwindow_priv.h \
+	gstvaapiworkarounds.h libgstvaapi_priv_check.h sysdeps.h \
+	$(NULL) $(am__append_12) $(am__append_15)
 libgstvaapi_jpegdec_source_c = gstvaapidecoder_jpeg.c
 libgstvaapi_jpegdec_source_h = gstvaapidecoder_jpeg.h
 libgstvaapi_vp8dec_source_c = gstvaapidecoder_vp8.c
 libgstvaapi_vp8dec_source_h = gstvaapidecoder_vp8.h
+libgstvaapi_hevcdec_source_c = \
+	gstvaapidecoder_h265.c			\
+	gstvaapiutils_h265.c
+
+libgstvaapi_hevcdec_source_h = gstvaapiutils_h265.h
+libgstvaapi_hevcdec_source_priv_h = gstvaapiutils_h265_priv.h
 libgstvaapi_enc_source_c = \
 	gstvaapicodedbuffer.c			\
 	gstvaapicodedbufferpool.c		\
@@ -702,6 +776,12 @@
 	gstvaapiencoder_priv.h			\
 	$(NULL)
 
+libgstvaapi_jpegenc_source_c = gstvaapiencoder_jpeg.c
+libgstvaapi_jpegenc_source_h = gstvaapiencoder_jpeg.h
+libgstvaapi_vp8enc_source_c = gstvaapiencoder_vp8.c
+libgstvaapi_vp8enc_source_h = gstvaapiencoder_vp8.h
+libgstvaapi_h265enc_source_c = gstvaapiencoder_h265.c
+libgstvaapi_h265enc_source_h = gstvaapiencoder_h265.h
 libgstvaapi_drm_source_c = \
 	gstvaapidisplay_drm.c			\
 	gstvaapiwindow_drm.c			\
@@ -765,6 +845,29 @@
 	gstvaapiutils_x11.h			\
 	$(NULL)
 
+libgstvaapi_egl_source_c = \
+	gstvaapidisplay_egl.c			\
+	gstvaapisurface_egl.c			\
+	gstvaapitexture_egl.c			\
+	gstvaapiutils_egl.c			\
+	gstvaapiwindow_egl.c			\
+	$(NULL)
+
+libgstvaapi_egl_source_h = \
+	gstvaapidisplay_egl.h			\
+	gstvaapisurface_egl.h			\
+	gstvaapitexture_egl.h			\
+	gstvaapiwindow_egl.h			\
+	$(NULL)
+
+libgstvaapi_egl_source_priv_h = \
+	egl_compat.h				\
+	egl_vtable.h				\
+	gstvaapidisplay_egl_priv.h		\
+	gstvaapiutils_egl.h			\
+	ogl_compat.h				\
+	$(NULL)
+
 libgstvaapi_wayland_source_c = \
 	gstvaapidisplay_wayland.c		\
 	gstvaapiutils.c				\
@@ -927,6 +1030,44 @@
 	$(GST_VAAPI_LT_LDFLAGS)			\
 	$(NULL)
 
+libgstvaapi_egl_@GST_API_VERSION@_la_SOURCES = \
+	$(libgstvaapi_egl_source_c)		\
+	$(libgstvaapi_egl_source_priv_h)	\
+	$(NULL)
+
+libgstvaapi_egl_@GST_API_VERSION@include_HEADERS = \
+	$(libgstvaapi_egl_source_h)		\
+	$(NULL)
+
+libgstvaapi_egl_@GST_API_VERSION@includedir = \
+	$(libgstvaapi_includedir)
+
+libgstvaapi_egl_@GST_API_VERSION@_la_CFLAGS = \
+	-DIN_LIBGSTVAAPI			\
+	-DGST_USE_UNSTABLE_API			\
+	-I$(top_srcdir)/gst-libs		\
+	$(GLIB_CFLAGS)				\
+	$(GST_BASE_CFLAGS)			\
+	$(GST_VIDEO_CFLAGS)			\
+	$(LIBVA_CFLAGS)				\
+	$(EGL_CFLAGS)				\
+	$(NULL)
+
+libgstvaapi_egl_@GST_API_VERSION@_la_LIBADD = \
+	$(GLIB_LIBS)				\
+	$(GST_LIBS)				\
+	$(GST_BASE_LIBS)			\
+	$(GST_VIDEO_LIBS)			\
+	libgstvaapi-$(GST_API_VERSION).la	\
+	$(EGL_LIBS)				\
+	$(DLOPEN_LIBS)				\
+	$(NULL)
+
+libgstvaapi_egl_@GST_API_VERSION@_la_LDFLAGS = \
+	$(GST_ALL_LDFLAGS)			\
+	$(GST_VAAPI_LT_LDFLAGS)			\
+	$(NULL)
+
 libgstvaapi_wayland_@GST_API_VERSION@_la_SOURCES = \
 	$(libgstvaapi_wayland_source_c)		\
 	$(libgstvaapi_wayland_source_priv_h)	\
@@ -948,7 +1089,6 @@
 	$(GST_VIDEO_CFLAGS)			\
 	$(WAYLAND_CFLAGS)			\
 	$(LIBVA_WAYLAND_CFLAGS)			\
-	$(top_builddir)/gst-libs/gst/video/libgstvaapi-videoutils.la \
 	$(NULL)
 
 libgstvaapi_wayland_@GST_API_VERSION@_la_LIBADD = \
@@ -975,16 +1115,22 @@
 	$(libgstvaapi_enc_source_priv_h) \
 	$(libgstvaapi_jpegdec_source_c) \
 	$(libgstvaapi_jpegdec_source_h) $(libgstvaapi_vp8dec_source_c) \
-	$(libgstvaapi_vp8dec_source_h) $(NULL)
+	$(libgstvaapi_vp8dec_source_h) $(libgstvaapi_hevcdec_source_c) \
+	$(libgstvaapi_hevcdec_source_h) \
+	$(libgstvaapi_hevcdec_source_priv_h) \
+	$(libgstvaapi_jpegenc_source_h) \
+	$(libgstvaapi_jpegenc_source_c) $(libgstvaapi_vp8enc_source_h) \
+	$(libgstvaapi_vp8enc_source_c) $(libgstvaapi_h265enc_source_h) \
+	$(libgstvaapi_h265enc_source_c) $(libgstvaapi_egl_source_c) \
+	$(libgstvaapi_egl_source_h) $(libgstvaapi_egl_source_priv_h) \
+	$(NULL)
+DISTCLEANFILES = $(BUILT_SOURCES)
 CLEANFILES = \
 	$(OLD_VERSION_FILE)	\
 	$(NEW_VERSION_FILE)	\
 	$(PKG_VERSION_FILE)	\
 	$(NULL)
 
-
-# Extra clean files so that maintainer-clean removes *everything*
-MAINTAINERCLEANFILES = Makefile.in
 all: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) all-am
 
@@ -1062,6 +1208,9 @@
 libgstvaapi-drm-@GST_API_VERSION@.la: $(libgstvaapi_drm_@GST_API_VERSION@_la_OBJECTS) $(libgstvaapi_drm_@GST_API_VERSION@_la_DEPENDENCIES) $(EXTRA_libgstvaapi_drm_@GST_API_VERSION@_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(libgstvaapi_drm_@GST_API_VERSION@_la_LINK) $(am_libgstvaapi_drm_@GST_API_VERSION@_la_rpath) $(libgstvaapi_drm_@GST_API_VERSION@_la_OBJECTS) $(libgstvaapi_drm_@GST_API_VERSION@_la_LIBADD) $(LIBS)
 
+libgstvaapi-egl-@GST_API_VERSION@.la: $(libgstvaapi_egl_@GST_API_VERSION@_la_OBJECTS) $(libgstvaapi_egl_@GST_API_VERSION@_la_DEPENDENCIES) $(EXTRA_libgstvaapi_egl_@GST_API_VERSION@_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(libgstvaapi_egl_@GST_API_VERSION@_la_LINK) $(am_libgstvaapi_egl_@GST_API_VERSION@_la_rpath) $(libgstvaapi_egl_@GST_API_VERSION@_la_OBJECTS) $(libgstvaapi_egl_@GST_API_VERSION@_la_LIBADD) $(LIBS)
+
 libgstvaapi-glx-@GST_API_VERSION@.la: $(libgstvaapi_glx_@GST_API_VERSION@_la_OBJECTS) $(libgstvaapi_glx_@GST_API_VERSION@_la_DEPENDENCIES) $(EXTRA_libgstvaapi_glx_@GST_API_VERSION@_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(libgstvaapi_glx_@GST_API_VERSION@_la_LINK) $(am_libgstvaapi_glx_@GST_API_VERSION@_la_rpath) $(libgstvaapi_glx_@GST_API_VERSION@_la_OBJECTS) $(libgstvaapi_glx_@GST_API_VERSION@_la_LIBADD) $(LIBS)
 
@@ -1087,6 +1236,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstvaapi_@GST_API_VERSION@_la-gstvaapidecoder.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstvaapi_@GST_API_VERSION@_la-gstvaapidecoder_dpb.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstvaapi_@GST_API_VERSION@_la-gstvaapidecoder_h264.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstvaapi_@GST_API_VERSION@_la-gstvaapidecoder_h265.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstvaapi_@GST_API_VERSION@_la-gstvaapidecoder_jpeg.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstvaapi_@GST_API_VERSION@_la-gstvaapidecoder_mpeg2.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstvaapi_@GST_API_VERSION@_la-gstvaapidecoder_mpeg4.Plo@am__quote@
@@ -1098,8 +1248,11 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstvaapi_@GST_API_VERSION@_la-gstvaapidisplaycache.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstvaapi_@GST_API_VERSION@_la-gstvaapiencoder.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstvaapi_@GST_API_VERSION@_la-gstvaapiencoder_h264.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstvaapi_@GST_API_VERSION@_la-gstvaapiencoder_h265.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstvaapi_@GST_API_VERSION@_la-gstvaapiencoder_jpeg.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstvaapi_@GST_API_VERSION@_la-gstvaapiencoder_mpeg2.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstvaapi_@GST_API_VERSION@_la-gstvaapiencoder_objects.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstvaapi_@GST_API_VERSION@_la-gstvaapiencoder_vp8.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstvaapi_@GST_API_VERSION@_la-gstvaapifilter.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstvaapi_@GST_API_VERSION@_la-gstvaapiimage.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstvaapi_@GST_API_VERSION@_la-gstvaapiimagepool.Plo@am__quote@
@@ -1117,6 +1270,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstvaapi_@GST_API_VERSION@_la-gstvaapiutils.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstvaapi_@GST_API_VERSION@_la-gstvaapiutils_core.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstvaapi_@GST_API_VERSION@_la-gstvaapiutils_h264.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstvaapi_@GST_API_VERSION@_la-gstvaapiutils_h265.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstvaapi_@GST_API_VERSION@_la-gstvaapiutils_mpeg2.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstvaapi_@GST_API_VERSION@_la-gstvaapivalue.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstvaapi_@GST_API_VERSION@_la-gstvaapivideopool.Plo@am__quote@
@@ -1125,6 +1279,11 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstvaapi_drm_@GST_API_VERSION@_la-gstvaapidisplay_drm.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstvaapi_drm_@GST_API_VERSION@_la-gstvaapiutils.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstvaapi_drm_@GST_API_VERSION@_la-gstvaapiwindow_drm.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstvaapi_egl_@GST_API_VERSION@_la-gstvaapidisplay_egl.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstvaapi_egl_@GST_API_VERSION@_la-gstvaapisurface_egl.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstvaapi_egl_@GST_API_VERSION@_la-gstvaapitexture_egl.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstvaapi_egl_@GST_API_VERSION@_la-gstvaapiutils_egl.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstvaapi_egl_@GST_API_VERSION@_la-gstvaapiwindow_egl.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstvaapi_glx_@GST_API_VERSION@_la-gstvaapidisplay_glx.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstvaapi_glx_@GST_API_VERSION@_la-gstvaapitexture_glx.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstvaapi_glx_@GST_API_VERSION@_la-gstvaapiutils.Plo@am__quote@
@@ -1427,6 +1586,20 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstvaapi_@GST_API_VERSION@_la_CFLAGS) $(CFLAGS) -c -o libgstvaapi_@GST_API_VERSION@_la-gstvaapidecoder_vp8.lo `test -f 'gstvaapidecoder_vp8.c' || echo '$(srcdir)/'`gstvaapidecoder_vp8.c
 
+libgstvaapi_@GST_API_VERSION@_la-gstvaapidecoder_h265.lo: gstvaapidecoder_h265.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstvaapi_@GST_API_VERSION@_la_CFLAGS) $(CFLAGS) -MT libgstvaapi_@GST_API_VERSION@_la-gstvaapidecoder_h265.lo -MD -MP -MF $(DEPDIR)/libgstvaapi_@GST_API_VERSION@_la-gstvaapidecoder_h265.Tpo -c -o libgstvaapi_@GST_API_VERSION@_la-gstvaapidecoder_h265.lo `test -f 'gstvaapidecoder_h265.c' || echo '$(srcdir)/'`gstvaapidecoder_h265.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgstvaapi_@GST_API_VERSION@_la-gstvaapidecoder_h265.Tpo $(DEPDIR)/libgstvaapi_@GST_API_VERSION@_la-gstvaapidecoder_h265.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gstvaapidecoder_h265.c' object='libgstvaapi_@GST_API_VERSION@_la-gstvaapidecoder_h265.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstvaapi_@GST_API_VERSION@_la_CFLAGS) $(CFLAGS) -c -o libgstvaapi_@GST_API_VERSION@_la-gstvaapidecoder_h265.lo `test -f 'gstvaapidecoder_h265.c' || echo '$(srcdir)/'`gstvaapidecoder_h265.c
+
+libgstvaapi_@GST_API_VERSION@_la-gstvaapiutils_h265.lo: gstvaapiutils_h265.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstvaapi_@GST_API_VERSION@_la_CFLAGS) $(CFLAGS) -MT libgstvaapi_@GST_API_VERSION@_la-gstvaapiutils_h265.lo -MD -MP -MF $(DEPDIR)/libgstvaapi_@GST_API_VERSION@_la-gstvaapiutils_h265.Tpo -c -o libgstvaapi_@GST_API_VERSION@_la-gstvaapiutils_h265.lo `test -f 'gstvaapiutils_h265.c' || echo '$(srcdir)/'`gstvaapiutils_h265.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgstvaapi_@GST_API_VERSION@_la-gstvaapiutils_h265.Tpo $(DEPDIR)/libgstvaapi_@GST_API_VERSION@_la-gstvaapiutils_h265.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gstvaapiutils_h265.c' object='libgstvaapi_@GST_API_VERSION@_la-gstvaapiutils_h265.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstvaapi_@GST_API_VERSION@_la_CFLAGS) $(CFLAGS) -c -o libgstvaapi_@GST_API_VERSION@_la-gstvaapiutils_h265.lo `test -f 'gstvaapiutils_h265.c' || echo '$(srcdir)/'`gstvaapiutils_h265.c
+
 libgstvaapi_@GST_API_VERSION@_la-gstvaapicodedbuffer.lo: gstvaapicodedbuffer.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstvaapi_@GST_API_VERSION@_la_CFLAGS) $(CFLAGS) -MT libgstvaapi_@GST_API_VERSION@_la-gstvaapicodedbuffer.lo -MD -MP -MF $(DEPDIR)/libgstvaapi_@GST_API_VERSION@_la-gstvaapicodedbuffer.Tpo -c -o libgstvaapi_@GST_API_VERSION@_la-gstvaapicodedbuffer.lo `test -f 'gstvaapicodedbuffer.c' || echo '$(srcdir)/'`gstvaapicodedbuffer.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgstvaapi_@GST_API_VERSION@_la-gstvaapicodedbuffer.Tpo $(DEPDIR)/libgstvaapi_@GST_API_VERSION@_la-gstvaapicodedbuffer.Plo
@@ -1476,6 +1649,27 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstvaapi_@GST_API_VERSION@_la_CFLAGS) $(CFLAGS) -c -o libgstvaapi_@GST_API_VERSION@_la-gstvaapiencoder_objects.lo `test -f 'gstvaapiencoder_objects.c' || echo '$(srcdir)/'`gstvaapiencoder_objects.c
 
+libgstvaapi_@GST_API_VERSION@_la-gstvaapiencoder_jpeg.lo: gstvaapiencoder_jpeg.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstvaapi_@GST_API_VERSION@_la_CFLAGS) $(CFLAGS) -MT libgstvaapi_@GST_API_VERSION@_la-gstvaapiencoder_jpeg.lo -MD -MP -MF $(DEPDIR)/libgstvaapi_@GST_API_VERSION@_la-gstvaapiencoder_jpeg.Tpo -c -o libgstvaapi_@GST_API_VERSION@_la-gstvaapiencoder_jpeg.lo `test -f 'gstvaapiencoder_jpeg.c' || echo '$(srcdir)/'`gstvaapiencoder_jpeg.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgstvaapi_@GST_API_VERSION@_la-gstvaapiencoder_jpeg.Tpo $(DEPDIR)/libgstvaapi_@GST_API_VERSION@_la-gstvaapiencoder_jpeg.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gstvaapiencoder_jpeg.c' object='libgstvaapi_@GST_API_VERSION@_la-gstvaapiencoder_jpeg.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstvaapi_@GST_API_VERSION@_la_CFLAGS) $(CFLAGS) -c -o libgstvaapi_@GST_API_VERSION@_la-gstvaapiencoder_jpeg.lo `test -f 'gstvaapiencoder_jpeg.c' || echo '$(srcdir)/'`gstvaapiencoder_jpeg.c
+
+libgstvaapi_@GST_API_VERSION@_la-gstvaapiencoder_vp8.lo: gstvaapiencoder_vp8.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstvaapi_@GST_API_VERSION@_la_CFLAGS) $(CFLAGS) -MT libgstvaapi_@GST_API_VERSION@_la-gstvaapiencoder_vp8.lo -MD -MP -MF $(DEPDIR)/libgstvaapi_@GST_API_VERSION@_la-gstvaapiencoder_vp8.Tpo -c -o libgstvaapi_@GST_API_VERSION@_la-gstvaapiencoder_vp8.lo `test -f 'gstvaapiencoder_vp8.c' || echo '$(srcdir)/'`gstvaapiencoder_vp8.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgstvaapi_@GST_API_VERSION@_la-gstvaapiencoder_vp8.Tpo $(DEPDIR)/libgstvaapi_@GST_API_VERSION@_la-gstvaapiencoder_vp8.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gstvaapiencoder_vp8.c' object='libgstvaapi_@GST_API_VERSION@_la-gstvaapiencoder_vp8.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstvaapi_@GST_API_VERSION@_la_CFLAGS) $(CFLAGS) -c -o libgstvaapi_@GST_API_VERSION@_la-gstvaapiencoder_vp8.lo `test -f 'gstvaapiencoder_vp8.c' || echo '$(srcdir)/'`gstvaapiencoder_vp8.c
+
+libgstvaapi_@GST_API_VERSION@_la-gstvaapiencoder_h265.lo: gstvaapiencoder_h265.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstvaapi_@GST_API_VERSION@_la_CFLAGS) $(CFLAGS) -MT libgstvaapi_@GST_API_VERSION@_la-gstvaapiencoder_h265.lo -MD -MP -MF $(DEPDIR)/libgstvaapi_@GST_API_VERSION@_la-gstvaapiencoder_h265.Tpo -c -o libgstvaapi_@GST_API_VERSION@_la-gstvaapiencoder_h265.lo `test -f 'gstvaapiencoder_h265.c' || echo '$(srcdir)/'`gstvaapiencoder_h265.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgstvaapi_@GST_API_VERSION@_la-gstvaapiencoder_h265.Tpo $(DEPDIR)/libgstvaapi_@GST_API_VERSION@_la-gstvaapiencoder_h265.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gstvaapiencoder_h265.c' object='libgstvaapi_@GST_API_VERSION@_la-gstvaapiencoder_h265.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstvaapi_@GST_API_VERSION@_la_CFLAGS) $(CFLAGS) -c -o libgstvaapi_@GST_API_VERSION@_la-gstvaapiencoder_h265.lo `test -f 'gstvaapiencoder_h265.c' || echo '$(srcdir)/'`gstvaapiencoder_h265.c
+
 libgstvaapi_drm_@GST_API_VERSION@_la-gstvaapidisplay_drm.lo: gstvaapidisplay_drm.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstvaapi_drm_@GST_API_VERSION@_la_CFLAGS) $(CFLAGS) -MT libgstvaapi_drm_@GST_API_VERSION@_la-gstvaapidisplay_drm.lo -MD -MP -MF $(DEPDIR)/libgstvaapi_drm_@GST_API_VERSION@_la-gstvaapidisplay_drm.Tpo -c -o libgstvaapi_drm_@GST_API_VERSION@_la-gstvaapidisplay_drm.lo `test -f 'gstvaapidisplay_drm.c' || echo '$(srcdir)/'`gstvaapidisplay_drm.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgstvaapi_drm_@GST_API_VERSION@_la-gstvaapidisplay_drm.Tpo $(DEPDIR)/libgstvaapi_drm_@GST_API_VERSION@_la-gstvaapidisplay_drm.Plo
@@ -1497,6 +1691,41 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstvaapi_drm_@GST_API_VERSION@_la_CFLAGS) $(CFLAGS) -c -o libgstvaapi_drm_@GST_API_VERSION@_la-gstvaapiutils.lo `test -f 'gstvaapiutils.c' || echo '$(srcdir)/'`gstvaapiutils.c
 
+libgstvaapi_egl_@GST_API_VERSION@_la-gstvaapidisplay_egl.lo: gstvaapidisplay_egl.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstvaapi_egl_@GST_API_VERSION@_la_CFLAGS) $(CFLAGS) -MT libgstvaapi_egl_@GST_API_VERSION@_la-gstvaapidisplay_egl.lo -MD -MP -MF $(DEPDIR)/libgstvaapi_egl_@GST_API_VERSION@_la-gstvaapidisplay_egl.Tpo -c -o libgstvaapi_egl_@GST_API_VERSION@_la-gstvaapidisplay_egl.lo `test -f 'gstvaapidisplay_egl.c' || echo '$(srcdir)/'`gstvaapidisplay_egl.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgstvaapi_egl_@GST_API_VERSION@_la-gstvaapidisplay_egl.Tpo $(DEPDIR)/libgstvaapi_egl_@GST_API_VERSION@_la-gstvaapidisplay_egl.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gstvaapidisplay_egl.c' object='libgstvaapi_egl_@GST_API_VERSION@_la-gstvaapidisplay_egl.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstvaapi_egl_@GST_API_VERSION@_la_CFLAGS) $(CFLAGS) -c -o libgstvaapi_egl_@GST_API_VERSION@_la-gstvaapidisplay_egl.lo `test -f 'gstvaapidisplay_egl.c' || echo '$(srcdir)/'`gstvaapidisplay_egl.c
+
+libgstvaapi_egl_@GST_API_VERSION@_la-gstvaapisurface_egl.lo: gstvaapisurface_egl.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstvaapi_egl_@GST_API_VERSION@_la_CFLAGS) $(CFLAGS) -MT libgstvaapi_egl_@GST_API_VERSION@_la-gstvaapisurface_egl.lo -MD -MP -MF $(DEPDIR)/libgstvaapi_egl_@GST_API_VERSION@_la-gstvaapisurface_egl.Tpo -c -o libgstvaapi_egl_@GST_API_VERSION@_la-gstvaapisurface_egl.lo `test -f 'gstvaapisurface_egl.c' || echo '$(srcdir)/'`gstvaapisurface_egl.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgstvaapi_egl_@GST_API_VERSION@_la-gstvaapisurface_egl.Tpo $(DEPDIR)/libgstvaapi_egl_@GST_API_VERSION@_la-gstvaapisurface_egl.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gstvaapisurface_egl.c' object='libgstvaapi_egl_@GST_API_VERSION@_la-gstvaapisurface_egl.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstvaapi_egl_@GST_API_VERSION@_la_CFLAGS) $(CFLAGS) -c -o libgstvaapi_egl_@GST_API_VERSION@_la-gstvaapisurface_egl.lo `test -f 'gstvaapisurface_egl.c' || echo '$(srcdir)/'`gstvaapisurface_egl.c
+
+libgstvaapi_egl_@GST_API_VERSION@_la-gstvaapitexture_egl.lo: gstvaapitexture_egl.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstvaapi_egl_@GST_API_VERSION@_la_CFLAGS) $(CFLAGS) -MT libgstvaapi_egl_@GST_API_VERSION@_la-gstvaapitexture_egl.lo -MD -MP -MF $(DEPDIR)/libgstvaapi_egl_@GST_API_VERSION@_la-gstvaapitexture_egl.Tpo -c -o libgstvaapi_egl_@GST_API_VERSION@_la-gstvaapitexture_egl.lo `test -f 'gstvaapitexture_egl.c' || echo '$(srcdir)/'`gstvaapitexture_egl.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgstvaapi_egl_@GST_API_VERSION@_la-gstvaapitexture_egl.Tpo $(DEPDIR)/libgstvaapi_egl_@GST_API_VERSION@_la-gstvaapitexture_egl.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gstvaapitexture_egl.c' object='libgstvaapi_egl_@GST_API_VERSION@_la-gstvaapitexture_egl.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstvaapi_egl_@GST_API_VERSION@_la_CFLAGS) $(CFLAGS) -c -o libgstvaapi_egl_@GST_API_VERSION@_la-gstvaapitexture_egl.lo `test -f 'gstvaapitexture_egl.c' || echo '$(srcdir)/'`gstvaapitexture_egl.c
+
+libgstvaapi_egl_@GST_API_VERSION@_la-gstvaapiutils_egl.lo: gstvaapiutils_egl.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstvaapi_egl_@GST_API_VERSION@_la_CFLAGS) $(CFLAGS) -MT libgstvaapi_egl_@GST_API_VERSION@_la-gstvaapiutils_egl.lo -MD -MP -MF $(DEPDIR)/libgstvaapi_egl_@GST_API_VERSION@_la-gstvaapiutils_egl.Tpo -c -o libgstvaapi_egl_@GST_API_VERSION@_la-gstvaapiutils_egl.lo `test -f 'gstvaapiutils_egl.c' || echo '$(srcdir)/'`gstvaapiutils_egl.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgstvaapi_egl_@GST_API_VERSION@_la-gstvaapiutils_egl.Tpo $(DEPDIR)/libgstvaapi_egl_@GST_API_VERSION@_la-gstvaapiutils_egl.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gstvaapiutils_egl.c' object='libgstvaapi_egl_@GST_API_VERSION@_la-gstvaapiutils_egl.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstvaapi_egl_@GST_API_VERSION@_la_CFLAGS) $(CFLAGS) -c -o libgstvaapi_egl_@GST_API_VERSION@_la-gstvaapiutils_egl.lo `test -f 'gstvaapiutils_egl.c' || echo '$(srcdir)/'`gstvaapiutils_egl.c
+
+libgstvaapi_egl_@GST_API_VERSION@_la-gstvaapiwindow_egl.lo: gstvaapiwindow_egl.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstvaapi_egl_@GST_API_VERSION@_la_CFLAGS) $(CFLAGS) -MT libgstvaapi_egl_@GST_API_VERSION@_la-gstvaapiwindow_egl.lo -MD -MP -MF $(DEPDIR)/libgstvaapi_egl_@GST_API_VERSION@_la-gstvaapiwindow_egl.Tpo -c -o libgstvaapi_egl_@GST_API_VERSION@_la-gstvaapiwindow_egl.lo `test -f 'gstvaapiwindow_egl.c' || echo '$(srcdir)/'`gstvaapiwindow_egl.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgstvaapi_egl_@GST_API_VERSION@_la-gstvaapiwindow_egl.Tpo $(DEPDIR)/libgstvaapi_egl_@GST_API_VERSION@_la-gstvaapiwindow_egl.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gstvaapiwindow_egl.c' object='libgstvaapi_egl_@GST_API_VERSION@_la-gstvaapiwindow_egl.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstvaapi_egl_@GST_API_VERSION@_la_CFLAGS) $(CFLAGS) -c -o libgstvaapi_egl_@GST_API_VERSION@_la-gstvaapiwindow_egl.lo `test -f 'gstvaapiwindow_egl.c' || echo '$(srcdir)/'`gstvaapiwindow_egl.c
+
 libgstvaapi_glx_@GST_API_VERSION@_la-gstvaapidisplay_glx.lo: gstvaapidisplay_glx.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstvaapi_glx_@GST_API_VERSION@_la_CFLAGS) $(CFLAGS) -MT libgstvaapi_glx_@GST_API_VERSION@_la-gstvaapidisplay_glx.lo -MD -MP -MF $(DEPDIR)/libgstvaapi_glx_@GST_API_VERSION@_la-gstvaapidisplay_glx.Tpo -c -o libgstvaapi_glx_@GST_API_VERSION@_la-gstvaapidisplay_glx.lo `test -f 'gstvaapidisplay_glx.c' || echo '$(srcdir)/'`gstvaapidisplay_glx.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgstvaapi_glx_@GST_API_VERSION@_la-gstvaapidisplay_glx.Tpo $(DEPDIR)/libgstvaapi_glx_@GST_API_VERSION@_la-gstvaapidisplay_glx.Plo
@@ -1642,6 +1871,27 @@
 	@list='$(libgstvaapi_drm_@GST_API_VERSION@include_HEADERS)'; test -n "$(libgstvaapi_drm_@GST_API_VERSION@includedir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	dir='$(DESTDIR)$(libgstvaapi_drm_@GST_API_VERSION@includedir)'; $(am__uninstall_files_from_dir)
+install-libgstvaapi_egl_@GST_API_VERSION@includeHEADERS: $(libgstvaapi_egl_@GST_API_VERSION@include_HEADERS)
+	@$(NORMAL_INSTALL)
+	@list='$(libgstvaapi_egl_@GST_API_VERSION@include_HEADERS)'; test -n "$(libgstvaapi_egl_@GST_API_VERSION@includedir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(libgstvaapi_egl_@GST_API_VERSION@includedir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(libgstvaapi_egl_@GST_API_VERSION@includedir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libgstvaapi_egl_@GST_API_VERSION@includedir)'"; \
+	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(libgstvaapi_egl_@GST_API_VERSION@includedir)" || exit $$?; \
+	done
+
+uninstall-libgstvaapi_egl_@GST_API_VERSION@includeHEADERS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(libgstvaapi_egl_@GST_API_VERSION@include_HEADERS)'; test -n "$(libgstvaapi_egl_@GST_API_VERSION@includedir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(libgstvaapi_egl_@GST_API_VERSION@includedir)'; $(am__uninstall_files_from_dir)
 install-libgstvaapi_glx_@GST_API_VERSION@includeHEADERS: $(libgstvaapi_glx_@GST_API_VERSION@include_HEADERS)
 	@$(NORMAL_INSTALL)
 	@list='$(libgstvaapi_glx_@GST_API_VERSION@include_HEADERS)'; test -n "$(libgstvaapi_glx_@GST_API_VERSION@includedir)" || list=; \
@@ -1747,7 +1997,7 @@
 	$(MAKE) $(AM_MAKEFLAGS) check-am
 all-am: Makefile $(LTLIBRARIES) $(HEADERS)
 installdirs:
-	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libgstvaapi_@GST_API_VERSION@includedir)" "$(DESTDIR)$(libgstvaapi_drm_@GST_API_VERSION@includedir)" "$(DESTDIR)$(libgstvaapi_glx_@GST_API_VERSION@includedir)" "$(DESTDIR)$(libgstvaapi_wayland_@GST_API_VERSION@includedir)" "$(DESTDIR)$(libgstvaapi_x11_@GST_API_VERSION@includedir)"; do \
+	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libgstvaapi_@GST_API_VERSION@includedir)" "$(DESTDIR)$(libgstvaapi_drm_@GST_API_VERSION@includedir)" "$(DESTDIR)$(libgstvaapi_egl_@GST_API_VERSION@includedir)" "$(DESTDIR)$(libgstvaapi_glx_@GST_API_VERSION@includedir)" "$(DESTDIR)$(libgstvaapi_wayland_@GST_API_VERSION@includedir)" "$(DESTDIR)$(libgstvaapi_x11_@GST_API_VERSION@includedir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: $(BUILT_SOURCES)
@@ -1778,12 +2028,12 @@
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
 	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
-	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
 clean: clean-am
 
 clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
@@ -1808,6 +2058,7 @@
 
 install-data-am: install-libgstvaapi_@GST_API_VERSION@includeHEADERS \
 	install-libgstvaapi_drm_@GST_API_VERSION@includeHEADERS \
+	install-libgstvaapi_egl_@GST_API_VERSION@includeHEADERS \
 	install-libgstvaapi_glx_@GST_API_VERSION@includeHEADERS \
 	install-libgstvaapi_wayland_@GST_API_VERSION@includeHEADERS \
 	install-libgstvaapi_x11_@GST_API_VERSION@includeHEADERS
@@ -1859,6 +2110,7 @@
 uninstall-am: uninstall-libLTLIBRARIES \
 	uninstall-libgstvaapi_@GST_API_VERSION@includeHEADERS \
 	uninstall-libgstvaapi_drm_@GST_API_VERSION@includeHEADERS \
+	uninstall-libgstvaapi_egl_@GST_API_VERSION@includeHEADERS \
 	uninstall-libgstvaapi_glx_@GST_API_VERSION@includeHEADERS \
 	uninstall-libgstvaapi_wayland_@GST_API_VERSION@includeHEADERS \
 	uninstall-libgstvaapi_x11_@GST_API_VERSION@includeHEADERS
@@ -1875,6 +2127,7 @@
 	install-libLTLIBRARIES \
 	install-libgstvaapi_@GST_API_VERSION@includeHEADERS \
 	install-libgstvaapi_drm_@GST_API_VERSION@includeHEADERS \
+	install-libgstvaapi_egl_@GST_API_VERSION@includeHEADERS \
 	install-libgstvaapi_glx_@GST_API_VERSION@includeHEADERS \
 	install-libgstvaapi_wayland_@GST_API_VERSION@includeHEADERS \
 	install-libgstvaapi_x11_@GST_API_VERSION@includeHEADERS \
@@ -1886,6 +2139,7 @@
 	uninstall-am uninstall-libLTLIBRARIES \
 	uninstall-libgstvaapi_@GST_API_VERSION@includeHEADERS \
 	uninstall-libgstvaapi_drm_@GST_API_VERSION@includeHEADERS \
+	uninstall-libgstvaapi_egl_@GST_API_VERSION@includeHEADERS \
 	uninstall-libgstvaapi_glx_@GST_API_VERSION@includeHEADERS \
 	uninstall-libgstvaapi_wayland_@GST_API_VERSION@includeHEADERS \
 	uninstall-libgstvaapi_x11_@GST_API_VERSION@includeHEADERS
@@ -1911,6 +2165,8 @@
 $(PKG_VERSION_FILE): $(NEW_VERSION_FILE)
 	@cp -f $< $@
 
+-include $(top_srcdir)/git.mk
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -Nru gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/ogl_compat.h gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/ogl_compat.h
--- gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/ogl_compat.h	1970-01-01 00:00:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/ogl_compat.h	2015-07-15 12:47:43.000000000 +0000
@@ -0,0 +1,104 @@
+/*
+ * ogl_compat.h - OpenGL compatiliby layer
+ *
+ * Copyright (C) 2014 Intel Corporation
+ *   Author: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1
+ * of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301
+ */
+
+#ifndef OGL_COMPAT_H
+#define OGL_COMPAT_H
+
+typedef void                    GLvoid;
+typedef char                    GLchar;
+typedef unsigned char           GLubyte;
+typedef unsigned char           GLboolean;
+typedef int                     GLint;
+typedef unsigned int            GLuint;
+typedef int                     GLsizei;
+typedef float                   GLfloat;
+typedef double                  GLdouble;
+typedef GLuint                  GLenum;
+typedef GLuint                  GLbitfield;
+typedef GLfloat                 GLclampf;
+
+#define GL_VENDOR               0x1F00
+#define GL_RENDERER             0x1F01
+#define GL_VERSION              0x1F02
+#define GL_EXTENSIONS           0x1F03
+#define GL_NEAREST              0x2600
+#define GL_LINEAR               0x2601
+
+#define GL_DEPTH_BUFFER_BIT     0x00000100
+#define GL_COLOR_BUFFER_BIT     0x00004000
+#define GL_FALSE                0
+#define GL_TRUE                 1
+#define GL_NONE                 0
+
+#define GL_BLEND                0x0BE2
+#define GL_DEPTH_TEST           0x0B71
+
+#define GL_TEXTURE0             0x84C0
+#define GL_TEXTURE1             0x84C1
+#define GL_TEXTURE2             0x84C2
+#define GL_TEXTURE3             0x84C3
+#define GL_TEXTURE_2D           0x0DE1
+#define GL_TEXTURE_EXTERNAL_OES 0x8D65
+#define GL_TEXTURE_MAG_FILTER   0x2800
+#define GL_TEXTURE_MIN_FILTER   0x2801
+#define GL_TEXTURE_WRAP_S       0x2802
+#define GL_TEXTURE_WRAP_T       0x2803
+
+#define GL_UNPACK_ALIGNMENT     0x0cf5
+
+#define GL_TRIANGLE_FAN         0x0006
+
+#define GL_BYTE                 0x1400
+#define GL_UNSIGNED_BYTE        0x1401
+#define GL_SHORT                0x1402
+#define GL_UNSIGNED_SHORT       0x1403
+#define GL_INT                  0x1404
+#define GL_UNSIGNED_INT         0x1405
+#define GL_FLOAT                0x1406
+
+#define GL_ALPHA                0x1906
+#define GL_RGB                  0x1907
+#define GL_RGBA                 0x1908
+#define GL_LUMINANCE            0x1909
+#define GL_LUMINANCE_ALPHA      0x190A
+
+#define GL_REPEAT               0x2901
+#define GL_CLAMP_TO_EDGE        0x812F
+
+#define GL_VERTEX_ARRAY         0x8074
+#define GL_TEXTURE_COORD_ARRAY  0x8078
+
+#define GL_FRAGMENT_SHADER      0x8B30
+#define GL_VERTEX_SHADER        0x8B31
+#define GL_COMPILE_STATUS       0x8B81
+#define GL_LINK_STATUS          0x8B82
+#define GL_INFO_LOG_LENGTH      0x8B84
+
+#define GL_BGRA_EXT             0x80e1
+#ifndef GL_R8
+#define GL_R8                   GL_R8_EXT
+#endif
+#ifndef GL_RG8
+#define GL_RG8                  GL_RG8_EXT
+#endif
+
+#endif /* OGL_COMPAT_H */
diff -Nru gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/sysdeps.h gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/sysdeps.h
--- gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/sysdeps.h	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/sysdeps.h	2015-07-15 12:47:43.000000000 +0000
@@ -32,6 +32,7 @@
 #include <string.h>
 
 #include "glibcompat.h"
-#include "gstcompat.h"
+
+#include <gst/gst.h>
 
 #endif /* SYSDEPS_H */
diff -Nru gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/.VERSION.pkg gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/.VERSION.pkg
--- gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/.VERSION.pkg	2015-02-03 08:44:56.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/.VERSION.pkg	2015-07-15 12:52:21.000000000 +0000
@@ -1 +1 @@
-0.5.10
+0.6.0
diff -Nru gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/video-format.c gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/video-format.c
--- gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/video-format.c	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/video-format.c	2015-07-15 12:47:43.000000000 +0000
@@ -126,55 +126,6 @@
 }
 
 /**
- * gst_vaapi_video_format_from_string:
- * @str: a string representation of #GstVideoFormat
- *
- * Returns the #GstVideoFormat represented as the string @str.
- *
- * Return value: #GstVideoFormat for the string representation of
- *   video format in @str.
- */
-GstVideoFormat
-gst_vaapi_video_format_from_string (const gchar * str)
-{
-#if GST_CHECK_VERSION(1,0,0)
-  return gst_video_format_from_string (str);
-#else
-  GstVideoFormat format = GST_VIDEO_FORMAT_UNKNOWN;
-
-  do {
-    /* Validate input string */
-    if (!str)
-      break;
-
-    /* Fast path: assume this represents a common fourcc value */
-    const guint32 fourcc = GST_MAKE_FOURCC (str[0], str[1], str[2], str[3]);
-    format = gst_video_format_from_fourcc (fourcc);
-    if (format != GST_VIDEO_FORMAT_UNKNOWN)
-      break;
-
-    /* Slow path: check through all registered enum values */
-    GEnumClass *const enum_class = g_type_class_ref (GST_TYPE_VIDEO_FORMAT);
-    if (!enum_class)
-      break;
-
-    gchar *const video_format_str =
-        g_strdup_printf ("GST_VIDEO_FORMAT_%s", str);
-    if (video_format_str) {
-      const GEnumValue *const enum_value =
-          g_enum_get_value_by_name (enum_class, video_format_str);
-
-      if (enum_value)
-        format = enum_value->value;
-      g_free (video_format_str);
-    }
-    g_type_class_unref (enum_class);
-  } while (0);
-  return format;
-#endif
-}
-
-/**
  * gst_vaapi_video_format_to_string:
  * @format: a #GstVideoFormat
  *
diff -Nru gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/video-format.h gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/video-format.h
--- gstreamer-vaapi-0.5.10/gst-libs/gst/vaapi/video-format.h	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst-libs/gst/vaapi/video-format.h	2015-07-15 12:47:43.000000000 +0000
@@ -29,9 +29,6 @@
 
 G_BEGIN_DECLS
 
-GstVideoFormat
-gst_vaapi_video_format_from_string (const gchar * str);
-
 const gchar *
 gst_vaapi_video_format_to_string (GstVideoFormat format);
 
diff -Nru gstreamer-vaapi-0.5.10/gst-libs/gst/video/Makefile.am gstreamer-vaapi-0.6.0/gst-libs/gst/video/Makefile.am
--- gstreamer-vaapi-0.5.10/gst-libs/gst/video/Makefile.am	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst-libs/gst/video/Makefile.am	1970-01-01 00:00:00.000000000 +0000
@@ -1,65 +0,0 @@
-noinst_LTLIBRARIES =				\
-	libgstvaapi-videoutils.la		\
-	$(NULL)
-
-local_videoutils_srcdir = \
-	$(top_srcdir)/ext/videoutils/gst-libs/gst/video
-
-libgstvaapi_videoutils_cflags =			\
-	-DGST_USE_UNSTABLE_API			\
-	-I$(top_srcdir)/gst-libs		\
-	-I$(top_builddir)/gst-libs		\
-	$(GST_BASE_CFLAGS)			\
-	$(GST_CFLAGS)				\
-	$(NULL)
-
-libgstvaapi_videoutils_libs =			\
-	$(GST_BASE_LIBS)			\
-	$(GST_LIBS)				\
-	$(NULL)
-
-gen_source_c =
-gen_source_h =
-
-if USE_GST_API_0_10
-gen_source_c += gstvideodecoder.c gstvideoencoder.c gstvideoutils.c video.c
-gen_source_h += gstvideodecoder.h gstvideoencoder.h gstvideoutils.h video.h
-endif
-
-GENFILES = \
-	$(gen_source_c)				\
-	$(gen_source_h)				\
-	$(NULL)
-
-nodist_EXTRA_libgstvaapi_videoutils_la_SOURCES = dummy.c
-
-nodist_libgstvaapi_videoutils_la_SOURCES =	\
-	$(gen_source_c)				\
-	$(NULL)
-
-libgstvaapi_videoutils_la_CFLAGS =		\
-	$(libgstvaapi_videoutils_cflags)	\
-	$(NULL)
-
-libgstvaapi_videoutils_la_LIBADD =		\
-	$(libgstvaapi_videoutils_libs)		\
-	$(NULL)
-
-libgstvaapi_videoutils_la_LDFLAGS =		\
-	$(GST_ALL_LDFLAGS)			\
-	$(NULL)
-
-all-local: .timestamp.symlinks
-
-.timestamp.symlinks: $(GENFILES)
-	touch $@
-
-$(gen_source_c): %.c: $(local_videoutils_srcdir)/%.c $(gen_source_h) 
-	$(LN_S) -f $< $@
-$(gen_source_h): %.h: $(local_videoutils_srcdir)/%.h
-	$(LN_S) -f $< $@
-
-DISTCLEANFILES = $(GENFILES) .timestamp.symlinks
-
-# Extra clean files so that maintainer-clean removes *everything*
-MAINTAINERCLEANFILES = Makefile.in
diff -Nru gstreamer-vaapi-0.5.10/gst-libs/gst/video/Makefile.in gstreamer-vaapi-0.6.0/gst-libs/gst/video/Makefile.in
--- gstreamer-vaapi-0.5.10/gst-libs/gst/video/Makefile.in	2015-02-03 08:39:54.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst-libs/gst/video/Makefile.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,761 +0,0 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-@USE_GST_API_0_10_TRUE@am__append_1 = gstvideodecoder.c gstvideoencoder.c gstvideoutils.c video.c
-@USE_GST_API_0_10_TRUE@am__append_2 = gstvideodecoder.h gstvideoencoder.h gstvideoutils.h video.h
-subdir = gst-libs/gst/video
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/build-aux/depcomp
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-LTLIBRARIES = $(noinst_LTLIBRARIES)
-am__DEPENDENCIES_1 =
-am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-libgstvaapi_videoutils_la_DEPENDENCIES = $(am__DEPENDENCIES_2)
-@USE_GST_API_0_10_TRUE@am__objects_1 = libgstvaapi_videoutils_la-gstvideodecoder.lo \
-@USE_GST_API_0_10_TRUE@	libgstvaapi_videoutils_la-gstvideoencoder.lo \
-@USE_GST_API_0_10_TRUE@	libgstvaapi_videoutils_la-gstvideoutils.lo \
-@USE_GST_API_0_10_TRUE@	libgstvaapi_videoutils_la-video.lo
-am__objects_2 = $(am__objects_1)
-nodist_libgstvaapi_videoutils_la_OBJECTS = $(am__objects_2)
-libgstvaapi_videoutils_la_OBJECTS =  \
-	$(nodist_libgstvaapi_videoutils_la_OBJECTS)
-AM_V_lt = $(am__v_lt_@AM_V@)
-am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
-am__v_lt_0 = --silent
-am__v_lt_1 = 
-libgstvaapi_videoutils_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(libgstvaapi_videoutils_la_CFLAGS) $(CFLAGS) \
-	$(libgstvaapi_videoutils_la_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_@AM_V@)
-am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC      " $@;
-am__v_CC_1 = 
-CCLD = $(CC)
-LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_@AM_V@)
-am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD    " $@;
-am__v_CCLD_1 = 
-SOURCES = $(nodist_libgstvaapi_videoutils_la_SOURCES) \
-	$(nodist_EXTRA_libgstvaapi_videoutils_la_SOURCES)
-DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-# Read a list of newline-separated strings from the standard input,
-# and print each of them once, without duplicates.  Input order is
-# *not* preserved.
-am__uniquify_input = $(AWK) '\
-  BEGIN { nonempty = 0; } \
-  { items[$$0] = 1; nonempty = 1; } \
-  END { if (nonempty) { for (i in items) print i; }; } \
-'
-# Make sure the list of sources is unique.  This is necessary because,
-# e.g., the same source file might be shared among _SOURCES variables
-# for different programs/libraries.
-am__define_uniq_tagged_files = \
-  list='$(am__tagged_files)'; \
-  unique=`for i in $$list; do \
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-  done | $(am__uniquify_input)`
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DLOPEN_LIBS = @DLOPEN_LIBS@
-DRM_CFLAGS = @DRM_CFLAGS@
-DRM_LIBS = @DRM_LIBS@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GIT = @GIT@
-GLIB_CFLAGS = @GLIB_CFLAGS@
-GLIB_LIBS = @GLIB_LIBS@
-GLIB_VERSION_REQUIRED = @GLIB_VERSION_REQUIRED@
-GL_CFLAGS = @GL_CFLAGS@
-GL_LIBS = @GL_LIBS@
-GREP = @GREP@
-GST_ALLOCATORS_CFLAGS = @GST_ALLOCATORS_CFLAGS@
-GST_ALLOCATORS_LIBS = @GST_ALLOCATORS_LIBS@
-GST_ALL_LDFLAGS = @GST_ALL_LDFLAGS@
-GST_API_VERSION = @GST_API_VERSION@
-GST_BASEVIDEO_CFLAGS = @GST_BASEVIDEO_CFLAGS@
-GST_BASEVIDEO_LIBS = @GST_BASEVIDEO_LIBS@
-GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
-GST_BASE_LIBS = @GST_BASE_LIBS@
-GST_CFLAGS = @GST_CFLAGS@
-GST_CODEC_PARSERS_CFLAGS = @GST_CODEC_PARSERS_CFLAGS@
-GST_CODEC_PARSERS_LIBS = @GST_CODEC_PARSERS_LIBS@
-GST_INTERFACES_CFLAGS = @GST_INTERFACES_CFLAGS@
-GST_INTERFACES_LIBS = @GST_INTERFACES_LIBS@
-GST_LIBS = @GST_LIBS@
-GST_PKG_VERSION = @GST_PKG_VERSION@
-GST_PLUGINS_BAD_VERSION_REQUIRED = @GST_PLUGINS_BAD_VERSION_REQUIRED@
-GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
-GST_PLUGINS_BASE_LIBS = @GST_PLUGINS_BASE_LIBS@
-GST_PLUGINS_BASE_VERSION_REQUIRED = @GST_PLUGINS_BASE_VERSION_REQUIRED@
-GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
-GST_PLUGIN_PATH = @GST_PLUGIN_PATH@
-GST_PLUGIN_PATH_1_0 = @GST_PLUGIN_PATH_1_0@
-GST_VAAPI_LT_LDFLAGS = @GST_VAAPI_LT_LDFLAGS@
-GST_VAAPI_LT_VERSION = @GST_VAAPI_LT_VERSION@
-GST_VAAPI_MAJOR_VERSION = @GST_VAAPI_MAJOR_VERSION@
-GST_VERSION_REQUIRED = @GST_VERSION_REQUIRED@
-GST_VIDEO_CFLAGS = @GST_VIDEO_CFLAGS@
-GST_VIDEO_LIBS = @GST_VIDEO_LIBS@
-GTKDOC_CHECK = @GTKDOC_CHECK@
-GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
-GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
-GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
-GTKDOC_MKPDF = @GTKDOC_MKPDF@
-GTKDOC_REBASE = @GTKDOC_REBASE@
-GTKDOC_VERSION = @GTKDOC_VERSION@
-HTML_DIR = @HTML_DIR@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIBVA_CFLAGS = @LIBVA_CFLAGS@
-LIBVA_DRM_CFLAGS = @LIBVA_DRM_CFLAGS@
-LIBVA_DRM_LIBS = @LIBVA_DRM_LIBS@
-LIBVA_LIBS = @LIBVA_LIBS@
-LIBVA_PACKAGE_VERSION = @LIBVA_PACKAGE_VERSION@
-LIBVA_PKGNAME = @LIBVA_PKGNAME@
-LIBVA_WAYLAND_CFLAGS = @LIBVA_WAYLAND_CFLAGS@
-LIBVA_WAYLAND_LIBS = @LIBVA_WAYLAND_LIBS@
-LIBVA_X11_CFLAGS = @LIBVA_X11_CFLAGS@
-LIBVA_X11_LIBS = @LIBVA_X11_LIBS@
-LIBVA_X11_PKGNAME = @LIBVA_X11_PKGNAME@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-TODAY = @TODAY@
-UDEV_CFLAGS = @UDEV_CFLAGS@
-UDEV_LIBS = @UDEV_LIBS@
-VERSION = @VERSION@
-WAYLAND_API_VERSION = @WAYLAND_API_VERSION@
-WAYLAND_CFLAGS = @WAYLAND_CFLAGS@
-WAYLAND_LIBS = @WAYLAND_LIBS@
-X11_CFLAGS = @X11_CFLAGS@
-X11_LIBS = @X11_LIBS@
-XRANDR_CFLAGS = @XRANDR_CFLAGS@
-XRANDR_LIBS = @XRANDR_LIBS@
-XRENDER_CFLAGS = @XRENDER_CFLAGS@
-XRENDER_LIBS = @XRENDER_LIBS@
-YASM = @YASM@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-pkgconfigdir = @pkgconfigdir@
-plugindir = @plugindir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-noinst_LTLIBRARIES = \
-	libgstvaapi-videoutils.la		\
-	$(NULL)
-
-local_videoutils_srcdir = \
-	$(top_srcdir)/ext/videoutils/gst-libs/gst/video
-
-libgstvaapi_videoutils_cflags = \
-	-DGST_USE_UNSTABLE_API			\
-	-I$(top_srcdir)/gst-libs		\
-	-I$(top_builddir)/gst-libs		\
-	$(GST_BASE_CFLAGS)			\
-	$(GST_CFLAGS)				\
-	$(NULL)
-
-libgstvaapi_videoutils_libs = \
-	$(GST_BASE_LIBS)			\
-	$(GST_LIBS)				\
-	$(NULL)
-
-gen_source_c = $(am__append_1)
-gen_source_h = $(am__append_2)
-GENFILES = \
-	$(gen_source_c)				\
-	$(gen_source_h)				\
-	$(NULL)
-
-nodist_EXTRA_libgstvaapi_videoutils_la_SOURCES = dummy.c
-nodist_libgstvaapi_videoutils_la_SOURCES = \
-	$(gen_source_c)				\
-	$(NULL)
-
-libgstvaapi_videoutils_la_CFLAGS = \
-	$(libgstvaapi_videoutils_cflags)	\
-	$(NULL)
-
-libgstvaapi_videoutils_la_LIBADD = \
-	$(libgstvaapi_videoutils_libs)		\
-	$(NULL)
-
-libgstvaapi_videoutils_la_LDFLAGS = \
-	$(GST_ALL_LDFLAGS)			\
-	$(NULL)
-
-DISTCLEANFILES = $(GENFILES) .timestamp.symlinks
-
-# Extra clean files so that maintainer-clean removes *everything*
-MAINTAINERCLEANFILES = Makefile.in
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj .symlinks .timestamp
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu gst-libs/gst/video/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu gst-libs/gst/video/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-clean-noinstLTLIBRARIES:
-	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-	@list='$(noinst_LTLIBRARIES)'; \
-	locs=`for p in $$list; do echo $$p; done | \
-	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
-	      sort -u`; \
-	test -z "$$locs" || { \
-	  echo rm -f $${locs}; \
-	  rm -f $${locs}; \
-	}
-
-libgstvaapi-videoutils.la: $(libgstvaapi_videoutils_la_OBJECTS) $(libgstvaapi_videoutils_la_DEPENDENCIES) $(EXTRA_libgstvaapi_videoutils_la_DEPENDENCIES) 
-	$(AM_V_CCLD)$(libgstvaapi_videoutils_la_LINK)  $(libgstvaapi_videoutils_la_OBJECTS) $(libgstvaapi_videoutils_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstvaapi_videoutils_la-dummy.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstvaapi_videoutils_la-gstvideodecoder.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstvaapi_videoutils_la-gstvideoencoder.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstvaapi_videoutils_la-gstvideoutils.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstvaapi_videoutils_la-video.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
-
-libgstvaapi_videoutils_la-gstvideodecoder.lo: gstvideodecoder.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstvaapi_videoutils_la_CFLAGS) $(CFLAGS) -MT libgstvaapi_videoutils_la-gstvideodecoder.lo -MD -MP -MF $(DEPDIR)/libgstvaapi_videoutils_la-gstvideodecoder.Tpo -c -o libgstvaapi_videoutils_la-gstvideodecoder.lo `test -f 'gstvideodecoder.c' || echo '$(srcdir)/'`gstvideodecoder.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgstvaapi_videoutils_la-gstvideodecoder.Tpo $(DEPDIR)/libgstvaapi_videoutils_la-gstvideodecoder.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gstvideodecoder.c' object='libgstvaapi_videoutils_la-gstvideodecoder.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstvaapi_videoutils_la_CFLAGS) $(CFLAGS) -c -o libgstvaapi_videoutils_la-gstvideodecoder.lo `test -f 'gstvideodecoder.c' || echo '$(srcdir)/'`gstvideodecoder.c
-
-libgstvaapi_videoutils_la-gstvideoencoder.lo: gstvideoencoder.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstvaapi_videoutils_la_CFLAGS) $(CFLAGS) -MT libgstvaapi_videoutils_la-gstvideoencoder.lo -MD -MP -MF $(DEPDIR)/libgstvaapi_videoutils_la-gstvideoencoder.Tpo -c -o libgstvaapi_videoutils_la-gstvideoencoder.lo `test -f 'gstvideoencoder.c' || echo '$(srcdir)/'`gstvideoencoder.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgstvaapi_videoutils_la-gstvideoencoder.Tpo $(DEPDIR)/libgstvaapi_videoutils_la-gstvideoencoder.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gstvideoencoder.c' object='libgstvaapi_videoutils_la-gstvideoencoder.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstvaapi_videoutils_la_CFLAGS) $(CFLAGS) -c -o libgstvaapi_videoutils_la-gstvideoencoder.lo `test -f 'gstvideoencoder.c' || echo '$(srcdir)/'`gstvideoencoder.c
-
-libgstvaapi_videoutils_la-gstvideoutils.lo: gstvideoutils.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstvaapi_videoutils_la_CFLAGS) $(CFLAGS) -MT libgstvaapi_videoutils_la-gstvideoutils.lo -MD -MP -MF $(DEPDIR)/libgstvaapi_videoutils_la-gstvideoutils.Tpo -c -o libgstvaapi_videoutils_la-gstvideoutils.lo `test -f 'gstvideoutils.c' || echo '$(srcdir)/'`gstvideoutils.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgstvaapi_videoutils_la-gstvideoutils.Tpo $(DEPDIR)/libgstvaapi_videoutils_la-gstvideoutils.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gstvideoutils.c' object='libgstvaapi_videoutils_la-gstvideoutils.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstvaapi_videoutils_la_CFLAGS) $(CFLAGS) -c -o libgstvaapi_videoutils_la-gstvideoutils.lo `test -f 'gstvideoutils.c' || echo '$(srcdir)/'`gstvideoutils.c
-
-libgstvaapi_videoutils_la-video.lo: video.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstvaapi_videoutils_la_CFLAGS) $(CFLAGS) -MT libgstvaapi_videoutils_la-video.lo -MD -MP -MF $(DEPDIR)/libgstvaapi_videoutils_la-video.Tpo -c -o libgstvaapi_videoutils_la-video.lo `test -f 'video.c' || echo '$(srcdir)/'`video.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgstvaapi_videoutils_la-video.Tpo $(DEPDIR)/libgstvaapi_videoutils_la-video.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='video.c' object='libgstvaapi_videoutils_la-video.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstvaapi_videoutils_la_CFLAGS) $(CFLAGS) -c -o libgstvaapi_videoutils_la-video.lo `test -f 'video.c' || echo '$(srcdir)/'`video.c
-
-libgstvaapi_videoutils_la-dummy.lo: dummy.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstvaapi_videoutils_la_CFLAGS) $(CFLAGS) -MT libgstvaapi_videoutils_la-dummy.lo -MD -MP -MF $(DEPDIR)/libgstvaapi_videoutils_la-dummy.Tpo -c -o libgstvaapi_videoutils_la-dummy.lo `test -f 'dummy.c' || echo '$(srcdir)/'`dummy.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgstvaapi_videoutils_la-dummy.Tpo $(DEPDIR)/libgstvaapi_videoutils_la-dummy.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dummy.c' object='libgstvaapi_videoutils_la-dummy.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstvaapi_videoutils_la_CFLAGS) $(CFLAGS) -c -o libgstvaapi_videoutils_la-dummy.lo `test -f 'dummy.c' || echo '$(srcdir)/'`dummy.c
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-ID: $(am__tagged_files)
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
-tags: tags-am
-TAGS: tags
-
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	set x; \
-	here=`pwd`; \
-	$(am__define_uniq_tagged_files); \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: ctags-am
-
-CTAGS: ctags
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	$(am__define_uniq_tagged_files); \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-cscopelist: cscopelist-am
-
-cscopelist-am: $(am__tagged_files)
-	list='$(am__tagged_files)'; \
-	case "$(srcdir)" in \
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
-	  *) sdir=$(subdir)/$(srcdir) ;; \
-	esac; \
-	for i in $$list; do \
-	  if test -f "$$i"; then \
-	    echo "$(subdir)/$$i"; \
-	  else \
-	    echo "$$sdir/$$i"; \
-	  fi; \
-	done >> $(top_builddir)/cscope.files
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES) all-local
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
-	mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS TAGS all all-am all-local check check-am clean \
-	clean-generic clean-libtool clean-noinstLTLIBRARIES \
-	cscopelist-am ctags ctags-am distclean distclean-compile \
-	distclean-generic distclean-libtool distclean-tags distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags tags-am uninstall uninstall-am
-
-
-all-local: .timestamp.symlinks
-
-.timestamp.symlinks: $(GENFILES)
-	touch $@
-
-$(gen_source_c): %.c: $(local_videoutils_srcdir)/%.c $(gen_source_h) 
-	$(LN_S) -f $< $@
-$(gen_source_h): %.h: $(local_videoutils_srcdir)/%.h
-	$(LN_S) -f $< $@
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff -Nru gstreamer-vaapi-0.5.10/gst-libs/Makefile.am gstreamer-vaapi-0.6.0/gst-libs/Makefile.am
--- gstreamer-vaapi-0.5.10/gst-libs/Makefile.am	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst-libs/Makefile.am	2015-07-15 12:47:43.000000000 +0000
@@ -1,4 +1,3 @@
 SUBDIRS = gst
 
-# Extra clean files so that maintainer-clean removes *everything*
-MAINTAINERCLEANFILES = Makefile.in
+-include $(top_srcdir)/git.mk
diff -Nru gstreamer-vaapi-0.5.10/gst-libs/Makefile.in gstreamer-vaapi-0.6.0/gst-libs/Makefile.in
--- gstreamer-vaapi-0.5.10/gst-libs/Makefile.in	2015-02-03 08:39:54.000000000 +0000
+++ gstreamer-vaapi-0.6.0/gst-libs/Makefile.in	2015-07-15 12:50:34.000000000 +0000
@@ -197,10 +197,16 @@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
+EGL_CFLAGS = @EGL_CFLAGS@
+EGL_LIBS = @EGL_LIBS@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GIT = @GIT@
+GLES2_CFLAGS = @GLES2_CFLAGS@
+GLES2_LIBS = @GLES2_LIBS@
+GLES3_CFLAGS = @GLES3_CFLAGS@
+GLES3_LIBS = @GLES3_LIBS@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_VERSION_REQUIRED = @GLIB_VERSION_REQUIRED@
@@ -218,6 +224,8 @@
 GST_CFLAGS = @GST_CFLAGS@
 GST_CODEC_PARSERS_CFLAGS = @GST_CODEC_PARSERS_CFLAGS@
 GST_CODEC_PARSERS_LIBS = @GST_CODEC_PARSERS_LIBS@
+GST_GL_CFLAGS = @GST_GL_CFLAGS@
+GST_GL_LIBS = @GST_GL_LIBS@
 GST_INTERFACES_CFLAGS = @GST_INTERFACES_CFLAGS@
 GST_INTERFACES_LIBS = @GST_INTERFACES_LIBS@
 GST_LIBS = @GST_LIBS@
@@ -227,7 +235,6 @@
 GST_PLUGINS_BASE_LIBS = @GST_PLUGINS_BASE_LIBS@
 GST_PLUGINS_BASE_VERSION_REQUIRED = @GST_PLUGINS_BASE_VERSION_REQUIRED@
 GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
-GST_PLUGIN_PATH = @GST_PLUGIN_PATH@
 GST_PLUGIN_PATH_1_0 = @GST_PLUGIN_PATH_1_0@
 GST_VAAPI_LT_LDFLAGS = @GST_VAAPI_LT_LDFLAGS@
 GST_VAAPI_LT_VERSION = @GST_VAAPI_LT_VERSION@
@@ -365,9 +372,6 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 SUBDIRS = gst
-
-# Extra clean files so that maintainer-clean removes *everything*
-MAINTAINERCLEANFILES = Makefile.in
 all: all-recursive
 
 .SUFFIXES:
@@ -597,7 +601,6 @@
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
 clean: clean-recursive
 
 clean-am: clean-generic clean-libtool mostlyclean-am
@@ -680,6 +683,8 @@
 	ps ps-am tags tags-am uninstall uninstall-am
 
 
+-include $(top_srcdir)/git.mk
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -Nru gstreamer-vaapi-0.5.10/Makefile.am gstreamer-vaapi-0.6.0/Makefile.am
--- gstreamer-vaapi-0.5.10/Makefile.am	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/Makefile.am	2015-07-15 12:47:43.000000000 +0000
@@ -6,9 +6,11 @@
 
 # Extra clean files so that maintainer-clean removes *everything*
 MAINTAINERCLEANFILES = \
-	aclocal.m4 compile config.guess config.sub \
-	configure depcomp install-sh ltmain.sh     \
-	Makefile.in missing config.h.in gtk-doc.make
+	$(GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL)	\
+	$(GITIGNORE_MAINTAINERCLEANFILES_MAKEFILE_IN)	\
+	$(GITIGNORE_MAINTAINERCLEANFILES_M4_LIBTOOL)	\
+	$(srcdir)/gtk-doc.make $(srcdir)/m4/gtk-doc.m4	\
+	$(NULL)
 
 DEB_BUILDDIR = debian.build
 
@@ -23,3 +25,5 @@
 	cd $(PACKAGE)-$(VERSION)			&& \
 	$(LN_S) debian.upstream debian			&& \
 	$(MAKE) deb -f Makefile.am
+
+-include $(top_srcdir)/git.mk
diff -Nru gstreamer-vaapi-0.5.10/Makefile.in gstreamer-vaapi-0.6.0/Makefile.in
--- gstreamer-vaapi-0.5.10/Makefile.in	2015-02-03 08:39:54.000000000 +0000
+++ gstreamer-vaapi-0.6.0/Makefile.in	2015-07-15 12:50:33.000000000 +0000
@@ -227,10 +227,16 @@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
+EGL_CFLAGS = @EGL_CFLAGS@
+EGL_LIBS = @EGL_LIBS@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GIT = @GIT@
+GLES2_CFLAGS = @GLES2_CFLAGS@
+GLES2_LIBS = @GLES2_LIBS@
+GLES3_CFLAGS = @GLES3_CFLAGS@
+GLES3_LIBS = @GLES3_LIBS@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_VERSION_REQUIRED = @GLIB_VERSION_REQUIRED@
@@ -248,6 +254,8 @@
 GST_CFLAGS = @GST_CFLAGS@
 GST_CODEC_PARSERS_CFLAGS = @GST_CODEC_PARSERS_CFLAGS@
 GST_CODEC_PARSERS_LIBS = @GST_CODEC_PARSERS_LIBS@
+GST_GL_CFLAGS = @GST_GL_CFLAGS@
+GST_GL_LIBS = @GST_GL_LIBS@
 GST_INTERFACES_CFLAGS = @GST_INTERFACES_CFLAGS@
 GST_INTERFACES_LIBS = @GST_INTERFACES_LIBS@
 GST_LIBS = @GST_LIBS@
@@ -257,7 +265,6 @@
 GST_PLUGINS_BASE_LIBS = @GST_PLUGINS_BASE_LIBS@
 GST_PLUGINS_BASE_VERSION_REQUIRED = @GST_PLUGINS_BASE_VERSION_REQUIRED@
 GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
-GST_PLUGIN_PATH = @GST_PLUGIN_PATH@
 GST_PLUGIN_PATH_1_0 = @GST_PLUGIN_PATH_1_0@
 GST_VAAPI_LT_LDFLAGS = @GST_VAAPI_LT_LDFLAGS@
 GST_VAAPI_LT_VERSION = @GST_VAAPI_LT_VERSION@
@@ -400,9 +407,11 @@
 
 # Extra clean files so that maintainer-clean removes *everything*
 MAINTAINERCLEANFILES = \
-	aclocal.m4 compile config.guess config.sub \
-	configure depcomp install-sh ltmain.sh     \
-	Makefile.in missing config.h.in gtk-doc.make
+	$(GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL)	\
+	$(GITIGNORE_MAINTAINERCLEANFILES_MAKEFILE_IN)	\
+	$(GITIGNORE_MAINTAINERCLEANFILES_M4_LIBTOOL)	\
+	$(srcdir)/gtk-doc.make $(srcdir)/m4/gtk-doc.m4	\
+	$(NULL)
 
 DEB_BUILDDIR = debian.build
 all: config.h
@@ -899,6 +908,8 @@
 	$(LN_S) debian.upstream debian			&& \
 	$(MAKE) deb -f Makefile.am
 
+-include $(top_srcdir)/git.mk
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -Nru gstreamer-vaapi-0.5.10/NEWS gstreamer-vaapi-0.6.0/NEWS
--- gstreamer-vaapi-0.5.10/NEWS	2015-02-03 08:00:16.000000000 +0000
+++ gstreamer-vaapi-0.6.0/NEWS	2015-07-15 12:49:16.000000000 +0000
@@ -1,8 +1,51 @@
-gst-vaapi NEWS -- summary of changes.  2015-02-03
+gst-vaapi NEWS -- summary of changes.  2015-07-15
 Copyright (C) 2010-2011 Splitted-Desktop Systems
 Copyright (C) 2011-2013 Intel Corporation
 Copyright (C) 2011 Collabora
 
+Version 0.6 - 15.Jul.2015
+* Add HEVC(H265) Decoder
+* Add HEVC(H265) Encoder
+* Add VP8 Encoder
+* Add JPEG Encoder
+* Add support for EGL [#743846, #743847, #741079]
+* Add a vaapidecodebin(vaapidecode->queue->vaapipostproc) element [#745216]
+* Add skin-tone-enhancement feature in vaapipostproc [#744088]
+* Add support for H.264 MVC Multiview High profile encoding with more than 2 views [#732453]
+* Add support for GstVideoGLTextureOrientation in plugins
+* Add support for BGRA textures in plugins
+* Removed all GStreamer 0.10 and 1.0 specific code sections [#745728,#732666]
+* Add support for loss of picturers in h264 decoder [#745048,#703921]
+* Add a simple-encoder test program that uses libgstvaapi for video encoding [#719528]
+* Add finer wayland frame control and many other optimizations [#719528, #749078, #747492#]
+* Add scaling of quality factor and Qantization tables for JPEG encoder [#748335]
+* Add GstColorBalance interface in vaapipostproc [#720376]
+* Add a handoff signal to vaapisink [#747905]
+* Add rounding control handling for VC1 simple and Main profile [#743958]
+* Record glconext supplied by downstream to enable run-time compatibility check [#725643]
+* Switch back to single thread implementation in vaapidecode [#742605]
+* Set decoding latency in vaapidecode by assuming realtime performance fo the HW decoding [#740419]
+* Allow vaapidecode to connect with glimagesink, mark x11 display as compatible with EGL [#745902]
+* Allow decoding of VC1 streams which contain user BDUs [#741237]
+* Use git.mk, a small Makefile to autogenerate .gitignore files
+* Expose the overlay capability in vaapisink for compatibility with dvbsuboverlay [#750095]
+* Enable VPP element in vaapidecodebin only if there is HW support [#749554]
+* Fix autoplugging of vaapidecode in playbin for wmv/asf streams
+* Fix multi-slice hevc encoding [#749854]
+* Fix ABBA deadlock between vaapisink and vaapipostproc if running in different threds [#738249]
+* Fix Seeking failure while using navseek in pipeline [#738677]
+* Fix PTS cache for MPEG2 GOP start [#748676]
+* Fix the wrong selection of passthrough mode in vaapipostproc [#748184]
+* Fix GstVaapiVideoPool related dead-lock [#747944]
+* Fix the race condition while setting drm device type [#747914]
+* Fix crash in vaapidecode if buffer outlives the decoder [#745189]
+* Fix memory leak in vaapidecode [#743226]
+* Fix multiple caps negotiation issues with vaapi elements [#744618]
+* Improve check for upstream element that requires DMABUF buffer pool
+* Fix vaapisink memory leak in debug mode
+* Fix crash when seeking mpeg2 strems
+* Fix support for Wayland/EGL running alongside X11
+
 Version 0.5.10 - 3.Feb.2015
 * Add support for DRM Render-Nodes for headless operation
 * Add support for VA surface buffer sharing with DMABUF and GEM handles
diff -Nru gstreamer-vaapi-0.5.10/patches/Makefile.am gstreamer-vaapi-0.6.0/patches/Makefile.am
--- gstreamer-vaapi-0.5.10/patches/Makefile.am	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/patches/Makefile.am	2015-07-15 12:47:43.000000000 +0000
@@ -1,4 +1,3 @@
 SUBDIRS = videoparsers
 
-# Extra clean files so that maintainer-clean removes *everything*
-MAINTAINERCLEANFILES = Makefile.in
+-include $(top_srcdir)/git.mk
diff -Nru gstreamer-vaapi-0.5.10/patches/Makefile.in gstreamer-vaapi-0.6.0/patches/Makefile.in
--- gstreamer-vaapi-0.5.10/patches/Makefile.in	2015-02-03 08:39:54.000000000 +0000
+++ gstreamer-vaapi-0.6.0/patches/Makefile.in	2015-07-15 12:50:34.000000000 +0000
@@ -197,10 +197,16 @@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
+EGL_CFLAGS = @EGL_CFLAGS@
+EGL_LIBS = @EGL_LIBS@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GIT = @GIT@
+GLES2_CFLAGS = @GLES2_CFLAGS@
+GLES2_LIBS = @GLES2_LIBS@
+GLES3_CFLAGS = @GLES3_CFLAGS@
+GLES3_LIBS = @GLES3_LIBS@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_VERSION_REQUIRED = @GLIB_VERSION_REQUIRED@
@@ -218,6 +224,8 @@
 GST_CFLAGS = @GST_CFLAGS@
 GST_CODEC_PARSERS_CFLAGS = @GST_CODEC_PARSERS_CFLAGS@
 GST_CODEC_PARSERS_LIBS = @GST_CODEC_PARSERS_LIBS@
+GST_GL_CFLAGS = @GST_GL_CFLAGS@
+GST_GL_LIBS = @GST_GL_LIBS@
 GST_INTERFACES_CFLAGS = @GST_INTERFACES_CFLAGS@
 GST_INTERFACES_LIBS = @GST_INTERFACES_LIBS@
 GST_LIBS = @GST_LIBS@
@@ -227,7 +235,6 @@
 GST_PLUGINS_BASE_LIBS = @GST_PLUGINS_BASE_LIBS@
 GST_PLUGINS_BASE_VERSION_REQUIRED = @GST_PLUGINS_BASE_VERSION_REQUIRED@
 GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
-GST_PLUGIN_PATH = @GST_PLUGIN_PATH@
 GST_PLUGIN_PATH_1_0 = @GST_PLUGIN_PATH_1_0@
 GST_VAAPI_LT_LDFLAGS = @GST_VAAPI_LT_LDFLAGS@
 GST_VAAPI_LT_VERSION = @GST_VAAPI_LT_VERSION@
@@ -365,9 +372,6 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 SUBDIRS = videoparsers
-
-# Extra clean files so that maintainer-clean removes *everything*
-MAINTAINERCLEANFILES = Makefile.in
 all: all-recursive
 
 .SUFFIXES:
@@ -597,7 +601,6 @@
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
 clean: clean-recursive
 
 clean-am: clean-generic clean-libtool mostlyclean-am
@@ -680,6 +683,8 @@
 	ps ps-am tags tags-am uninstall uninstall-am
 
 
+-include $(top_srcdir)/git.mk
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -Nru gstreamer-vaapi-0.5.10/patches/videoparsers/0001-h265parse-include-gstvaapiparse.h.patch gstreamer-vaapi-0.6.0/patches/videoparsers/0001-h265parse-include-gstvaapiparse.h.patch
--- gstreamer-vaapi-0.5.10/patches/videoparsers/0001-h265parse-include-gstvaapiparse.h.patch	1970-01-01 00:00:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/patches/videoparsers/0001-h265parse-include-gstvaapiparse.h.patch	2015-07-15 12:47:43.000000000 +0000
@@ -0,0 +1,33 @@
+From a205193cffee9405bc9013416b15d8d1499be6bb Mon Sep 17 00:00:00 2001
+From: Sreerenj Balachandran <sreerenj.balachandran@intel.com>
+Date: Thu, 16 Apr 2015 18:04:53 +0300
+Subject: [PATCH] h265parse: include gstvaapiparse.h
+
+---
+ gst/vaapi/gsth265parse.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/gst/vaapi/gsth265parse.c b/gst/vaapi/gsth265parse.c
+index 2d7b997..5942d41 100644
+--- a/gst/vaapi/gsth265parse.c
++++ b/gst/vaapi/gsth265parse.c
+@@ -22,6 +22,7 @@
+ #  include "config.h"
+ #endif
+
++#include "gstvaapiparse.h"
+ #include <gst/base/base.h>
+ #include <gst/pbutils/pbutils.h>
+ #include <gst/video/video.h>
+@@ -101,7 +102,7 @@ gst_h265_parse_class_init (GstH265ParseClass * klass)
+   GstBaseParseClass *parse_class = GST_BASE_PARSE_CLASS (klass);
+   GstElementClass *gstelement_class = GST_ELEMENT_CLASS (klass);
+
+-  GST_DEBUG_CATEGORY_INIT (h265_parse_debug, "h265parse", 0, "h265 parser");
++  GST_DEBUG_CATEGORY_INIT (h265_parse_debug, "vaapiparse_h265", 0, "h265 parser");
+
+   gobject_class->finalize = gst_h265_parse_finalize;
+   gobject_class->set_property = gst_h265_parse_set_property;
+--
+1.9.1
+
diff -Nru gstreamer-vaapi-0.5.10/patches/videoparsers/0001-plugins-compile-the-built-in-video-parsers-as-vaapip.patch gstreamer-vaapi-0.6.0/patches/videoparsers/0001-plugins-compile-the-built-in-video-parsers-as-vaapip.patch
--- gstreamer-vaapi-0.5.10/patches/videoparsers/0001-plugins-compile-the-built-in-video-parsers-as-vaapip.patch	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/patches/videoparsers/0001-plugins-compile-the-built-in-video-parsers-as-vaapip.patch	2015-07-15 12:47:43.000000000 +0000
@@ -1,4 +1,4 @@
-From c78b4c043dc41f071bdf170ecb001dc1aef8f5f6 Mon Sep 17 00:00:00 2001
+From a0cdb5443b5ae3176b217a08fb5107e77eea4113 Mon Sep 17 00:00:00 2001
 From: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
 Date: Mon, 28 Apr 2014 17:44:03 +0200
 Subject: [PATCH 1/3] plugins: compile the built-in video parsers as
@@ -8,17 +8,11 @@
 libgstvaapi_parse.so. The various video parsers could be accessed as
 vaapiparse_CODEC.
 ---
- configure.ac              |    9 ++++++++
- gst/vaapi/Makefile.am     |   35 ++++++++++++++++++++++++++++++
- gst/vaapi/gsth264parse.c  |    4 +++-
- gst/vaapi/gstvaapiparse.c |   53 +++++++++++++++++++++++++++++++++++++++++++++
- gst/vaapi/gstvaapiparse.h |   36 ++++++++++++++++++++++++++++++
- 5 files changed, 136 insertions(+), 1 deletion(-)
- create mode 100644 gst/vaapi/gstvaapiparse.c
- create mode 100644 gst/vaapi/gstvaapiparse.h
+ gst/vaapi/gsth264parse.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/gst/vaapi/gsth264parse.c b/gst/vaapi/gsth264parse.c
-index 9105d7f..4246b6e 100644
+index 76f7686..9d588e2 100644
 --- a/gst/vaapi/gsth264parse.c
 +++ b/gst/vaapi/gsth264parse.c
 @@ -26,6 +26,7 @@
@@ -29,7 +23,7 @@
  #include <gst/base/base.h>
  #include <gst/pbutils/pbutils.h>
  #include <gst/video/video.h>
-@@ -105,7 +106,8 @@ gst_h264_parse_class_init (GstH264ParseClass * klass)
+@@ -120,7 +121,8 @@ gst_h264_parse_class_init (GstH264ParseClass * klass)
    GstBaseParseClass *parse_class = GST_BASE_PARSE_CLASS (klass);
    GstElementClass *gstelement_class = GST_ELEMENT_CLASS (klass);
  
@@ -39,3 +33,6 @@
  
    gobject_class->finalize = gst_h264_parse_finalize;
    gobject_class->set_property = gst_h264_parse_set_property;
+-- 
+2.1.4
+
diff -Nru gstreamer-vaapi-0.5.10/patches/videoparsers/0002-h264parse-fix-build-with-older-GStreamer-1.x-stacks.patch gstreamer-vaapi-0.6.0/patches/videoparsers/0002-h264parse-fix-build-with-older-GStreamer-1.x-stacks.patch
--- gstreamer-vaapi-0.5.10/patches/videoparsers/0002-h264parse-fix-build-with-older-GStreamer-1.x-stacks.patch	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/patches/videoparsers/0002-h264parse-fix-build-with-older-GStreamer-1.x-stacks.patch	2015-07-15 12:47:43.000000000 +0000
@@ -1,15 +1,15 @@
-From 92908c46e7dd90063a613742f285e9c494c90d6f Mon Sep 17 00:00:00 2001
+From cfc25cf07e6547c9b9b6bd0ee7e337df0ba842d2 Mon Sep 17 00:00:00 2001
 From: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
 Date: Mon, 28 Apr 2014 17:17:04 +0200
 Subject: [PATCH 2/3] h264parse: fix build with older GStreamer 1.x stacks.
 
 ---
- gst/vaapi/gsth264parse.c |    4 +++-
- gst/vaapi/gsth264parse.h |    1 +
+ gst/vaapi/gsth264parse.c | 4 +++-
+ gst/vaapi/gsth264parse.h | 1 +
  2 files changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/gst/vaapi/gsth264parse.c b/gst/vaapi/gsth264parse.c
-index 678c7f7..37ce228 100644
+index 9d588e2..4060145 100644
 --- a/gst/vaapi/gsth264parse.c
 +++ b/gst/vaapi/gsth264parse.c
 @@ -27,7 +27,7 @@
@@ -21,7 +21,7 @@
  #include <gst/pbutils/pbutils.h>
  #include <gst/video/video.h>
  #include "gsth264parse.h"
-@@ -148,7 +148,9 @@ gst_h264_parse_init (GstH264Parse * h264parse)
+@@ -163,7 +163,9 @@ gst_h264_parse_init (GstH264Parse * h264parse)
  {
    h264parse->frame_out = gst_adapter_new ();
    gst_base_parse_set_pts_interpolation (GST_BASE_PARSE (h264parse), FALSE);
@@ -32,7 +32,7 @@
  
  
 diff --git a/gst/vaapi/gsth264parse.h b/gst/vaapi/gsth264parse.h
-index 4c3fdd4..3db8f21 100644
+index e056ca2..56d2612 100644
 --- a/gst/vaapi/gsth264parse.h
 +++ b/gst/vaapi/gsth264parse.h
 @@ -27,6 +27,7 @@
@@ -44,5 +44,5 @@
  
  G_BEGIN_DECLS
 -- 
-1.7.9.5
+2.1.4
 
diff -Nru gstreamer-vaapi-0.5.10/patches/videoparsers/0003-h264parse-default-to-byte-stream-nalu-format-Annex-B.patch gstreamer-vaapi-0.6.0/patches/videoparsers/0003-h264parse-default-to-byte-stream-nalu-format-Annex-B.patch
--- gstreamer-vaapi-0.5.10/patches/videoparsers/0003-h264parse-default-to-byte-stream-nalu-format-Annex-B.patch	1970-01-01 00:00:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/patches/videoparsers/0003-h264parse-default-to-byte-stream-nalu-format-Annex-B.patch	2015-07-15 12:47:43.000000000 +0000
@@ -0,0 +1,44 @@
+From 652357e0da6528b0ff8a8e01782c84c032c9f342 Mon Sep 17 00:00:00 2001
+From: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
+Date: Tue, 26 May 2015 09:33:57 +0300
+Subject: [PATCH 3/3] h264parse: default to byte-stream/nalu format (Annex B).
+
+Always default to stream-format=byte-stream,alignment=nalu if avcC
+format was not detected. This is the natural stream format specified
+in the standard (Annex.B): a series of NAL units prefixed with the
+usual start code.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=732167
+
+Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
+Signed-off-by: Sreerenj Balachandran <sreerenj.balachandran@intel.com>
+---
+ gst/vaapi/gsth264parse.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/gst/vaapi/gsth264parse.c b/gst/vaapi/gsth264parse.c
+index 4060145..b5d2955 100644
+--- a/gst/vaapi/gsth264parse.c
++++ b/gst/vaapi/gsth264parse.c
+@@ -392,7 +392,8 @@ gst_h264_parse_negotiate (GstH264Parse * h264parse, gint in_format,
+   if (!format)
+     format = GST_H264_PARSE_FORMAT_BYTE;
+   if (!align)
+-    align = GST_H264_PARSE_ALIGN_AU;
++    align = format == GST_H264_PARSE_FORMAT_BYTE ? GST_H264_PARSE_ALIGN_NAL :
++        GST_H264_PARSE_ALIGN_AU;
+ 
+   GST_DEBUG_OBJECT (h264parse, "selected format %s, alignment %s",
+       gst_h264_parse_get_string (h264parse, TRUE, format),
+@@ -2264,6 +2265,8 @@ gst_h264_parse_set_caps (GstBaseParse * parse, GstCaps * caps)
+ 
+   /* bytestream caps sanity checks */
+   if (format == GST_H264_PARSE_FORMAT_BYTE) {
++    if (align == GST_H264_PARSE_ALIGN_NONE)
++      align = GST_H264_PARSE_ALIGN_NAL;
+     /* should have SPS/PSS in-band (and/or oob in streamheader field) */
+     if (codec_data_value != NULL)
+       goto bytestream_caps_with_codec_data;
+-- 
+2.1.4
+
diff -Nru gstreamer-vaapi-0.5.10/patches/videoparsers/0004-h264parse-default-to-byte-stream-nalu-format-Annex-B.patch gstreamer-vaapi-0.6.0/patches/videoparsers/0004-h264parse-default-to-byte-stream-nalu-format-Annex-B.patch
--- gstreamer-vaapi-0.5.10/patches/videoparsers/0004-h264parse-default-to-byte-stream-nalu-format-Annex-B.patch	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/patches/videoparsers/0004-h264parse-default-to-byte-stream-nalu-format-Annex-B.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,43 +0,0 @@
-From 3885faab12f7bbcc862a3da191161bf91b0b8bd9 Mon Sep 17 00:00:00 2001
-From: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
-Date: Tue, 24 Jun 2014 17:27:12 +0200
-Subject: [PATCH 4/8] h264parse: default to byte-stream/nalu format (Annex B).
-
-Always default to stream-format=byte-stream,alignment=nalu if avcC
-format was not detected. This is the natural stream format specified
-in the standard (Annex.B): a series of NAL units prefixed with the
-usual start code.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=732167
-
-Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
----
- gst/vaapi/gsth264parse.c |    5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/gst/vaapi/gsth264parse.c b/gst/vaapi/gsth264parse.c
-index 7a88a07..4800c2b 100644
---- a/gst/vaapi/gsth264parse.c
-+++ b/gst/vaapi/gsth264parse.c
-@@ -367,7 +367,8 @@ gst_h264_parse_negotiate (GstH264Parse * h264parse, gint in_format,
-   if (!format)
-     format = GST_H264_PARSE_FORMAT_BYTE;
-   if (!align)
--    align = GST_H264_PARSE_ALIGN_AU;
-+    align = format == GST_H264_PARSE_FORMAT_BYTE ? GST_H264_PARSE_ALIGN_NAL :
-+        GST_H264_PARSE_ALIGN_AU;
- 
-   GST_DEBUG_OBJECT (h264parse, "selected format %s, alignment %s",
-       gst_h264_parse_get_string (h264parse, TRUE, format),
-@@ -1893,7 +1894,7 @@ gst_h264_parse_set_caps (GstBaseParse * parse, GstCaps * caps)
- 
-     if (format == GST_H264_PARSE_FORMAT_NONE) {
-       format = GST_H264_PARSE_FORMAT_BYTE;
--      align = GST_H264_PARSE_ALIGN_AU;
-+      align = GST_H264_PARSE_ALIGN_NAL;
-     }
-   }
- 
--- 
-1.7.9.5
-
diff -Nru gstreamer-vaapi-0.5.10/patches/videoparsers/Makefile.am gstreamer-vaapi-0.6.0/patches/videoparsers/Makefile.am
--- gstreamer-vaapi-0.5.10/patches/videoparsers/Makefile.am	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/patches/videoparsers/Makefile.am	2015-07-15 12:47:43.000000000 +0000
@@ -2,5 +2,4 @@
 
 EXTRA_DIST = series.frag $(videoparsers_patches_base)
 
-# Extra clean files so that maintainer-clean removes *everything*
-MAINTAINERCLEANFILES = Makefile.in
+-include $(top_srcdir)/git.mk
diff -Nru gstreamer-vaapi-0.5.10/patches/videoparsers/Makefile.in gstreamer-vaapi-0.6.0/patches/videoparsers/Makefile.in
--- gstreamer-vaapi-0.5.10/patches/videoparsers/Makefile.in	2015-02-03 08:39:54.000000000 +0000
+++ gstreamer-vaapi-0.6.0/patches/videoparsers/Makefile.in	2015-07-15 12:50:34.000000000 +0000
@@ -140,10 +140,16 @@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
+EGL_CFLAGS = @EGL_CFLAGS@
+EGL_LIBS = @EGL_LIBS@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GIT = @GIT@
+GLES2_CFLAGS = @GLES2_CFLAGS@
+GLES2_LIBS = @GLES2_LIBS@
+GLES3_CFLAGS = @GLES3_CFLAGS@
+GLES3_LIBS = @GLES3_LIBS@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_VERSION_REQUIRED = @GLIB_VERSION_REQUIRED@
@@ -161,6 +167,8 @@
 GST_CFLAGS = @GST_CFLAGS@
 GST_CODEC_PARSERS_CFLAGS = @GST_CODEC_PARSERS_CFLAGS@
 GST_CODEC_PARSERS_LIBS = @GST_CODEC_PARSERS_LIBS@
+GST_GL_CFLAGS = @GST_GL_CFLAGS@
+GST_GL_LIBS = @GST_GL_LIBS@
 GST_INTERFACES_CFLAGS = @GST_INTERFACES_CFLAGS@
 GST_INTERFACES_LIBS = @GST_INTERFACES_LIBS@
 GST_LIBS = @GST_LIBS@
@@ -170,7 +178,6 @@
 GST_PLUGINS_BASE_LIBS = @GST_PLUGINS_BASE_LIBS@
 GST_PLUGINS_BASE_VERSION_REQUIRED = @GST_PLUGINS_BASE_VERSION_REQUIRED@
 GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
-GST_PLUGIN_PATH = @GST_PLUGIN_PATH@
 GST_PLUGIN_PATH_1_0 = @GST_PLUGIN_PATH_1_0@
 GST_VAAPI_LT_LDFLAGS = @GST_VAAPI_LT_LDFLAGS@
 GST_VAAPI_LT_VERSION = @GST_VAAPI_LT_VERSION@
@@ -310,13 +317,11 @@
 videoparsers_patches_base = \
 	0001-plugins-compile-the-built-in-video-parsers-as-vaapip.patch	\
 	0002-h264parse-fix-build-with-older-GStreamer-1.x-stacks.patch	\
-	0004-h264parse-default-to-byte-stream-nalu-format-Annex-B.patch	\
+        0003-h264parse-default-to-byte-stream-nalu-format-Annex-B.patch \
+        0001-h265parse-include-gstvaapiparse.h.patch \
 	$(NULL)
 
 EXTRA_DIST = series.frag $(videoparsers_patches_base)
-
-# Extra clean files so that maintainer-clean removes *everything*
-MAINTAINERCLEANFILES = Makefile.in
 all: all-am
 
 .SUFFIXES:
@@ -428,7 +433,6 @@
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
 clean: clean-am
 
 clean-am: clean-generic clean-libtool mostlyclean-am
@@ -510,6 +514,8 @@
 	tags-am uninstall uninstall-am
 
 
+-include $(top_srcdir)/git.mk
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -Nru gstreamer-vaapi-0.5.10/patches/videoparsers/series.frag gstreamer-vaapi-0.6.0/patches/videoparsers/series.frag
--- gstreamer-vaapi-0.5.10/patches/videoparsers/series.frag	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/patches/videoparsers/series.frag	2015-07-15 12:47:43.000000000 +0000
@@ -3,5 +3,6 @@
 videoparsers_patches_base = \
 	0001-plugins-compile-the-built-in-video-parsers-as-vaapip.patch	\
 	0002-h264parse-fix-build-with-older-GStreamer-1.x-stacks.patch	\
-	0004-h264parse-default-to-byte-stream-nalu-format-Annex-B.patch	\
+        0003-h264parse-default-to-byte-stream-nalu-format-Annex-B.patch \
+        0001-h265parse-include-gstvaapiparse.h.patch \
 	$(NULL)
diff -Nru gstreamer-vaapi-0.5.10/pkgconfig/Makefile.am gstreamer-vaapi-0.6.0/pkgconfig/Makefile.am
--- gstreamer-vaapi-0.5.10/pkgconfig/Makefile.am	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/pkgconfig/Makefile.am	2015-07-15 12:47:43.000000000 +0000
@@ -29,5 +29,4 @@
 
 DISTCLEANFILES = $(all_pcfiles)
 
-# Extra clean files so that maintainer-clean removes *everything*
-MAINTAINERCLEANFILES = Makefile.in
+-include $(top_srcdir)/git.mk
diff -Nru gstreamer-vaapi-0.5.10/pkgconfig/Makefile.in gstreamer-vaapi-0.6.0/pkgconfig/Makefile.in
--- gstreamer-vaapi-0.5.10/pkgconfig/Makefile.in	2015-02-03 08:39:54.000000000 +0000
+++ gstreamer-vaapi-0.6.0/pkgconfig/Makefile.in	2015-07-15 12:50:34.000000000 +0000
@@ -176,10 +176,16 @@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
+EGL_CFLAGS = @EGL_CFLAGS@
+EGL_LIBS = @EGL_LIBS@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GIT = @GIT@
+GLES2_CFLAGS = @GLES2_CFLAGS@
+GLES2_LIBS = @GLES2_LIBS@
+GLES3_CFLAGS = @GLES3_CFLAGS@
+GLES3_LIBS = @GLES3_LIBS@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_VERSION_REQUIRED = @GLIB_VERSION_REQUIRED@
@@ -197,6 +203,8 @@
 GST_CFLAGS = @GST_CFLAGS@
 GST_CODEC_PARSERS_CFLAGS = @GST_CODEC_PARSERS_CFLAGS@
 GST_CODEC_PARSERS_LIBS = @GST_CODEC_PARSERS_LIBS@
+GST_GL_CFLAGS = @GST_GL_CFLAGS@
+GST_GL_LIBS = @GST_GL_LIBS@
 GST_INTERFACES_CFLAGS = @GST_INTERFACES_CFLAGS@
 GST_INTERFACES_LIBS = @GST_INTERFACES_LIBS@
 GST_LIBS = @GST_LIBS@
@@ -206,7 +214,6 @@
 GST_PLUGINS_BASE_LIBS = @GST_PLUGINS_BASE_LIBS@
 GST_PLUGINS_BASE_VERSION_REQUIRED = @GST_PLUGINS_BASE_VERSION_REQUIRED@
 GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
-GST_PLUGIN_PATH = @GST_PLUGIN_PATH@
 GST_PLUGIN_PATH_1_0 = @GST_PLUGIN_PATH_1_0@
 GST_VAAPI_LT_LDFLAGS = @GST_VAAPI_LT_LDFLAGS@
 GST_VAAPI_LT_VERSION = @GST_VAAPI_LT_VERSION@
@@ -353,9 +360,6 @@
 pkgconfig_DATA = $(pcfiles)
 EXTRA_DIST = $(all_pcfiles_in)
 DISTCLEANFILES = $(all_pcfiles)
-
-# Extra clean files so that maintainer-clean removes *everything*
-MAINTAINERCLEANFILES = Makefile.in
 all: all-am
 
 .SUFFIXES:
@@ -491,7 +495,6 @@
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
 clean: clean-am
 
 clean-am: clean-generic clean-libtool mostlyclean-am
@@ -574,6 +577,8 @@
 	uninstall-pkgconfigDATA
 
 
+-include $(top_srcdir)/git.mk
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -Nru gstreamer-vaapi-0.5.10/README gstreamer-vaapi-0.6.0/README
--- gstreamer-vaapi-0.5.10/README	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/README	2015-07-15 12:47:43.000000000 +0000
@@ -26,9 +26,10 @@
     implicitly download the decoded surface to raw YUV buffers.
 
   * `vaapiencode_<CODEC>' is used to encode into MPEG-2, H.264 AVC,
-    H.264 MVC videos, depending on the actual value of <CODEC> (mpeg2,
-    h264, etc.). By default, raw format bitstreams are generated, so
-    the result may be piped to a muxer. e.g. qtmux for MP4 containers.
+    H.264 MVC, JPEG, VP8 videos, depending on the actual value of
+    <CODEC> (mpeg2, h264, etc.). By default, raw format bitstreams
+    are generated, so the result may be piped to a muxer.
+    e.g. qtmux for MP4 containers.
 
   * `vaapipostproc' is used to filter VA surfaces, for e.g. scaling,
     deinterlacing (bob, motion-adaptive, motion-compensated), noise
@@ -43,9 +44,9 @@
 Features
 --------
 
-  * VA-API support from 0.29 to 0.35
+  * VA-API support from 0.29 to 0.37
   * JPEG, MPEG-2, MPEG-4, H.264 AVC, H.264 MVC, VP8 and VC-1 ad-hoc decoders
-  * MPEG-2, H.264 AVC and H.264 MVC ad-hoc encoders
+  * MPEG-2, H.264 AVC,H.264 MVC, JPEG and VP8 ad-hoc encoders
   * OpenGL rendering through VA/GLX or GLX texture-from-pixmap + FBO
   * Support for the Wayland display server
   * Support for headless decode pipelines with VA/DRM
@@ -62,22 +63,11 @@
 
 Software requirements
 
-  * GStreamer 0.10.x [DEPRECATED]:
+  * GStreamer 1.2.x (up to including GStreamer 1.6):
       libglib2.0-dev (>= 2.28)
-      libgstreamer0.10-dev (>= 0.10.36)
-        or with GstBaseSink::query()
-      libgstreamer-plugins-base0.10-dev (>= 0.10.36)
-      libgstreamer-plugins-bad0.10-dev (>= 0.10.22.1)
-        or with GstVideoContext, GstSurfaceBuffer, codecparsers
-
-    Note: support for GStreamer 0.10 APIs is deprecated and will be
-    removed in a future release.
-
-  * GStreamer 1.0.x (up to including GStreamer 1.4):
-      libglib2.0-dev (>= 2.28)
-      libgstreamer1.0-dev (>= 1.0.0)
-      libgstreamer-plugins-base1.0-dev (>= 1.0.0)
-      libgstreamer-plugins-bad1.0-dev (>= 1.0.0)
+      libgstreamer1.0-dev (>= 1.2.0)
+      libgstreamer-plugins-base1.0-dev (>= 1.2.0)
+      libgstreamer-plugins-bad1.0-dev (>= 1.2.0)
 
   * Renderers:
       DRM: libva-dev (>= 1.1.0), libdrm-dev, libudev-dev
@@ -89,7 +79,8 @@
 
   * AMD platforms with UVD2 (XvBA supported)
   * Intel Eaglelake (G45)
-  * Intel Ironlake, Sandybridge, Ivybridge and Haswell (HD Graphics)
+  * Intel Ironlake, Sandybridge, Ivybridge, Haswell and Broadwell (HD Graphics)
+  * Intel BayTrail
   * Intel Poulsbo (US15W)
   * Intel Medfield or Cedar Trail
   * NVIDIA platforms with PureVideo (VDPAU supported)
@@ -99,7 +90,7 @@
 -----
 
   VA elements are automatically plugged into GStreamer pipelines. So,
-  using playbin (or playbin2 with GStreamer 0.10) should work as is.
+  using playbin should work as is.
   However, here are a few alternate pipelines that could be manually
   constructed.
 
@@ -133,7 +124,7 @@
   <http://www.freedesktop.org/software/vaapi/releases/gstreamer-vaapi/>
 
   Git repository for work-in-progress changes is available at:
-  <http://gitorious.org/vaapi/gstreamer-vaapi>
+  <https://github.com/01org/gstreamer-vaapi>
 
 
 Reporting Bugs
diff -Nru gstreamer-vaapi-0.5.10/tests/codec.c gstreamer-vaapi-0.6.0/tests/codec.c
--- gstreamer-vaapi-0.5.10/tests/codec.c	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/tests/codec.c	2015-07-15 12:47:43.000000000 +0000
@@ -42,7 +42,7 @@
     { "wmv3",   GST_VAAPI_CODEC_VC1,
       "video/x-wmv, wmvversion=3" },
     { "vc1",    GST_VAAPI_CODEC_VC1,
-      "video/x-wmv, wmvversion=3, " GST_MAKE_FORMAT_STRING(WVC1) },
+      "video/x-wmv, wmvversion=3, format=(string)WVC1" },
     { NULL, }
 };
 
@@ -156,8 +156,8 @@
         goto error;
 
     tfp = &cip->type_find;
-    tfp->peek = (GstTypeFindPeekFunction)codec_identifier_peek;
-    tfp->suggest = (GstTypeFindSuggestFunction)codec_identifier_suggest;
+    tfp->peek = codec_identifier_peek;
+    tfp->suggest = codec_identifier_suggest;
     tfp->data = cip;
     return cip;
 
diff -Nru gstreamer-vaapi-0.5.10/tests/Makefile.am gstreamer-vaapi-0.6.0/tests/Makefile.am
--- gstreamer-vaapi-0.5.10/tests/Makefile.am	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/tests/Makefile.am	2015-07-15 12:47:43.000000000 +0000
@@ -8,6 +8,12 @@
 	test-subpicture			\
 	$(NULL)
 
+if USE_ENCODERS
+noinst_PROGRAMS += \
+	simple-encoder			\
+	$(NULL)
+endif
+
 if USE_GLX
 noinst_PROGRAMS += \
 	test-textures			\
@@ -52,6 +58,14 @@
 	$(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-glx-$(GST_API_VERSION).la
 endif
 
+if USE_EGL
+TEST_CFLAGS	+= $(EGL_CFLAGS)
+TEST_LIBS	+= \
+	$(LIBVA_EGL_LIBS)		\
+	$(EGL_LIBS)			\
+	$(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-egl-$(GST_API_VERSION).la
+endif
+
 if USE_WAYLAND
 TEST_CFLAGS	+= $(WAYLAND_CFLAGS)
 TEST_LIBS	+= \
@@ -89,13 +103,11 @@
 
 test_filter_SOURCES	= test-filter.c
 test_filter_CFLAGS	= $(TEST_CFLAGS)
-test_filter_LDADD	= libutils.la $(TEST_LIBS) $(GST_VIDEO_LIBS) \
-	$(top_builddir)/gst-libs/gst/video/libgstvaapi-videoutils.la
+test_filter_LDADD	= libutils.la $(TEST_LIBS) $(GST_VIDEO_LIBS)
 
 test_surfaces_SOURCES	= test-surfaces.c
 test_surfaces_CFLAGS	= $(TEST_CFLAGS) $(GST_VIDEO_CFLAGS)
-test_surfaces_LDADD	= libutils.la $(TEST_LIBS) $(GST_VIDEO_LIBS) \
-	$(top_builddir)/gst-libs/gst/video/libgstvaapi-videoutils.la
+test_surfaces_LDADD	= libutils.la $(TEST_LIBS) $(GST_VIDEO_LIBS)
 
 test_subpicture_SOURCES = test-subpicture.c test-subpicture-data.c
 test_subpicture_CFLAGS  = $(TEST_CFLAGS) $(GST_VIDEO_CFLAGS)
@@ -114,15 +126,20 @@
 simple_decoder_source_h	=
 simple_decoder_SOURCES	= $(simple_decoder_source_c)
 simple_decoder_CFLAGS	= $(TEST_CFLAGS) $(GST_VIDEO_CFLAGS)
-simple_decoder_LDADD	= libutils.la $(TEST_LIBS) $(GST_VIDEO_LIBS) \
-	$(top_builddir)/gst-libs/gst/video/libgstvaapi-videoutils.la
+simple_decoder_LDADD	= libutils.la $(TEST_LIBS) $(GST_VIDEO_LIBS)
+
+simple_encoder_source_c = simple-encoder.c y4mreader.c
+simple_encoder_source_h = y4mreader.h
+simple_encoder_SOURCES  = $(simple_encoder_source_c)
+simple_encoder_CFLAGS   = $(TEST_CFLAGS) $(GST_VIDEO_CFLAGS)
+simple_encoder_LDADD    = libutils.la $(TEST_LIBS) $(GST_VIDEO_LIBS)
 
 EXTRA_DIST = \
 	test-subpicture-data.h		\
 	$(simple_decoder_source_h)	\
+	$(simple_encoder_source_h)	\
 	$(test_utils_dec_source_h)	\
 	$(test_utils_source_h)		\
 	$(NULL)
 
-# Extra clean files so that maintainer-clean removes *everything*
-MAINTAINERCLEANFILES = Makefile.in
+-include $(top_srcdir)/git.mk
diff -Nru gstreamer-vaapi-0.5.10/tests/Makefile.in gstreamer-vaapi-0.6.0/tests/Makefile.in
--- gstreamer-vaapi-0.5.10/tests/Makefile.in	2015-02-03 08:39:54.000000000 +0000
+++ gstreamer-vaapi-0.6.0/tests/Makefile.in	2015-07-15 12:50:34.000000000 +0000
@@ -83,31 +83,41 @@
 noinst_PROGRAMS = simple-decoder$(EXEEXT) test-decode$(EXEEXT) \
 	test-display$(EXEEXT) test-filter$(EXEEXT) \
 	test-surfaces$(EXEEXT) test-windows$(EXEEXT) \
-	test-subpicture$(EXEEXT) $(am__EXEEXT_1)
-@USE_GLX_TRUE@am__append_1 = \
+	test-subpicture$(EXEEXT) $(am__EXEEXT_1) $(am__EXEEXT_2)
+@USE_ENCODERS_TRUE@am__append_1 = \
+@USE_ENCODERS_TRUE@	simple-encoder			\
+@USE_ENCODERS_TRUE@	$(NULL)
+
+@USE_GLX_TRUE@am__append_2 = \
 @USE_GLX_TRUE@	test-textures			\
 @USE_GLX_TRUE@	$(NULL)
 
-@USE_DRM_TRUE@am__append_2 = $(LIBVA_DRM_CFLAGS)
-@USE_DRM_TRUE@am__append_3 = \
+@USE_DRM_TRUE@am__append_3 = $(LIBVA_DRM_CFLAGS)
+@USE_DRM_TRUE@am__append_4 = \
 @USE_DRM_TRUE@	$(LIBVA_DRM_LIBS)		\
 @USE_DRM_TRUE@	$(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-drm-$(GST_API_VERSION).la
 
-@USE_X11_TRUE@am__append_4 = $(X11_CFLAGS)
-@USE_X11_TRUE@am__append_5 = \
+@USE_X11_TRUE@am__append_5 = $(X11_CFLAGS)
+@USE_X11_TRUE@am__append_6 = \
 @USE_X11_TRUE@	$(LIBVA_X11_LIBS)		\
 @USE_X11_TRUE@	$(X11_LIBS)			\
 @USE_X11_TRUE@	$(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-x11-$(GST_API_VERSION).la
 
-@USE_GLX_TRUE@am__append_6 = $(X11_CFLAGS) $(GL_CFLAGS)
-@USE_GLX_TRUE@am__append_7 = \
+@USE_GLX_TRUE@am__append_7 = $(X11_CFLAGS) $(GL_CFLAGS)
+@USE_GLX_TRUE@am__append_8 = \
 @USE_GLX_TRUE@	$(LIBVA_GLX_LIBS)		\
 @USE_GLX_TRUE@	$(X11_LIBS)			\
 @USE_GLX_TRUE@	$(GL_LIBS)			\
 @USE_GLX_TRUE@	$(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-glx-$(GST_API_VERSION).la
 
-@USE_WAYLAND_TRUE@am__append_8 = $(WAYLAND_CFLAGS)
-@USE_WAYLAND_TRUE@am__append_9 = \
+@USE_EGL_TRUE@am__append_9 = $(EGL_CFLAGS)
+@USE_EGL_TRUE@am__append_10 = \
+@USE_EGL_TRUE@	$(LIBVA_EGL_LIBS)		\
+@USE_EGL_TRUE@	$(EGL_LIBS)			\
+@USE_EGL_TRUE@	$(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-egl-$(GST_API_VERSION).la
+
+@USE_WAYLAND_TRUE@am__append_11 = $(WAYLAND_CFLAGS)
+@USE_WAYLAND_TRUE@am__append_12 = \
 @USE_WAYLAND_TRUE@	$(LIBVA_WAYLAND_LIBS)		\
 @USE_WAYLAND_TRUE@	$(WAYLAND_LIBS)			\
 @USE_WAYLAND_TRUE@	$(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-wayland-$(GST_API_VERSION).la
@@ -150,7 +160,8 @@
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(libutils_dec_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
 	-o $@
-@USE_GLX_TRUE@am__EXEEXT_1 = test-textures$(EXEEXT)
+@USE_ENCODERS_TRUE@am__EXEEXT_1 = simple-encoder$(EXEEXT)
+@USE_GLX_TRUE@am__EXEEXT_2 = test-textures$(EXEEXT)
 PROGRAMS = $(noinst_PROGRAMS)
 am__objects_3 = simple_decoder-simple-decoder.$(OBJEXT)
 am_simple_decoder_OBJECTS = $(am__objects_3)
@@ -164,38 +175,49 @@
 @USE_GLX_TRUE@am__DEPENDENCIES_4 = $(am__DEPENDENCIES_1) \
 @USE_GLX_TRUE@	$(am__DEPENDENCIES_1) \
 @USE_GLX_TRUE@	$(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-glx-$(GST_API_VERSION).la
-@USE_WAYLAND_TRUE@am__DEPENDENCIES_5 = $(am__DEPENDENCIES_1) \
+@USE_EGL_TRUE@am__DEPENDENCIES_5 = $(am__DEPENDENCIES_1) \
+@USE_EGL_TRUE@	$(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-egl-$(GST_API_VERSION).la
+@USE_WAYLAND_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1) \
 @USE_WAYLAND_TRUE@	$(am__DEPENDENCIES_1) \
 @USE_WAYLAND_TRUE@	$(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-wayland-$(GST_API_VERSION).la
-am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-$(GST_API_VERSION).la \
 	$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
-	$(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5)
-simple_decoder_DEPENDENCIES = libutils.la $(am__DEPENDENCIES_6) \
-	$(am__DEPENDENCIES_1) \
-	$(top_builddir)/gst-libs/gst/video/libgstvaapi-videoutils.la
+	$(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
+	$(am__DEPENDENCIES_6)
+simple_decoder_DEPENDENCIES = libutils.la $(am__DEPENDENCIES_7) \
+	$(am__DEPENDENCIES_1)
 simple_decoder_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(simple_decoder_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o \
 	$@
+am__objects_4 = simple_encoder-simple-encoder.$(OBJEXT) \
+	simple_encoder-y4mreader.$(OBJEXT)
+am_simple_encoder_OBJECTS = $(am__objects_4)
+simple_encoder_OBJECTS = $(am_simple_encoder_OBJECTS)
+simple_encoder_DEPENDENCIES = libutils.la $(am__DEPENDENCIES_7) \
+	$(am__DEPENDENCIES_1)
+simple_encoder_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(simple_encoder_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o \
+	$@
 am_test_decode_OBJECTS = test_decode-test-decode.$(OBJEXT)
 test_decode_OBJECTS = $(am_test_decode_OBJECTS)
 test_decode_DEPENDENCIES = libutils.la libutils_dec.la \
-	$(am__DEPENDENCIES_6)
+	$(am__DEPENDENCIES_7)
 test_decode_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(test_decode_CFLAGS) \
 	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 am_test_display_OBJECTS = test_display-test-display.$(OBJEXT)
 test_display_OBJECTS = $(am_test_display_OBJECTS)
-test_display_DEPENDENCIES = libutils.la $(am__DEPENDENCIES_6)
+test_display_DEPENDENCIES = libutils.la $(am__DEPENDENCIES_7)
 test_display_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(test_display_CFLAGS) \
 	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 am_test_filter_OBJECTS = test_filter-test-filter.$(OBJEXT)
 test_filter_OBJECTS = $(am_test_filter_OBJECTS)
-test_filter_DEPENDENCIES = libutils.la $(am__DEPENDENCIES_6) \
-	$(am__DEPENDENCIES_1) \
-	$(top_builddir)/gst-libs/gst/video/libgstvaapi-videoutils.la
+test_filter_DEPENDENCIES = libutils.la $(am__DEPENDENCIES_7) \
+	$(am__DEPENDENCIES_1)
 test_filter_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(test_filter_CFLAGS) \
 	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
@@ -204,28 +226,27 @@
 	test_subpicture-test-subpicture-data.$(OBJEXT)
 test_subpicture_OBJECTS = $(am_test_subpicture_OBJECTS)
 test_subpicture_DEPENDENCIES = libutils.la libutils_dec.la \
-	$(am__DEPENDENCIES_6) $(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_7) $(am__DEPENDENCIES_1)
 test_subpicture_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(test_subpicture_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
 	-o $@
 am_test_surfaces_OBJECTS = test_surfaces-test-surfaces.$(OBJEXT)
 test_surfaces_OBJECTS = $(am_test_surfaces_OBJECTS)
-test_surfaces_DEPENDENCIES = libutils.la $(am__DEPENDENCIES_6) \
-	$(am__DEPENDENCIES_1) \
-	$(top_builddir)/gst-libs/gst/video/libgstvaapi-videoutils.la
+test_surfaces_DEPENDENCIES = libutils.la $(am__DEPENDENCIES_7) \
+	$(am__DEPENDENCIES_1)
 test_surfaces_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(test_surfaces_CFLAGS) \
 	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 am_test_textures_OBJECTS = test_textures-test-textures.$(OBJEXT)
 test_textures_OBJECTS = $(am_test_textures_OBJECTS)
-test_textures_DEPENDENCIES = libutils.la $(am__DEPENDENCIES_6)
+test_textures_DEPENDENCIES = libutils.la $(am__DEPENDENCIES_7)
 test_textures_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(test_textures_CFLAGS) \
 	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 am_test_windows_OBJECTS = test_windows-test-windows.$(OBJEXT)
 test_windows_OBJECTS = $(am_test_windows_OBJECTS)
-test_windows_DEPENDENCIES = libutils.la $(am__DEPENDENCIES_6)
+test_windows_DEPENDENCIES = libutils.la $(am__DEPENDENCIES_7)
 test_windows_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(test_windows_CFLAGS) \
 	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
@@ -264,15 +285,17 @@
 am__v_CCLD_0 = @echo "  CCLD    " $@;
 am__v_CCLD_1 = 
 SOURCES = $(libutils_la_SOURCES) $(libutils_dec_la_SOURCES) \
-	$(simple_decoder_SOURCES) $(test_decode_SOURCES) \
-	$(test_display_SOURCES) $(test_filter_SOURCES) \
-	$(test_subpicture_SOURCES) $(test_surfaces_SOURCES) \
-	$(test_textures_SOURCES) $(test_windows_SOURCES)
+	$(simple_decoder_SOURCES) $(simple_encoder_SOURCES) \
+	$(test_decode_SOURCES) $(test_display_SOURCES) \
+	$(test_filter_SOURCES) $(test_subpicture_SOURCES) \
+	$(test_surfaces_SOURCES) $(test_textures_SOURCES) \
+	$(test_windows_SOURCES)
 DIST_SOURCES = $(libutils_la_SOURCES) $(libutils_dec_la_SOURCES) \
-	$(simple_decoder_SOURCES) $(test_decode_SOURCES) \
-	$(test_display_SOURCES) $(test_filter_SOURCES) \
-	$(test_subpicture_SOURCES) $(test_surfaces_SOURCES) \
-	$(test_textures_SOURCES) $(test_windows_SOURCES)
+	$(simple_decoder_SOURCES) $(simple_encoder_SOURCES) \
+	$(test_decode_SOURCES) $(test_display_SOURCES) \
+	$(test_filter_SOURCES) $(test_subpicture_SOURCES) \
+	$(test_surfaces_SOURCES) $(test_textures_SOURCES) \
+	$(test_windows_SOURCES)
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -323,10 +346,16 @@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
+EGL_CFLAGS = @EGL_CFLAGS@
+EGL_LIBS = @EGL_LIBS@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GIT = @GIT@
+GLES2_CFLAGS = @GLES2_CFLAGS@
+GLES2_LIBS = @GLES2_LIBS@
+GLES3_CFLAGS = @GLES3_CFLAGS@
+GLES3_LIBS = @GLES3_LIBS@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_VERSION_REQUIRED = @GLIB_VERSION_REQUIRED@
@@ -344,6 +373,8 @@
 GST_CFLAGS = @GST_CFLAGS@
 GST_CODEC_PARSERS_CFLAGS = @GST_CODEC_PARSERS_CFLAGS@
 GST_CODEC_PARSERS_LIBS = @GST_CODEC_PARSERS_LIBS@
+GST_GL_CFLAGS = @GST_GL_CFLAGS@
+GST_GL_LIBS = @GST_GL_LIBS@
 GST_INTERFACES_CFLAGS = @GST_INTERFACES_CFLAGS@
 GST_INTERFACES_LIBS = @GST_INTERFACES_LIBS@
 GST_LIBS = @GST_LIBS@
@@ -353,7 +384,6 @@
 GST_PLUGINS_BASE_LIBS = @GST_PLUGINS_BASE_LIBS@
 GST_PLUGINS_BASE_VERSION_REQUIRED = @GST_PLUGINS_BASE_VERSION_REQUIRED@
 GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
-GST_PLUGIN_PATH = @GST_PLUGIN_PATH@
 GST_PLUGIN_PATH_1_0 = @GST_PLUGIN_PATH_1_0@
 GST_VAAPI_LT_LDFLAGS = @GST_VAAPI_LT_LDFLAGS@
 GST_VAAPI_LT_VERSION = @GST_VAAPI_LT_VERSION@
@@ -492,12 +522,12 @@
 top_srcdir = @top_srcdir@
 TEST_CFLAGS = -DGST_USE_UNSTABLE_API -I$(top_srcdir)/gst-libs \
 	-I$(top_builddir)/gst-libs $(LIBVA_CFLAGS) $(GST_CFLAGS) \
-	$(GST_VIDEO_CFLAGS) $(NULL) $(am__append_2) $(am__append_4) \
-	$(am__append_6) $(am__append_8)
+	$(GST_VIDEO_CFLAGS) $(NULL) $(am__append_3) $(am__append_5) \
+	$(am__append_7) $(am__append_9) $(am__append_11)
 TEST_LIBS = $(LIBVA_LIBS) $(GST_LIBS) \
 	$(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-$(GST_API_VERSION).la \
-	$(am__append_3) $(am__append_5) $(am__append_7) \
-	$(am__append_9)
+	$(am__append_4) $(am__append_6) $(am__append_8) \
+	$(am__append_10) $(am__append_12)
 test_utils_dec_source_c = \
 	decoder.c	\
 	test-h264.c	\
@@ -523,14 +553,10 @@
 test_display_LDADD = libutils.la $(TEST_LIBS)
 test_filter_SOURCES = test-filter.c
 test_filter_CFLAGS = $(TEST_CFLAGS)
-test_filter_LDADD = libutils.la $(TEST_LIBS) $(GST_VIDEO_LIBS) \
-	$(top_builddir)/gst-libs/gst/video/libgstvaapi-videoutils.la
-
+test_filter_LDADD = libutils.la $(TEST_LIBS) $(GST_VIDEO_LIBS)
 test_surfaces_SOURCES = test-surfaces.c
 test_surfaces_CFLAGS = $(TEST_CFLAGS) $(GST_VIDEO_CFLAGS)
-test_surfaces_LDADD = libutils.la $(TEST_LIBS) $(GST_VIDEO_LIBS) \
-	$(top_builddir)/gst-libs/gst/video/libgstvaapi-videoutils.la
-
+test_surfaces_LDADD = libutils.la $(TEST_LIBS) $(GST_VIDEO_LIBS)
 test_subpicture_SOURCES = test-subpicture.c test-subpicture-data.c
 test_subpicture_CFLAGS = $(TEST_CFLAGS) $(GST_VIDEO_CFLAGS)
 test_subpicture_LDADD = libutils.la libutils_dec.la $(TEST_LIBS) \
@@ -546,19 +572,20 @@
 simple_decoder_source_h = 
 simple_decoder_SOURCES = $(simple_decoder_source_c)
 simple_decoder_CFLAGS = $(TEST_CFLAGS) $(GST_VIDEO_CFLAGS)
-simple_decoder_LDADD = libutils.la $(TEST_LIBS) $(GST_VIDEO_LIBS) \
-	$(top_builddir)/gst-libs/gst/video/libgstvaapi-videoutils.la
-
+simple_decoder_LDADD = libutils.la $(TEST_LIBS) $(GST_VIDEO_LIBS)
+simple_encoder_source_c = simple-encoder.c y4mreader.c
+simple_encoder_source_h = y4mreader.h
+simple_encoder_SOURCES = $(simple_encoder_source_c)
+simple_encoder_CFLAGS = $(TEST_CFLAGS) $(GST_VIDEO_CFLAGS)
+simple_encoder_LDADD = libutils.la $(TEST_LIBS) $(GST_VIDEO_LIBS)
 EXTRA_DIST = \
 	test-subpicture-data.h		\
 	$(simple_decoder_source_h)	\
+	$(simple_encoder_source_h)	\
 	$(test_utils_dec_source_h)	\
 	$(test_utils_source_h)		\
 	$(NULL)
 
-
-# Extra clean files so that maintainer-clean removes *everything*
-MAINTAINERCLEANFILES = Makefile.in
 all: all-am
 
 .SUFFIXES:
@@ -624,6 +651,10 @@
 	@rm -f simple-decoder$(EXEEXT)
 	$(AM_V_CCLD)$(simple_decoder_LINK) $(simple_decoder_OBJECTS) $(simple_decoder_LDADD) $(LIBS)
 
+simple-encoder$(EXEEXT): $(simple_encoder_OBJECTS) $(simple_encoder_DEPENDENCIES) $(EXTRA_simple_encoder_DEPENDENCIES) 
+	@rm -f simple-encoder$(EXEEXT)
+	$(AM_V_CCLD)$(simple_encoder_LINK) $(simple_encoder_OBJECTS) $(simple_encoder_LDADD) $(LIBS)
+
 test-decode$(EXEEXT): $(test_decode_OBJECTS) $(test_decode_DEPENDENCIES) $(EXTRA_test_decode_DEPENDENCIES) 
 	@rm -f test-decode$(EXEEXT)
 	$(AM_V_CCLD)$(test_decode_LINK) $(test_decode_OBJECTS) $(test_decode_LDADD) $(LIBS)
@@ -668,6 +699,8 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libutils_la-image.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libutils_la-output.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/simple_decoder-simple-decoder.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/simple_encoder-simple-encoder.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/simple_encoder-y4mreader.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_decode-test-decode.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_display-test-display.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_filter-test-filter.Po@am__quote@
@@ -775,6 +808,34 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(simple_decoder_CFLAGS) $(CFLAGS) -c -o simple_decoder-simple-decoder.obj `if test -f 'simple-decoder.c'; then $(CYGPATH_W) 'simple-decoder.c'; else $(CYGPATH_W) '$(srcdir)/simple-decoder.c'; fi`
 
+simple_encoder-simple-encoder.o: simple-encoder.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(simple_encoder_CFLAGS) $(CFLAGS) -MT simple_encoder-simple-encoder.o -MD -MP -MF $(DEPDIR)/simple_encoder-simple-encoder.Tpo -c -o simple_encoder-simple-encoder.o `test -f 'simple-encoder.c' || echo '$(srcdir)/'`simple-encoder.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/simple_encoder-simple-encoder.Tpo $(DEPDIR)/simple_encoder-simple-encoder.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='simple-encoder.c' object='simple_encoder-simple-encoder.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(simple_encoder_CFLAGS) $(CFLAGS) -c -o simple_encoder-simple-encoder.o `test -f 'simple-encoder.c' || echo '$(srcdir)/'`simple-encoder.c
+
+simple_encoder-simple-encoder.obj: simple-encoder.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(simple_encoder_CFLAGS) $(CFLAGS) -MT simple_encoder-simple-encoder.obj -MD -MP -MF $(DEPDIR)/simple_encoder-simple-encoder.Tpo -c -o simple_encoder-simple-encoder.obj `if test -f 'simple-encoder.c'; then $(CYGPATH_W) 'simple-encoder.c'; else $(CYGPATH_W) '$(srcdir)/simple-encoder.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/simple_encoder-simple-encoder.Tpo $(DEPDIR)/simple_encoder-simple-encoder.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='simple-encoder.c' object='simple_encoder-simple-encoder.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(simple_encoder_CFLAGS) $(CFLAGS) -c -o simple_encoder-simple-encoder.obj `if test -f 'simple-encoder.c'; then $(CYGPATH_W) 'simple-encoder.c'; else $(CYGPATH_W) '$(srcdir)/simple-encoder.c'; fi`
+
+simple_encoder-y4mreader.o: y4mreader.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(simple_encoder_CFLAGS) $(CFLAGS) -MT simple_encoder-y4mreader.o -MD -MP -MF $(DEPDIR)/simple_encoder-y4mreader.Tpo -c -o simple_encoder-y4mreader.o `test -f 'y4mreader.c' || echo '$(srcdir)/'`y4mreader.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/simple_encoder-y4mreader.Tpo $(DEPDIR)/simple_encoder-y4mreader.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='y4mreader.c' object='simple_encoder-y4mreader.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(simple_encoder_CFLAGS) $(CFLAGS) -c -o simple_encoder-y4mreader.o `test -f 'y4mreader.c' || echo '$(srcdir)/'`y4mreader.c
+
+simple_encoder-y4mreader.obj: y4mreader.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(simple_encoder_CFLAGS) $(CFLAGS) -MT simple_encoder-y4mreader.obj -MD -MP -MF $(DEPDIR)/simple_encoder-y4mreader.Tpo -c -o simple_encoder-y4mreader.obj `if test -f 'y4mreader.c'; then $(CYGPATH_W) 'y4mreader.c'; else $(CYGPATH_W) '$(srcdir)/y4mreader.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/simple_encoder-y4mreader.Tpo $(DEPDIR)/simple_encoder-y4mreader.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='y4mreader.c' object='simple_encoder-y4mreader.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(simple_encoder_CFLAGS) $(CFLAGS) -c -o simple_encoder-y4mreader.obj `if test -f 'y4mreader.c'; then $(CYGPATH_W) 'y4mreader.c'; else $(CYGPATH_W) '$(srcdir)/y4mreader.c'; fi`
+
 test_decode-test-decode.o: test-decode.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_decode_CFLAGS) $(CFLAGS) -MT test_decode-test-decode.o -MD -MP -MF $(DEPDIR)/test_decode-test-decode.Tpo -c -o test_decode-test-decode.o `test -f 'test-decode.c' || echo '$(srcdir)/'`test-decode.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_decode-test-decode.Tpo $(DEPDIR)/test_decode-test-decode.Po
@@ -1009,7 +1070,6 @@
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
 clean: clean-am
 
 clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
@@ -1098,6 +1158,8 @@
 	tags tags-am uninstall uninstall-am
 
 
+-include $(top_srcdir)/git.mk
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -Nru gstreamer-vaapi-0.5.10/tests/output.c gstreamer-vaapi-0.6.0/tests/output.c
--- gstreamer-vaapi-0.5.10/tests/output.c	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/tests/output.c	2015-07-15 12:47:43.000000000 +0000
@@ -36,6 +36,10 @@
 # include <gst/vaapi/gstvaapidisplay_glx.h>
 # include <gst/vaapi/gstvaapiwindow_glx.h>
 #endif
+#if USE_EGL
+# include <gst/vaapi/gstvaapidisplay_egl.h>
+# include <gst/vaapi/gstvaapiwindow_egl.h>
+#endif
 #if USE_WAYLAND
 # include <gst/vaapi/gstvaapidisplay_wayland.h>
 # include <gst/vaapi/gstvaapiwindow_wayland.h>
@@ -78,6 +82,9 @@
 static gboolean g_list_outputs = FALSE;
 static gboolean g_fullscreen = FALSE;
 
+static gboolean g_egl_mode = FALSE;
+static guint g_gles_version;
+
 static GOptionEntry g_options[] = {
     { "list-outputs", 0,
       0,
@@ -91,6 +98,14 @@
       0,
       G_OPTION_ARG_NONE, &g_fullscreen,
       "fullscreen mode", NULL },
+    { "egl", 0,
+      0,
+      G_OPTION_ARG_NONE, &g_egl_mode,
+      "enable EGL rendering", NULL },
+    { "gles-version", 0,
+      0,
+      G_OPTION_ARG_INT, &g_gles_version,
+      "OpenGL|ES version (in --egl mode)", NULL },
     { NULL, }
 };
 
@@ -160,7 +175,7 @@
 video_output_create_display(const gchar *display_name)
 {
     const VideoOutputInfo *o = g_video_output;
-    GstVaapiDisplay *display = NULL;
+    GstVaapiDisplay *egl_display, *display = NULL;
 
     if (!o) {
         if (g_output_name)
@@ -184,6 +199,19 @@
 
     if (!display)
         display = o->create_display(display_name);
+
+    if (g_egl_mode) {
+#if USE_EGL
+        egl_display = gst_vaapi_display_egl_new (display, g_gles_version);
+#else
+        egl_display = NULL;
+        g_print("error: unsupported EGL renderering mode\n");
+#endif
+        gst_vaapi_display_unref (display);
+        if (!egl_display)
+            return NULL;
+        display = egl_display;
+    }
     return display;
 }
 
@@ -195,7 +223,12 @@
     if (!g_video_output)
         return NULL;
 
-    window = g_video_output->create_window(display, width, height);
+#if USE_EGL
+    if (g_egl_mode)
+        window = gst_vaapi_window_egl_new(display, width, height);
+    else
+#endif
+        window = g_video_output->create_window(display, width, height);
     if (!window)
         return NULL;
 
diff -Nru gstreamer-vaapi-0.5.10/tests/simple-encoder.c gstreamer-vaapi-0.6.0/tests/simple-encoder.c
--- gstreamer-vaapi-0.5.10/tests/simple-encoder.c	1970-01-01 00:00:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/tests/simple-encoder.c	2015-07-15 12:47:43.000000000 +0000
@@ -0,0 +1,514 @@
+/*
+ * simple-encoder.c - Test GstVaapiencoder
+ *
+ * Copyright (C) 2015 Intel Corporation
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1
+ * of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA
+ */
+
+#include "gst/vaapi/sysdeps.h"
+#include <gst/vaapi/gstvaapiencoder_mpeg2.h>
+#include <gst/vaapi/gstvaapiencoder_h264.h>
+#include <gst/vaapi/gstvaapisurfacepool.h>
+#include <gst/vaapi/gstvaapisurfaceproxy.h>
+
+#include "output.h"
+#include "y4mreader.h"
+
+static guint g_bitrate = 0;
+static gchar *g_codec_str;
+static gchar *g_output_file_name;
+static char **g_input_files = NULL;
+
+#define SURFACE_NUM 16
+
+static GOptionEntry g_options[] = {
+  {"codec", 'c', 0, G_OPTION_ARG_STRING, &g_codec_str,
+      "codec to use for video encoding (h264/mpeg2)", NULL},
+  {"bitrate", 'b', 0, G_OPTION_ARG_INT, &g_bitrate,
+      "desired bitrate expressed in kbps", NULL},
+  {"output", 'o', 0, G_OPTION_ARG_FILENAME, &g_output_file_name,
+      "output file name", NULL},
+  {G_OPTION_REMAINING, ' ', 0, G_OPTION_ARG_FILENAME_ARRAY, &g_input_files,
+      "input file name", NULL},
+  {NULL}
+};
+
+typedef struct
+{
+  GstVaapiDisplay *display;
+  GstVaapiEncoder *encoder;
+  guint read_frames;
+  guint encoded_frames;
+  guint saved_frames;
+  Y4MReader *parser;
+  FILE *output_file;
+  guint input_stopped:1;
+  guint encode_failed:1;
+} App;
+
+static inline gchar *
+generate_output_filename (const gchar * ext)
+{
+  gchar *fn;
+  int i = 0;
+
+  while (1) {
+    fn = g_strdup_printf ("temp%02d.%s", i, ext);
+    if (g_file_test (fn, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_REGULAR)) {
+      i++;
+      g_free (fn);
+    } else {
+      break;
+    }
+  }
+
+  return fn;
+}
+
+static gboolean
+parse_options (int *argc, char *argv[])
+{
+  GOptionContext *ctx;
+  gboolean success;
+  GError *error = NULL;
+
+  ctx = g_option_context_new (" - encoder test options");
+  if (!ctx)
+    return FALSE;
+
+  g_option_context_add_group (ctx, gst_init_get_option_group ());
+  g_option_context_add_main_entries (ctx, g_options, NULL);
+  g_option_context_set_help_enabled (ctx, TRUE);
+  success = g_option_context_parse (ctx, argc, &argv, &error);
+  if (!success) {
+    g_printerr ("Option parsing failed: %s\n", error->message);
+    g_error_free (error);
+    goto bail;
+  }
+
+  if (!g_codec_str)
+    g_codec_str = g_strdup ("h264");
+  if (!g_output_file_name)
+    g_output_file_name = generate_output_filename (g_codec_str);
+
+bail:
+  g_option_context_free (ctx);
+  return success;
+}
+
+static void
+print_yuv_info (App * app)
+{
+  g_print ("\n");
+  g_print ("Encode      : %s\n", g_codec_str);
+  g_print ("Resolution  : %dx%d\n", app->parser->width, app->parser->height);
+  g_print ("Source YUV  : %s\n", g_input_files ? g_input_files[0] : "stdin");
+  g_print ("Frame Rate  : %0.1f fps\n",
+      1.0 * app->parser->fps_n / app->parser->fps_d);
+  g_print ("Coded file  : %s\n", g_output_file_name);
+  g_print ("\n");
+}
+
+static void
+print_num_frame (App * app)
+{
+  g_print ("\n");
+  g_print ("read frames    : %d\n", app->read_frames);
+  g_print ("encoded frames : %d\n", app->encoded_frames);
+  g_print ("saved frames   : %d\n", app->saved_frames);
+  g_print ("\n");
+}
+
+static GstVaapiEncoder *
+encoder_new (GstVaapiDisplay * display)
+{
+  GstVaapiEncoder *encoder = NULL;
+
+  if (!g_strcmp0 (g_codec_str, "mpeg2"))
+    encoder = gst_vaapi_encoder_mpeg2_new (display);
+  else if (!g_strcmp0 (g_codec_str, "h264"))
+    encoder = gst_vaapi_encoder_h264_new (display);
+  else
+    return NULL;
+
+  gst_vaapi_encoder_set_bitrate (encoder, g_bitrate);
+
+  return encoder;
+}
+
+static GstVideoCodecState *
+new_codec_state (gint width, gint height, gint fps_n, gint fps_d)
+{
+  GstVideoCodecState *state;
+
+  state = g_slice_new0 (GstVideoCodecState);
+  state->ref_count = 1;
+  gst_video_info_init (&state->info);
+  gst_video_info_set_format (&state->info, GST_VIDEO_FORMAT_ENCODED, width,
+      height);
+
+  state->info.fps_n = fps_n;
+  state->info.fps_d = fps_d;
+
+  return state;
+}
+
+static gboolean
+set_format (GstVaapiEncoder * encoder, gint width, gint height, gint fps_n,
+    gint fps_d)
+{
+  GstVideoCodecState *in_state;
+  GstVaapiEncoderStatus status;
+  GstCaps *caps;
+
+  if (!g_strcmp0 (g_codec_str, "mpeg2")) {
+    caps = gst_caps_from_string ("video/mpeg");
+    gst_caps_set_simple (caps,
+        "mpegversion", G_TYPE_INT, 2,
+        "systemstream", G_TYPE_BOOLEAN, FALSE,
+        "width", G_TYPE_INT, width,
+        "height", G_TYPE_INT, height,
+        "framerate", GST_TYPE_FRACTION, fps_n, fps_d, NULL);
+  } else if (!g_strcmp0 (g_codec_str, "h264")) {
+    caps = gst_caps_new_empty_simple ("video/x-h264");
+    gst_caps_set_simple (caps, "width", G_TYPE_INT, width,
+        "height", G_TYPE_INT, height,
+        "framerate", GST_TYPE_FRACTION, fps_n, fps_d, NULL);
+  } else {
+    return FALSE;
+  }
+
+  in_state = new_codec_state (width, height, fps_n, fps_d);
+  status = gst_vaapi_encoder_set_codec_state (encoder, in_state);
+  gst_caps_unref (caps);
+  g_slice_free (GstVideoCodecState, in_state);
+
+  return (status == GST_VAAPI_ENCODER_STATUS_SUCCESS);
+}
+
+static GstBuffer *
+allocate_buffer (GstVaapiCodedBuffer * vbuf)
+{
+  GstBuffer *buf;
+  gssize size;
+
+  size = gst_vaapi_coded_buffer_get_size (vbuf);
+  if (size <= 0) {
+    g_warning ("Invalid VA buffer size (%zd)", size);
+    return NULL;
+  }
+
+  buf = gst_buffer_new_and_alloc (size);
+  if (!buf) {
+    g_warning ("Failed to create output buffer of size %zd", size);
+    return NULL;
+  }
+
+  if (!gst_vaapi_coded_buffer_copy_into (buf, vbuf)) {
+    g_warning ("Failed to copy VA buffer data");
+    gst_buffer_unref (buf);
+    return NULL;
+  }
+
+  return buf;
+}
+
+static GstVaapiEncoderStatus
+get_encoder_buffer (GstVaapiEncoder * encoder, GstBuffer ** buffer)
+{
+  GstVaapiCodedBufferProxy *proxy = NULL;
+  GstVaapiEncoderStatus status;
+
+  status = gst_vaapi_encoder_get_buffer_with_timeout (encoder, &proxy, 50000);
+  if (status < GST_VAAPI_ENCODER_STATUS_SUCCESS) {
+    g_warning ("Failed to get a buffer from encoder: %d", status);
+    return status;
+  } else if (status > GST_VAAPI_ENCODER_STATUS_SUCCESS) {
+    return status;
+  }
+
+  *buffer = allocate_buffer (GST_VAAPI_CODED_BUFFER_PROXY_BUFFER (proxy));
+  gst_vaapi_coded_buffer_proxy_unref (proxy);
+
+  return status;
+}
+
+static gboolean
+outputs_to_file (GstBuffer * buffer, FILE * file)
+{
+  GstMapInfo info;
+  size_t written;
+  gboolean ret = FALSE;
+
+  gst_buffer_map (buffer, &info, GST_MAP_READ);
+
+  if (info.size <= 0 || !info.data)
+    return FALSE;
+
+  written = fwrite (info.data, 1, info.size, file);
+  if (written < info.size) {
+    g_warning ("write file error.");
+    goto bail;
+  }
+
+  ret = TRUE;
+
+bail:
+  gst_buffer_unmap (buffer, &info);
+  return ret;
+}
+
+static gpointer
+get_buffer_thread (gpointer data)
+{
+  App *app = data;
+
+  GstVaapiEncoderStatus ret;
+  GstBuffer *obuf;
+
+  while (1) {
+    obuf = NULL;
+    ret = get_encoder_buffer (app->encoder, &obuf);
+    if (app->input_stopped && ret > GST_VAAPI_ENCODER_STATUS_SUCCESS) {
+      break;                    /* finished */
+    } else if (ret > GST_VAAPI_ENCODER_STATUS_SUCCESS) {        /* another chance */
+      continue;
+    }
+    if (ret < GST_VAAPI_ENCODER_STATUS_SUCCESS) {       /* fatal error */
+      app->encode_failed = TRUE;
+      break;
+    }
+
+    app->encoded_frames++;
+    g_debug ("encoded frame %d, buffer = %p", app->encoded_frames, obuf);
+
+    if (app->output_file && outputs_to_file (obuf, app->output_file))
+      app->saved_frames++;
+
+    gst_buffer_unref (obuf);
+  }
+
+  if (obuf)
+    gst_buffer_replace (&obuf, NULL);
+
+  return NULL;
+}
+
+static void
+app_free (App * app)
+{
+  g_return_if_fail (app);
+
+  if (app->parser)
+    y4m_reader_close (app->parser);
+
+  if (app->encoder) {
+    gst_vaapi_encoder_flush (app->encoder);
+    gst_vaapi_encoder_unref (app->encoder);
+  }
+
+  if (app->display)
+    gst_vaapi_display_unref (app->display);
+
+  if (app->output_file)
+    fclose (app->output_file);
+
+  g_slice_free (App, app);
+}
+
+static App *
+app_new (const gchar * input_fn, const gchar * output_fn)
+{
+  App *app = g_slice_new0 (App);
+  if (!app)
+    return NULL;
+
+  app->parser = y4m_reader_open (input_fn);
+  if (!app->parser) {
+    g_warning ("Could not parse input stream.");
+    goto error;
+  }
+
+  app->output_file = fopen (output_fn, "w");
+  if (app->output_file == NULL) {
+    g_warning ("Could not open file \"%s\" for writing: %s.", output_fn,
+        g_strerror (errno));
+    goto error;
+  }
+
+  app->display = video_output_create_display (NULL);
+  if (!app->display) {
+    g_warning ("Could not create VA display.");
+    goto error;
+  }
+
+  app->encoder = encoder_new (app->display);
+  if (!app->encoder) {
+    g_warning ("Could not create encoder.");
+    goto error;
+  }
+
+  if (!set_format (app->encoder, app->parser->width, app->parser->height,
+          app->parser->fps_n, app->parser->fps_d)) {
+    g_warning ("Could not set format.");
+    goto error;
+  }
+
+  return app;
+
+error:
+  app_free (app);
+  return NULL;
+}
+
+static gboolean
+upload_frame (GstVaapiEncoder * encoder, GstVaapiSurfaceProxy * proxy)
+{
+  GstVideoCodecFrame *frame;
+  GstVaapiEncoderStatus ret;
+
+  frame = g_slice_new0 (GstVideoCodecFrame);
+  gst_video_codec_frame_set_user_data (frame,
+      gst_vaapi_surface_proxy_ref (proxy),
+      (GDestroyNotify) gst_vaapi_surface_proxy_unref);
+
+  ret = gst_vaapi_encoder_put_frame (encoder, frame);
+  return (ret == GST_VAAPI_ENCODER_STATUS_SUCCESS);
+}
+
+static gboolean
+load_frame (App * app, GstVaapiImage * image)
+{
+  gboolean ret = FALSE;
+
+  if (!gst_vaapi_image_map (image))
+    return FALSE;
+
+  ret = y4m_reader_load_image (app->parser, image);
+
+  if (!gst_vaapi_image_unmap (image))
+    return FALSE;
+
+  return ret;
+}
+
+static int
+app_run (App * app)
+{
+  GstVaapiImage *image;
+  GstVaapiVideoPool *pool;
+  GThread *buffer_thread;
+  gsize id;
+  int ret = EXIT_FAILURE;
+
+  image = gst_vaapi_image_new (app->display, GST_VIDEO_FORMAT_I420,
+      app->parser->width, app->parser->height);
+
+  {
+    GstVideoInfo vi;
+    gst_video_info_set_format (&vi, GST_VIDEO_FORMAT_ENCODED,
+        app->parser->width, app->parser->height);
+    pool = gst_vaapi_surface_pool_new_full (app->display, &vi, 0);
+  }
+
+  buffer_thread = g_thread_new ("get buffer thread", get_buffer_thread, app);
+
+  while (1) {
+    if (!load_frame (app, image))
+      break;
+
+    if (!gst_vaapi_image_unmap (image))
+      break;
+
+    GstVaapiSurfaceProxy *proxy =
+        gst_vaapi_surface_proxy_new_from_pool (GST_VAAPI_SURFACE_POOL (pool));
+    if (!proxy) {
+      g_warning ("Could not get surface proxy from pool.");
+      break;
+    }
+    GstVaapiSurface *surface = gst_vaapi_surface_proxy_get_surface (proxy);
+    if (!surface) {
+      g_warning ("Could not get surface from proxy.");
+      break;
+    }
+
+    if (!gst_vaapi_surface_put_image (surface, image)) {
+      g_warning ("Could not update surface");
+      break;
+    }
+
+    if (!upload_frame (app->encoder, proxy)) {
+      g_warning ("put frame failed");
+      break;
+    }
+
+    app->read_frames++;
+    id = gst_vaapi_surface_get_id (surface);
+    g_debug ("input frame %d, surface id = %lu", app->read_frames, id);
+
+    gst_vaapi_surface_proxy_unref (proxy);
+  }
+
+  app->input_stopped = TRUE;
+
+  g_thread_join (buffer_thread);
+
+  if (!app->encode_failed && feof (app->parser->fp))
+    ret = EXIT_SUCCESS;
+
+  gst_vaapi_video_pool_replace (&pool, NULL);
+  gst_vaapi_object_unref (image);
+  return ret;
+}
+
+int
+main (int argc, char *argv[])
+{
+  App *app;
+  int ret = EXIT_FAILURE;
+  gchar *input_fn;
+
+  if (!parse_options (&argc, argv))
+    return EXIT_FAILURE;
+
+  /* @TODO: iterate all the input files */
+  input_fn = g_input_files ? g_input_files[0] : NULL;
+  if (input_fn && !g_file_test (input_fn,
+          G_FILE_TEST_EXISTS | G_FILE_TEST_IS_REGULAR)) {
+    g_warning ("input file \"%s\" doesn't exist", input_fn);
+    goto bail;
+  }
+
+  app = app_new (input_fn, g_output_file_name);
+  if (!app)
+    goto bail;
+
+  print_yuv_info (app);
+  ret = app_run (app);
+  print_num_frame (app);
+
+  app_free (app);
+
+bail:
+  g_free (g_codec_str);
+  g_free (g_output_file_name);
+  g_strfreev (g_input_files);
+
+  gst_deinit ();
+
+  return ret;
+}
diff -Nru gstreamer-vaapi-0.5.10/tests/test-display.c gstreamer-vaapi-0.6.0/tests/test-display.c
--- gstreamer-vaapi-0.5.10/tests/test-display.c	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/tests/test-display.c	2015-07-15 12:47:43.000000000 +0000
@@ -42,6 +42,9 @@
 #if USE_WAYLAND
 # include <gst/vaapi/gstvaapidisplay_wayland.h>
 #endif
+#if USE_EGL
+# include <gst/vaapi/gstvaapidisplay_egl.h>
+#endif
 
 #ifdef HAVE_VA_VA_GLX_H
 # include <va/va_glx.h>
diff -Nru gstreamer-vaapi-0.5.10/tests/test-filter.c gstreamer-vaapi-0.6.0/tests/test-filter.c
--- gstreamer-vaapi-0.5.10/tests/test-filter.c	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/tests/test-filter.c	2015-07-15 12:47:43.000000000 +0000
@@ -100,7 +100,7 @@
     GError *error = NULL;
 
     if (g_src_format_str) {
-        format = gst_vaapi_video_format_from_string(g_src_format_str);
+        format = gst_video_format_from_string(g_src_format_str);
         if (format == GST_VIDEO_FORMAT_UNKNOWN)
             goto error_invalid_format;
     }
diff -Nru gstreamer-vaapi-0.5.10/tests/test-subpicture.c gstreamer-vaapi-0.6.0/tests/test-subpicture.c
--- gstreamer-vaapi-0.5.10/tests/test-subpicture.c	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/tests/test-subpicture.c	2015-07-15 12:47:43.000000000 +0000
@@ -41,12 +41,10 @@
       0,
       G_OPTION_ARG_STRING, &g_codec_str,
       "codec to test", NULL },
-#ifdef HAVE_GST_VIDEO_OVERLAY_HWCAPS
     { "global-alpha", 'g',
       0,
       G_OPTION_ARG_DOUBLE, &g_global_alpha,
       "global-alpha value", NULL },
-#endif
     { NULL, }
 };
 
@@ -92,10 +90,8 @@
     if (!video_output_init(&argc, argv, g_options))
         g_error("failed to initialize video output subsystem");
 
-#ifdef HAVE_GST_VIDEO_OVERLAY_HWCAPS
     if (g_global_alpha != 1.0)
         flags |= GST_VIDEO_OVERLAY_FORMAT_FLAG_GLOBAL_ALPHA;
-#endif
 
     g_print("Test subpicture\n");
 
@@ -130,7 +126,6 @@
     subrect.height = subinfo.height;
     subrect.width = subinfo.width;
 
-#if GST_CHECK_VERSION(1,0,0)
     {
         GstVideoMeta * const vmeta =
             gst_buffer_add_video_meta(buffer, GST_VIDEO_FRAME_FLAG_NONE,
@@ -142,19 +137,12 @@
         overlay = gst_video_overlay_rectangle_new_raw(buffer,
             subrect.x, subrect.y, subrect.width, subrect.height, flags);
     }
-#else
-    overlay = gst_video_overlay_rectangle_new_argb(buffer,
-        subinfo.width, subinfo.height, subinfo.width * 4,
-        subrect.x, subrect.y, subrect.width, subrect.height, flags);
-#endif
     if (!overlay)
         g_error("could not create video overlay");
     gst_buffer_unref(buffer);
 
-#ifdef HAVE_GST_VIDEO_OVERLAY_HWCAPS
     if (flags & GST_VIDEO_OVERLAY_FORMAT_FLAG_GLOBAL_ALPHA)
         gst_video_overlay_rectangle_set_global_alpha(overlay, g_global_alpha);
-#endif
 
     compo = gst_video_overlay_composition_new(overlay);
     if (!compo)
diff -Nru gstreamer-vaapi-0.5.10/tests/test-windows.c gstreamer-vaapi-0.6.0/tests/test-windows.c
--- gstreamer-vaapi-0.5.10/tests/test-windows.c	2015-02-03 07:56:36.000000000 +0000
+++ gstreamer-vaapi-0.6.0/tests/test-windows.c	2015-07-15 12:47:43.000000000 +0000
@@ -37,6 +37,10 @@
 # include <gst/vaapi/gstvaapidisplay_wayland.h>
 # include <gst/vaapi/gstvaapiwindow_wayland.h>
 #endif
+#if USE_EGL
+# include <gst/vaapi/gstvaapidisplay_egl.h>
+# include <gst/vaapi/gstvaapiwindow_egl.h>
+#endif
 #include "image.h"
 
 static inline void
diff -Nru gstreamer-vaapi-0.5.10/tests/y4mreader.c gstreamer-vaapi-0.6.0/tests/y4mreader.c
--- gstreamer-vaapi-0.5.10/tests/y4mreader.c	1970-01-01 00:00:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/tests/y4mreader.c	2015-07-15 12:47:43.000000000 +0000
@@ -0,0 +1,261 @@
+/*
+ * y4mreader.c - Y4M parser
+ *
+ * Copyright (C) 2015 Intel Corporation
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1
+ * of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA
+ */
+
+#include "y4mreader.h"
+
+#include <stdio.h>
+
+/* format documentation:
+ * http://wiki.multimedia.cx/index.php?title=YUV4MPEG2 */
+
+static inline gboolean
+parse_int (const gchar * str, glong * out_value_ptr)
+{
+  gint saved_errno;
+  glong value;
+  gboolean ret;
+
+  if (!str)
+    return FALSE;
+  str += 1;
+  if (!str)
+    return FALSE;
+
+  saved_errno = errno;
+  errno = 0;
+  value = strtol (str, NULL, 0);
+  ret = (errno == 0);
+  errno = saved_errno;
+  *out_value_ptr = value;
+
+  return ret;
+}
+
+static gboolean
+parse_header (Y4MReader * file)
+{
+  gint i, j;
+  guint8 header[BUFSIZ];
+  gint8 b;
+  size_t s;
+  gchar *str;
+
+  memset (header, 0, BUFSIZ);
+  s = fread (header, 1, 9, file->fp);
+  if (s < 9)
+    return FALSE;
+
+  if (memcmp (header, "YUV4MPEG2", 9) != 0)
+    return FALSE;
+
+  for (i = 9; i < BUFSIZ - 1; i++) {
+    b = fgetc (file->fp);
+    if (b == EOF)
+      return FALSE;
+    if (b == 0xa)
+      break;
+    header[i] = b;
+  }
+
+  if (i == BUFSIZ - 1)
+    return FALSE;
+
+  j = 9;
+  while (j < i) {
+    if ((header[j] != 0x20) && (header[j - 1] == 0x20)) {
+      switch (header[j]) {
+        case 'W':
+          if (!parse_int ((gchar *) & header[j], (glong *) & file->width))
+            return FALSE;
+          break;
+        case 'H':
+          if (!parse_int ((gchar *) & header[j], (glong *) & file->height))
+            return FALSE;
+          break;
+        case 'C':
+          str = (char *) &header[j + 1];
+          if (strncmp (str, "420", 3) != 0) {
+            g_warning ("Unsupported chroma subsampling.");
+            return FALSE;       /* unsupported chroma subsampling */
+          }
+          break;
+        case 'I':
+          str = (char *) &header[j + 1];
+          if (*str != 'p' && *str != '?') {
+            g_warning ("Interlaced content are not supported.");
+            return FALSE;       /* interlaced is unsupported */
+          }
+          break;
+        case 'F':              /* frame rate ratio */
+        {
+          guint num, den;
+
+          if (!parse_int ((gchar *) & header[j], (glong *) & num))
+            return FALSE;
+          while ((header[j] != ':') && (j < i))
+            j++;
+          if (!parse_int ((gchar *) & header[j], (glong *) & den))
+            return FALSE;
+
+          if (num <= 0 || den <= 0) {
+            file->fps_n = 30;   /* default to 30 fps */
+            file->fps_d = 1;
+          } else {
+            file->fps_n = num;
+            file->fps_d = den;
+          }
+          break;
+        }
+        case 'A':              /* sample aspect ration */
+          break;
+        case 'X':              /* metadata */
+          break;
+        default:
+          break;
+      }
+    }
+    j++;
+  }
+
+  return TRUE;
+}
+
+Y4MReader *
+y4m_reader_open (const gchar * filename)
+{
+  Y4MReader *imagefile;
+
+  imagefile = g_slice_new0 (Y4MReader);
+
+  if (filename) {
+    imagefile->fp = fopen (filename, "r");
+    if (!imagefile->fp) {
+      g_warning ("open file %s error", filename);
+      goto bail;
+    }
+  } else {
+    imagefile->fp = stdin;
+  }
+
+  if (!parse_header (imagefile))
+    goto bail;
+
+  return imagefile;
+
+bail:
+  if (imagefile->fp && imagefile->fp != stdin)
+    fclose (imagefile->fp);
+
+  g_slice_free (Y4MReader, imagefile);
+  return NULL;
+}
+
+void
+y4m_reader_close (Y4MReader * file)
+{
+  g_return_if_fail (file);
+
+  if (file->fp && file->fp != stdin)
+    fclose (file->fp);
+
+  g_slice_free (Y4MReader, file);
+}
+
+static gboolean
+skip_frame_header (Y4MReader * file)
+{
+  gint i;
+  guint8 header[BUFSIZ];
+  gint8 b;
+  size_t s;
+
+  memset (header, 0, BUFSIZ);
+  s = fread (header, 1, 5, file->fp);
+  if (s < 5)
+    return FALSE;
+
+  if (memcmp (header, "FRAME", 5) != 0)
+    return FALSE;
+
+  for (i = 5; i < BUFSIZ - 1; i++) {
+    b = fgetc (file->fp);
+    if (b == EOF)
+      return FALSE;
+    if (b == 0xa)
+      break;
+    header[i] = b;
+  }
+
+  return (i < BUFSIZ - 1);
+}
+
+gboolean
+y4m_reader_load_image (Y4MReader * file, GstVaapiImage * image)
+{
+  guint8 *plane;
+  size_t s;
+  guint frame_size, stride, i;
+
+  g_return_val_if_fail (gst_vaapi_image_is_mapped (image), FALSE);
+  g_return_val_if_fail (file && file->fp, FALSE);
+
+  /* only valid for I420 */
+  frame_size = file->height * file->width * 3 / 2;
+  if (gst_vaapi_image_get_data_size (image) < frame_size)
+    return FALSE;
+  if (gst_vaapi_image_get_plane_count (image) != 3)
+    return FALSE;
+
+  if (!skip_frame_header (file))
+    return FALSE;
+
+  /* Y plane */
+  plane = gst_vaapi_image_get_plane (image, 0);
+  stride = gst_vaapi_image_get_pitch (image, 0);
+  for (i = 0; i < file->height; i++) {
+    s = fread (plane, 1, file->width, file->fp);
+    if (s != file->width)
+      return FALSE;
+    plane += stride;
+  }
+
+  /* U plane */
+  plane = gst_vaapi_image_get_plane (image, 1);
+  stride = gst_vaapi_image_get_pitch (image, 1);
+  for (i = 0; i < file->height / 2; i++) {
+    s = fread (plane, 1, file->width / 2, file->fp);
+    if (s != file->width / 2)
+      return FALSE;
+    plane += stride;
+  }
+
+  /* V plane */
+  plane = gst_vaapi_image_get_plane (image, 2);
+  stride = gst_vaapi_image_get_pitch (image, 2);
+  for (i = 0; i < file->height / 2; i++) {
+    s = fread (plane, 1, file->width / 2, file->fp);
+    if (s != file->width / 2)
+      return FALSE;
+    plane += stride;
+  }
+
+  return TRUE;
+}
diff -Nru gstreamer-vaapi-0.5.10/tests/y4mreader.h gstreamer-vaapi-0.6.0/tests/y4mreader.h
--- gstreamer-vaapi-0.5.10/tests/y4mreader.h	1970-01-01 00:00:00.000000000 +0000
+++ gstreamer-vaapi-0.6.0/tests/y4mreader.h	2015-07-15 12:47:43.000000000 +0000
@@ -0,0 +1,40 @@
+/*
+ * y4mreader.h - Y4M parser
+ *
+ * Copyright (C) 2015 Intel Corporation
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1
+ * of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA
+ */
+
+#include "gst/vaapi/sysdeps.h"
+#include <gst/vaapi/gstvaapiimage.h>
+
+typedef struct _Y4MReader Y4MReader;
+
+struct _Y4MReader
+{
+  FILE *fp;
+  guint width;
+  guint height;
+  gint fps_n;
+  gint fps_d;
+};
+
+Y4MReader *y4m_reader_open (const gchar * filename);
+
+void y4m_reader_close (Y4MReader * file);
+
+gboolean y4m_reader_load_image (Y4MReader * file, GstVaapiImage * image);