X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Ffilempeg.h;h=34e779cec849235b9ba84f6059efd13fc93861ff;hb=a2d9ab21fbb8e29310d9cd0be439522d05d0d0ba;hp=9b8db9dd15ddad4f045a1a167f0926a649425d3a;hpb=9d832a1fff11b11aaa1108c460690ed05e2bdc05;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/cinelerra/filempeg.h b/cinelerra-5.1/cinelerra/filempeg.h index 9b8db9dd..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); @@ -362,5 +362,5 @@ public: ArrayList tools; }; - +#endif #endif