Fix bugs in previous commit that caused FTBFS in synfig and ETL FTBFS with older...

[synfig.git] / synfig-core / tags / stable / src / modules / mod_libavcodec / mptr.cpp

diff --git a/synfig-core/tags/stable/src/modules/mod_libavcodec/mptr.cpp b/synfig-core/tags/stable/src/modules/mod_libavcodec/mptr.cpp
index a136369..667968b 100644 (file)
--- a/synfig-core/tags/stable/src/modules/mod_libavcodec/mptr.cpp
+++ b/synfig-core/tags/stable/src/modules/mod_libavcodec/mptr.cpp
@@ -1,27 +1,28 @@
-/* === S I N F G =========================================================== */
+/* === S Y N F I G ========================================================= */
 /*!    \file mptr.cpp
 **     \brief writeme
 **
-**     $Id: mptr.cpp,v 1.1.1.1 2005/01/04 01:23:11 darco Exp $
+**     $Id$
 **
 **     \legal
-**     Copyright (c) 2002 Robert B. Quattlebaum Jr.
+**     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
 **
-**     This software and associated documentation
-**     are CONFIDENTIAL and PROPRIETARY property of
-**     the above-mentioned copyright holder.
+**     This package 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 2 of
+**     the License, or (at your option) any later version.
 **
-**     You may not copy, print, publish, or in any
-**     other way distribute this software without
-**     a prior written agreement with
-**     the copyright holder.
+**     This package 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.
 **     \endlegal
 */
 /* ========================================================================= */
 
 /* === H E A D E R S ======================================================= */
 
-#define SINFG_NO_ANGLE
+#define SYNFIG_NO_ANGLE
 
 #ifdef USING_PCH
 #      include "pch.h"
@@ -31,8 +32,8 @@
 #endif
 
 #include "mptr.h"
-#include <sinfg/general.h>
-#include <sinfg/surface.h>
+#include <synfig/general.h>
+#include <synfig/surface.h>
 
 #include <algorithm>
 #include <functional>
@@ -40,17 +41,17 @@
 
 /* === U S I N G =========================================================== */
 
-using namespace sinfg;
+using namespace synfig;
 using namespace std;
 using namespace etl;
 
 /* === G L O B A L S ======================================================= */
 
-SINFG_IMPORTER_INIT(Importer_LibAVCodec);
-SINFG_IMPORTER_SET_NAME(Importer_LibAVCodec,"Importer_LibAVCodec");
-SINFG_IMPORTER_SET_EXT(Importer_LibAVCodec,"avi");
-SINFG_IMPORTER_SET_VERSION(Importer_LibAVCodec,"0.1");
-SINFG_IMPORTER_SET_CVS_ID(Importer_LibAVCodec,"$Id: mptr.cpp,v 1.1.1.1 2005/01/04 01:23:11 darco Exp $");
+SYNFIG_IMPORTER_INIT(Importer_LibAVCodec);
+SYNFIG_IMPORTER_SET_NAME(Importer_LibAVCodec,"libav");
+SYNFIG_IMPORTER_SET_EXT(Importer_LibAVCodec,"avi");
+SYNFIG_IMPORTER_SET_VERSION(Importer_LibAVCodec,"0.1");
+SYNFIG_IMPORTER_SET_CVS_ID(Importer_LibAVCodec,"$Id$");
 
 /* === M E T H O D S ======================================================= */
 
@@ -65,7 +66,7 @@ Importer_LibAVCodec::~Importer_LibAVCodec()
 }
 
 bool
-Importer_LibAVCodec::get_frame(sinfg::Surface &surface,Time, sinfg::ProgressCallback *cb)
+Importer_LibAVCodec::get_frame(synfig::Surface &/*surface*/,Time, synfig::ProgressCallback */*cb*/)
 {
        return false;
 }