projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add 'v' shortcut in resource wdw, sams proxy icons, update shortcuts doc
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
filempeg.h
diff --git
a/cinelerra-5.1/cinelerra/filempeg.h
b/cinelerra-5.1/cinelerra/filempeg.h
index 0c870bd10a664cef3d6bf7b2e90993d2df1abb39..34e779cec849235b9ba84f6059efd13fc93861ff 100644
(file)
--- a/
cinelerra-5.1/cinelerra/filempeg.h
+++ b/
cinelerra-5.1/cinelerra/filempeg.h
@@
-21,9
+21,11
@@
#ifndef FILEMPEG_H
#define FILEMPEG_H
#ifndef FILEMPEG_H
#define FILEMPEG_H
+#ifdef HAVE_LIBZMPEG
#include "bitspopup.inc"
#include "condition.inc"
#include "bitspopup.inc"
#include "condition.inc"
+#include "edl.inc"
#include "file.inc"
#include "filebase.h"
#include "indexfile.inc"
#include "file.inc"
#include "filebase.h"
#include "indexfile.inc"
@@
-63,10
+65,8
@@
public:
friend class FileMPEGVideo;
static void get_parameters(BC_WindowBase *parent_window,
friend class FileMPEGVideo;
static void get_parameters(BC_WindowBase *parent_window,
- Asset *asset,
- BC_WindowBase* &format_window,
- int audio_options,
- int video_options);
+ Asset *asset, BC_WindowBase* &format_window,
+ int audio_options, int video_options, EDL *edl);
static int check_sig(Asset *asset);
static int check_sig(Asset *asset);
@@
-110,6
+110,7
@@
public:
static const char *zmpeg3_cmdl_name(int cmdl);
// This file can copy frames directly from the asset
int can_copy_from(Asset *asset, int64_t position);
static const char *zmpeg3_cmdl_name(int cmdl);
// This file can copy frames directly from the asset
int can_copy_from(Asset *asset, int64_t position);
+ int can_scale_input() { return 1; }
private:
void to_streamchannel(int channel, int &stream_out, int &channel_out);
private:
void to_streamchannel(int channel, int &stream_out, int &channel_out);
@@
-361,5
+362,5
@@
public:
ArrayList<BC_SubWindow*> tools;
};
ArrayList<BC_SubWindow*> tools;
};
-
+#endif
#endif
#endif