X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fvdevice1394.C;h=839e64eb5dca0fbd352208b11d7b647555d983c9;hp=818e719bb4633a6ce511d6ed5187e89242a9eaa4;hb=502b6f3b6fd04f6b01c6d70dcb81aa304dd0db1c;hpb=30bdb85eb33a8ee7ba675038a86c6be59c43d7bd diff --git a/cinelerra-5.1/cinelerra/vdevice1394.C b/cinelerra-5.1/cinelerra/vdevice1394.C index 818e719b..839e64eb 100644 --- a/cinelerra-5.1/cinelerra/vdevice1394.C +++ b/cinelerra-5.1/cinelerra/vdevice1394.C @@ -19,6 +19,8 @@ * */ +#ifdef HAVE_FIREWIRE + #include "assets.h" #include "audio1394.h" #include "audioconfig.h" @@ -232,7 +234,8 @@ int VDevice1394::read_buffer(VFrame *frame) void VDevice1394::new_output_buffer(VFrame **output, - int colormodel) + int colormodel, + EDL *edl) { if(user_frame) { @@ -251,12 +254,7 @@ void VDevice1394::new_output_buffer(VFrame **output, user_frame = new VFrame; break; default: - user_frame = new VFrame(0, - -1, - device->out_w, - device->out_h, - colormodel, - -1); + user_frame = new VFrame(device->out_w, device->out_h, colormodel); break; } } @@ -280,3 +278,5 @@ int VDevice1394::can_copy_from(Asset *asset, int output_w, int output_h) { return 0; } + +#endif