[Pkg-gstreamer-commits] [gstreamer-vaapi] 20/176: libs: always use built-in videoutils for GStreamer 0.10.

Vincent Cheng vcheng at moszumanska.debian.org
Tue Jun 3 08:09:24 UTC 2014


This is an automated email from the git hooks/post-receive script.

vcheng pushed a commit to branch upstream
in repository gstreamer-vaapi.

commit f82deaf10c147e1e3a7b8ee5d17e423b3b824663
Author: Gwenole Beauchesne <gwenole.beauchesne at intel.com>
Date:   Wed Nov 27 15:56:51 2013 +0100

    libs: always use built-in videoutils for GStreamer 0.10.
    
    GStreamer 0.10.36 is the latest and ultimate version to be released
    from the GStreamer 0.10 branch. i.e. no further releases are to be
    made. So, we can safely enable the built-in videoutils replacement
    now that they are in sync with the 0.10 branch.
---
 configure.ac                   | 26 --------------------------
 gst-libs/gst/video/Makefile.am |  2 +-
 2 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/configure.ac b/configure.ac
index 498fda7..39ac913 100644
--- a/configure.ac
+++ b/configure.ac
@@ -324,32 +324,6 @@ if test "$ac_cv_have_gst_video_overlay_hwcaps" = "yes"; then
         [Defined to 1 if GstVideoOverlayComposition API supports HW hints.])
 fi
 
-dnl ... GstVideoDecoder (gstreamer-video)
-AC_CACHE_CHECK([for GstVideoDecoder],
-    ac_cv_have_gst_video_decoder, [
-    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/gstvideodecoder.h>]],
-            [[GstVideoCodecFrame *f;
-              GstVideoDecoder vdec;
-              f = g_slice_new0(GstVideoCodecFrame);
-              f->ref_count = 1;
-              gst_video_decoder_have_frame(&vdec);
-              gst_video_decoder_finish_frame(&vdec, f);
-              gst_video_codec_frame_unref(f);]])],
-        [ac_cv_have_gst_video_decoder="yes"],
-        [ac_cv_have_gst_video_decoder="no"]
-    )
-    CPPFLAGS="$saved_CPPFLAGS"
-    LIBS="$saved_LIBS"
-])
-AM_CONDITIONAL([USE_LOCAL_GST_VIDEO_DECODER],
-    [test "$ac_cv_have_gst_video_decoder" != "yes"])
-
 dnl GStreamer -bad plugins (deprecated in GStreamer v1.2)
 if test "$USE_GST_API_1_2p" != "yes"; then
 PKG_CHECK_MODULES([GST_BASEVIDEO],
diff --git a/gst-libs/gst/video/Makefile.am b/gst-libs/gst/video/Makefile.am
index a790e87..3b6ceb4 100644
--- a/gst-libs/gst/video/Makefile.am
+++ b/gst-libs/gst/video/Makefile.am
@@ -21,7 +21,7 @@ libgstvaapi_videoutils_libs =			\
 gen_source_c =
 gen_source_h =
 
-if USE_LOCAL_GST_VIDEO_DECODER
+if USE_GST_API_0_10
 gen_source_c += gstvideodecoder.c gstvideoutils.c video.c
 gen_source_h += gstvideodecoder.h gstvideoutils.h video.h
 endif

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gstreamer/gstreamer-vaapi.git



More information about the Pkg-gstreamer-commits mailing list