X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Ffilempeg.h;h=a92f29b7f953b00b17bbd164fbed76d23175a389;hb=fbb844da24c44cce0509451116df248c861ef8f7;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..a92f29b7 100644 --- a/cinelerra-5.1/cinelerra/filempeg.h +++ b/cinelerra-5.1/cinelerra/filempeg.h @@ -24,6 +24,7 @@ #include "bitspopup.inc" #include "condition.inc" +#include "edl.inc" #include "file.inc" #include "filebase.h" #include "indexfile.inc" @@ -63,10 +64,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 +109,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);