projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix g++ 4.3 issues; add missing <cstring> includes, remove storage class on explicit...
[synfig.git]
/
synfig-core
/
trunk
/
src
/
modules
/
mod_ffmpeg
/
mptr_ffmpeg.h
diff --git
a/synfig-core/trunk/src/modules/mod_ffmpeg/mptr_ffmpeg.h
b/synfig-core/trunk/src/modules/mod_ffmpeg/mptr_ffmpeg.h
index
7517340
..
9e421c9
100644
(file)
--- a/
synfig-core/trunk/src/modules/mod_ffmpeg/mptr_ffmpeg.h
+++ b/
synfig-core/trunk/src/modules/mod_ffmpeg/mptr_ffmpeg.h
@@
-2,6
+2,8
@@
/*! \file mptr_ffmpeg.h
** \brief Template Header
**
/*! \file mptr_ffmpeg.h
** \brief Template Header
**
+** $Id$
+**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
**
@@
-28,6
+30,7
@@
/* === H E A D E R S ======================================================= */
#include <synfig/importer.h>
/* === H E A D E R S ======================================================= */
#include <synfig/importer.h>
+#include <sys/types.h>
#include <stdio.h>
#include "string.h"
#ifdef HAVE_TERMIOS_H
#include <stdio.h>
#include "string.h"
#ifdef HAVE_TERMIOS_H
@@
-47,6
+50,7
@@
class ffmpeg_mptr : public synfig::Importer
SYNFIG_IMPORTER_MODULE_EXT
public:
private:
SYNFIG_IMPORTER_MODULE_EXT
public:
private:
+ pid_t pid;
synfig::String filename;
FILE *file;
int cur_frame;
synfig::String filename;
FILE *file;
int cur_frame;
@@
-64,7
+68,7
@@
public:
~ffmpeg_mptr();
~ffmpeg_mptr();
- virtual bool get_frame(synfig::Surface &
,synfig::Time, synfig::ProgressCallback *
);
+ virtual bool get_frame(synfig::Surface &
surface,synfig::Time time, synfig::ProgressCallback *callback
);
};
/* === E N D =============================================================== */
};
/* === E N D =============================================================== */