commit 261065cacab1b300da88d25f69c3a675f8c165ea Author: Gwenole Beauchesne Date: Tue Mar 2 12:30:03 2010 +0000 Drop libvaapi/vaapi.{cpp,h}. diff --git a/libbase/GnashVaapiImage.cpp b/libbase/GnashVaapiImage.cpp index 5d92855..69720ae 100644 --- a/libbase/GnashVaapiImage.cpp +++ b/libbase/GnashVaapiImage.cpp @@ -21,7 +21,7 @@ #include "log.h" #include "GnashVaapiImage.h" -#include "vaapi.h" +#include "VaapiSurface.h" namespace gnash { diff --git a/libvaapi/Makefile.am b/libvaapi/Makefile.am index 14e964c..1227f8c 100644 --- a/libvaapi/Makefile.am +++ b/libvaapi/Makefile.am @@ -36,7 +36,6 @@ libgnashvaapi_la_LIBADD = \ $(NULL) libgnashvaapi_la_SOURCES = \ - vaapi.cpp \ vaapi_utils.cpp \ VaapiContext.cpp \ VaapiDisplay.cpp \ @@ -49,7 +48,6 @@ libgnashvaapi_la_SOURCES = \ $(NULL) noinst_HEADERS = \ - vaapi.h \ vaapi_common.h \ vaapi_utils.h \ VaapiContext.h \ diff --git a/libvaapi/vaapi.cpp b/libvaapi/vaapi.cpp deleted file mode 100644 index 1c1f9e2..0000000 --- a/libvaapi/vaapi.cpp +++ /dev/null @@ -1,32 +0,0 @@ -// vaapi.c: VA API wrapper -// -// Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc. -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation; either version 3 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 General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -// - -#include "vaapi.h" -#include -#include - -namespace gnash { - -} // gnash namespace - - -// local Variables: -// mode: C++ -// indent-tabs-mode: t -// End: diff --git a/libvaapi/vaapi.h b/libvaapi/vaapi.h deleted file mode 100644 index 68ac2c8..0000000 --- a/libvaapi/vaapi.h +++ /dev/null @@ -1,32 +0,0 @@ -// vaapi.h: VA API wrapper -// -// Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc. -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation; either version 3 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 General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -// - -#ifndef GNASH_VAAPI_H -#define GNASH_VAAPI_H - -#include "vaapi_common.h" -#include "vaapi_utils.h" -#include "VaapiGlobalContext.h" -#include "VaapiContext.h" -#include "VaapiSurface.h" -#include "VaapiSurfaceProxy.h" -#include "VaapiImage.h" -#include "VaapiException.h" - -#endif /* GNASH_VAAPI_H */