projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
more ffmpeg cmodel changes, listbox fix
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
videodevice.h
diff --git
a/cinelerra-5.1/cinelerra/videodevice.h
b/cinelerra-5.1/cinelerra/videodevice.h
index 57264d3d50e00cfc730a930cd2cea386eb899b4c..f9334aff576061b886b0ff1ddf835cbc068e0247 100644
(file)
--- a/
cinelerra-5.1/cinelerra/videodevice.h
+++ b/
cinelerra-5.1/cinelerra/videodevice.h
@@
-42,9
+42,6
@@
#include "thread.h"
#include "picture.inc"
#include "vdevicebase.inc"
#include "thread.h"
#include "picture.inc"
#include "vdevicebase.inc"
-#include "vdevicebuz.inc"
-#include "vdevicelml.inc"
-#include "vdevicev4l.inc"
#include "vdevicex11.inc"
#include "videoconfig.inc"
#include "videowindow.inc"
#include "vdevicex11.inc"
#include "videoconfig.inc"
#include "videowindow.inc"
@@
-216,7
+213,7
@@
public:
// Flag when output is interrupted
int interrupt;
// Compression format in use by the output device
// Flag when output is interrupted
int interrupt;
// Compression format in use by the output device
- int output_format;
+ int output_format;
int is_playing_back;
// Audio device to share data with
AudioDevice *adevice;
int is_playing_back;
// Audio device to share data with
AudioDevice *adevice;
@@
-284,7
+281,7
@@
public:
// Change the capture size when ready
// Change the capture size when ready
- int update_translation();
+ int update_translation();
VDeviceBase *input_base;
VDeviceBase *output_base;
VDeviceBase *input_base;
VDeviceBase *output_base;