X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fplugins%2Flivevideo%2Flivevideo.C;h=d928b7e8ac2868e32e70b4b0f5bdb84cf6ae95fc;hp=ac69ba20659f0aa99dd8dca62585fc0a5cce3f3e;hb=0c48864cab7b37268025485c6a227f36b3420030;hpb=970931c2f2e2b877d3b5746cf92e0b7356e5c49f diff --git a/cinelerra-5.1/plugins/livevideo/livevideo.C b/cinelerra-5.1/plugins/livevideo/livevideo.C index ac69ba20..d928b7e8 100644 --- a/cinelerra-5.1/plugins/livevideo/livevideo.C +++ b/cinelerra-5.1/plugins/livevideo/livevideo.C @@ -31,7 +31,7 @@ #include "filexml.h" #include "guicast.h" #include "language.h" -#if HAVE_DV +#ifdef HAVE_LIBDV #include "libdv.h" #endif #include "libmjpeg.h" @@ -152,7 +152,7 @@ public: int prev_channel; int w, h; // Decompressors for different video drivers -#if HAVE_DV +#ifdef HAVE_LIBDV dv_t *dv; #endif mjpeg_t *mjpeg; @@ -354,7 +354,7 @@ LiveVideo::LiveVideo(PluginServer *server) w = xS(320); h = yS(640); prev_channel = 0; -#if HAVE_DV +#ifdef HAVE_LIBDV dv = 0; #endif mjpeg = 0; @@ -376,7 +376,7 @@ LiveVideo::~LiveVideo() delete channeldb; delete temp; -#if HAVE_DV +#ifdef HAVE_LIBDV if(dv) dv_delete(dv); #endif if(mjpeg) mjpeg_delete(mjpeg); @@ -507,7 +507,7 @@ int LiveVideo::process_buffer(VFrame *frame, { switch(session->vconfig_in->driver) { -#if HAVE_DV +#ifdef HAVE_LIBDV case CAPTURE_FIREWIRE: case CAPTURE_IEC61883: // Decompress a DV frame from the driver @@ -648,8 +648,3 @@ void LiveVideo::update_gui() } } } - - - - -