olaf neophyte and de.po updates, valgrind tweaks, delete green lady, inkscape dpi=96

[goodguy/history.git] / cinelerra-5.1 / cinelerra / vdevicempeg.h

diff --git a/cinelerra-5.1/cinelerra/vdevicempeg.h b/cinelerra-5.1/cinelerra/vdevicempeg.h
index 95826e465cba3322ae61b3775289d9f53964caa0..64b80915c498f6cf7bbbbd381a3ee269562bb337 100644 (file)
--- a/cinelerra-5.1/cinelerra/vdevicempeg.h
+++ b/cinelerra-5.1/cinelerra/vdevicempeg.h
@@ -2,32 +2,33 @@
 /*
  * CINELERRA
  * Copyright (C) 2008 Adam Williams <broadcast at earthling dot net>
- * 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- * 
+ *
  */
 
 #ifndef VDEVICEMPEG_H
 #define VDEVICEMPEG_H
 
-#ifdef HAVE_VIDEO4LINUX2
 #include "condition.inc"
 #include "mutex.inc"
 #include "vdevicebase.h"
-#include <linux/types.h>
+//#include <linux/types.h>
+#ifdef HAVE_VIDEO4LINUX2
 #include <linux/videodev2.h>
+#endif
 #include "devicempeginput.inc"
 #include "videodevice.inc"
 #include "vdevicempeg.inc"
@@ -72,6 +73,5 @@ public:
 };
 
 #endif
-#endif