projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add ffmpeg image2 formats, fix segv when quit with render menu active
[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..c1d0206e952f2bb950b266843bd94eccfa860f87 100644
(file)
--- a/
cinelerra-5.1/cinelerra/vdevicempeg.h
+++ b/
cinelerra-5.1/cinelerra/vdevicempeg.h
@@
-22,12
+22,13
@@
#ifndef VDEVICEMPEG_H
#define VDEVICEMPEG_H
#ifndef VDEVICEMPEG_H
#define VDEVICEMPEG_H
-#ifdef HAVE_VIDEO4LINUX2
#include "condition.inc"
#include "mutex.inc"
#include "vdevicebase.h"
#include "condition.inc"
#include "mutex.inc"
#include "vdevicebase.h"
-#include <linux/types.h>
+//#include <linux/types.h>
+#ifdef HAVE_VIDEO4LINUX2
#include <linux/videodev2.h>
#include <linux/videodev2.h>
+#endif
#include "devicempeginput.inc"
#include "videodevice.inc"
#include "vdevicempeg.inc"
#include "devicempeginput.inc"
#include "videodevice.inc"
#include "vdevicempeg.inc"
@@
-72,6
+73,5
@@
public:
};
#endif
};
#endif
-#endif