Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Updates return status of some methods.

  • Loading branch information...
commit 8625824b1cd106c1604402f830da713fa7879589 1 parent ffb85ed
@johmathe authored
View
3  CMakeLists.txt
@@ -1,5 +1,6 @@
# CMake integration by Christian Frisson
-
+ SET (CMAKE_C_COMPILER "/usr/bin/clang")
+SET (CMAKE_CXX_COMPILER "/usr/bin/clang++")
cmake_minimum_required(VERSION 2.8)
PROJECT(shotdetect)
SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
View
1  src/film.cc
@@ -510,6 +510,7 @@ int film::process ()
// Close the video file
avformat_close_input (&pFormatCtx);
+ return 0;
}
void film::init_xml (string filename)
View
2  src/image.cc
@@ -60,7 +60,7 @@ int image::create_img_dir ()
}
free (buf);
-
+ return 0;
}
int image::SaveFrame (AVFrame * pFrame, int frame_number)
View
1  src/ui/process_video_thread.cc
@@ -34,6 +34,7 @@ wxProcessVideoThread::Entry ()
wxCommandEvent event (wxEVT_COMMAND_MENU_SELECTED, ID_CMD_LAUNCHTHREAD);
wxPostEvent (dialogParent, event);
+ return NULL;
}
wxProcessVideoThread::wxProcessVideoThread (wxThreadKind kind = wxTHREAD_JOINABLE):wxThread (kind)
View
2  src/ui/process_video_thread.h
@@ -31,7 +31,7 @@ class wxProcessVideoThread:public wxThread
public:
wxWindow * dialogParent;
- void *Create (wxWindow * d, list < film > *films) {
+ void Create (wxWindow * d, list < film > *films) {
this->films = films;
dialogParent = d;
wxThread::Create ();

1 comment on commit 8625824

@johmathe
Owner
Please sign in to comment.
Something went wrong with that request. Please try again.