X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fplugins%2Flivevideo%2Flivevideo.C;h=888164a1a4ae52e6e519c4022a6f064bd65236bd;hb=HEAD;hp=c30034ab64001fc8c81e1a043aff88e00ad4730e;hpb=9d54c23d957ea350c5ffd756ac2c1c221c94637b;p=goodguy%2Fcinelerra.git diff --git a/cinelerra-5.1/plugins/livevideo/livevideo.C b/cinelerra-5.1/plugins/livevideo/livevideo.C index c30034ab..888164a1 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_LIBDV +#ifdef HAVE_DV #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_DV 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_DV dv = 0; #endif mjpeg = 0; @@ -376,7 +376,7 @@ LiveVideo::~LiveVideo() delete channeldb; delete temp; -#if HAVE_DV +#ifdef HAVE_DV 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_DV case CAPTURE_FIREWIRE: case CAPTURE_IEC61883: // Decompress a DV frame from the driver @@ -648,8 +648,3 @@ void LiveVideo::update_gui() } } } - - - - -