summaryrefslogtreecommitdiff
path: root/noncore/multimedia
Unidiff
Diffstat (limited to 'noncore/multimedia') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/camera/cmd/capture.cpp3
-rw-r--r--noncore/multimedia/camera/gui/mainwindow.cpp2
-rw-r--r--noncore/multimedia/camera/lib/avi.c1
3 files changed, 5 insertions, 1 deletions
diff --git a/noncore/multimedia/camera/cmd/capture.cpp b/noncore/multimedia/camera/cmd/capture.cpp
index 688622b..6b8c63c 100644
--- a/noncore/multimedia/camera/cmd/capture.cpp
+++ b/noncore/multimedia/camera/cmd/capture.cpp
@@ -188,4 +188,7 @@ int main( int argc, char** argv )
188 c->checkSettings(); 188 c->checkSettings();
189 c->capture(); 189 c->capture();
190
191 delete c;
192 delete a;
190 return 0; 193 return 0;
191} 194}
diff --git a/noncore/multimedia/camera/gui/mainwindow.cpp b/noncore/multimedia/camera/gui/mainwindow.cpp
index 7f2a9bd..bde448d 100644
--- a/noncore/multimedia/camera/gui/mainwindow.cpp
+++ b/noncore/multimedia/camera/gui/mainwindow.cpp
@@ -547,5 +547,5 @@ void CameraMainWindow::stopVideoCapture()
547 updateCaption(); 547 updateCaption();
548 ::close( _capturefd ); 548 ::close( _capturefd );
549 _framerate = 1000.0 / (_time.elapsed()/_videopics); 549 _framerate = static_cast<int>( 1000.0 / (_time.elapsed()/_videopics) );
550 550
551 QString name; 551 QString name;
diff --git a/noncore/multimedia/camera/lib/avi.c b/noncore/multimedia/camera/lib/avi.c
index 77aba33..d99c016 100644
--- a/noncore/multimedia/camera/lib/avi.c
+++ b/noncore/multimedia/camera/lib/avi.c
@@ -19,4 +19,5 @@
19#include <string.h> 19#include <string.h>
20#include <stdio.h> 20#include <stdio.h>
21#include <stdlib.h>
21 22
22int nframes; 23int nframes;