[Gnash-commit] /srv/bzr/gnash/trunk r12361: fix ffmpeg vaapi

[Rob Savoye]

------------------------------------------------------------
revno: 12361
committer: Rob Savoye <address@hidden>
branch nick: trunk
timestamp: Fri 2010-08-06 11:54:50 -0600
message:
  fix ffmpeg vaapi
modified:
  configure.ac
  macros/ffmpeg.m4

=== modified file 'configure.ac'
--- a/configure.ac      2010-08-05 17:09:35 +0000
+++ b/configure.ac      2010-08-06 17:54:50 +0000
@@ -770,6 +770,8 @@
 dnl --------------------------------------------------------
 dnl  Media handler selection
 dnl --------------------------------------------------------
+build_media_gst=yes
+build_media_ffmpeg=no
 AC_ARG_ENABLE(media,
   AC_HELP_STRING([--enable-media=handler],
     [Enable media handling support using the specified handler: gst, ffmpeg or 
none (no sound) [[gst]] ]),
@@ -1144,12 +1146,6 @@
   done
 )
 
-dnl Until the hwaccel patches in ffmpeg wind up in the ffmpeg-plugin,
-dnl restrict using HW Accel to using ffmpeg directly.
-if test x"${build_vaapi}" = x"yes" -a "(" x"${build_media_ffmpeg}" != x"yes" 
-o x"${have_ffmpeg_vaapi}" != x"yes" ")"; then
-  AC_MSG_ERROR(["Hardware acceleration currently not supported unless using 
ffmpeg."])
-fi
-
 if test x"${have_ffmpeg_vaapi}" = x"yes" -a x"${build_vaapi}" = x"yes"; then
   use_libva=no
   use_libva_x11=no
@@ -1202,6 +1198,13 @@
   nhwaccel=1
 fi
 
+dnl Until the hwaccel patches in ffmpeg wind up in the ffmpeg-plugin,
+dnl restrict using HW Accel to using ffmpeg directly.
+dnl test xyes = xyes -a ( x != xyes -o x != xyes )
+if test x"${build_vaapi}" = x"yes" -a x"${have_ffmpeg}" != x"yes"; then
+  AC_MSG_ERROR(["Hardware acceleration currently not supported unless using 
ffmpeg."])
+fi
+
 AM_CONDITIONAL(HAVE_VAAPI, test x"${found_libva_incl}" = xyes)
 AM_CONDITIONAL(HAVE_VAAPI_GLX, test x"${found_libva_glx_incl}" = xyes)
 AM_CONDITIONAL(HAVE_VAAPI_X11, test x"${found_libva_x11_incl}" = xyes)

=== modified file 'macros/ffmpeg.m4'
--- a/macros/ffmpeg.m4  2010-07-22 20:21:00 +0000
+++ b/macros/ffmpeg.m4  2010-08-06 17:54:50 +0000
@@ -101,8 +101,10 @@
   fi
 
   if test x"${ac_cv_path_ffmpeg_incl}" = x ; then
+    have_ffmpeg=no
     AC_MSG_RESULT(none found)
   else
+    have_ffmpeg=yes
     AC_MSG_RESULT(${ac_cv_path_ffmpeg_incl})
   fi