bsd lang segv fix, enable bsd lv2, lv2 gui enable fix, proxy/ffmpeg toggle resize...

[goodguy/history.git] / cinelerra-5.1 / cinelerra / vdevice1394.C

diff --git a/cinelerra-5.1/cinelerra/vdevice1394.C b/cinelerra-5.1/cinelerra/vdevice1394.C
index 818e719bb4633a6ce511d6ed5187e89242a9eaa4..839e64eb5dca0fbd352208b11d7b647555d983c9 100644 (file)
--- 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