summaryrefslogtreecommitdiff
path: root/src/lib/ffmpeg.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-06-30 11:09:34 +0100
committerCarl Hetherington <cth@carlh.net>2015-06-30 11:09:34 +0100
commit937240f9e360e434b36c418656ae6fe8cc6afea9 (patch)
treeb2af5fe0116bcbbdc7f3d1959662970ba1cef560 /src/lib/ffmpeg.h
parent78bc6f9286864052b304a1871739479c16e393dd (diff)
Write FFmpeg log output to our log file.
Diffstat (limited to 'src/lib/ffmpeg.h')
-rw-r--r--src/lib/ffmpeg.h11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/lib/ffmpeg.h b/src/lib/ffmpeg.h
index 4299edc28..9e9d5125a 100644
--- a/src/lib/ffmpeg.h
+++ b/src/lib/ffmpeg.h
@@ -26,19 +26,13 @@ extern "C" {
#include "file_group.h"
#include <boost/shared_ptr.hpp>
#include <boost/thread/mutex.hpp>
-#include <vector>
-struct AVFilterGraph;
-struct AVCodecContext;
-struct AVFilterContext;
struct AVFormatContext;
struct AVFrame;
-struct AVBufferContext;
-struct AVCodec;
-struct AVStream;
struct AVIOContext;
class FFmpegContent;
+class Log;
class FFmpeg
{
@@ -80,6 +74,9 @@ protected:
private:
void setup_general ();
void setup_decoders ();
+
+ static void ffmpeg_log_callback (void* ptr, int level, const char* fmt, va_list vl);
+ static boost::weak_ptr<Log> _ffmpeg_log;
};
#endif