X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;ds=sidebyside;f=cinelerra-5.1%2Fcinelerra%2Ffilempeg.h;h=34e779cec849235b9ba84f6059efd13fc93861ff;hb=2ce5f3585284c78107b6eab879ee4e94686ff41a;hp=0c870bd10a664cef3d6bf7b2e90993d2df1abb39;hpb=21c2e6b36d6a96c2f662a89459d607b5a387f4eb;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/cinelerra/filempeg.h b/cinelerra-5.1/cinelerra/filempeg.h index 0c870bd1..34e779ce 100644 --- a/cinelerra-5.1/cinelerra/filempeg.h +++ b/cinelerra-5.1/cinelerra/filempeg.h @@ -21,9 +21,11 @@ #ifndef FILEMPEG_H #define FILEMPEG_H +#ifdef HAVE_LIBZMPEG #include "bitspopup.inc" #include "condition.inc" +#include "edl.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, - 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); @@ -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); + int can_scale_input() { return 1; } private: void to_streamchannel(int channel, int &stream_out, int &channel_out); @@ -361,5 +362,5 @@ public: ArrayList tools; }; - +#endif #endif