Remove .gitignore do nothing is ignored.

[synfig.git] / synfig-core / trunk / src / modules / mod_libavcodec / mptr.h

diff --git a/synfig-core/trunk/src/modules/mod_libavcodec/mptr.h b/synfig-core/trunk/src/modules/mod_libavcodec/mptr.h
index 0c61779..f7cb41f 100644 (file)
--- a/synfig-core/trunk/src/modules/mod_libavcodec/mptr.h
+++ b/synfig-core/trunk/src/modules/mod_libavcodec/mptr.h
@@ -1,34 +1,35 @@
-/* === S I N F G =========================================================== */
+/* === S Y N F I G ========================================================= */
 /*!    \file mptr.h
 **     \brief writeme
 **
-**     $Id: mptr.h,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
 */
 /* ========================================================================= */
 
 /* === S T A R T =========================================================== */
 
-#ifndef __SINFG_MPTR_H
-#define __SINFG_MPTR_H
+#ifndef __SYNFIG_MPTR_H
+#define __SYNFIG_MPTR_H
 
 /* === H E A D E R S ======================================================= */
 
-#include <sinfg/importer.h>
-#include <sinfg/string.h>
-#include <sinfg/time.h>
+#include <synfig/importer.h>
+#include <synfig/string.h>
+#include <synfig/time.h>
 #include <cstdio>
 
 /* === M A C R O S ========================================================= */
@@ -37,18 +38,18 @@
 
 /* === C L A S S E S & S T R U C T S ======================================= */
 
-class Importer_LibAVCodec : public sinfg::Importer
+class Importer_LibAVCodec : public synfig::Importer
 {
-SINFG_IMPORTER_MODULE_EXT
+SYNFIG_IMPORTER_MODULE_EXT
 
 private:
-       sinfg::String filename;
+       synfig::String filename;
 
 public:
        Importer_LibAVCodec(const char *filename);
        ~Importer_LibAVCodec();
 
-       virtual bool get_frame(sinfg::Surface &,sinfg::Time, sinfg::ProgressCallback *);
+       virtual bool get_frame(synfig::Surface &surface,synfig::Time time, synfig::ProgressCallback *callback);
 };
 
 /* === E N D =============================================================== */