summaryrefslogtreecommitdiff
path: root/rotord/src/libavwrapper.h
diff options
context:
space:
mode:
authorComment <tim@gray.(none)>2013-11-05 22:33:22 +0000
committerComment <tim@gray.(none)>2013-11-05 22:33:22 +0000
commit18a77356a424511e7ae1865d1554d20b4b5c51fb (patch)
tree15209fc88f1b8fd4fe2ced01ac804772c8f0a43b /rotord/src/libavwrapper.h
parent9462492cae4d94157538f353d67f2f6daaa45259 (diff)
clean up compiler warnings
Diffstat (limited to 'rotord/src/libavwrapper.h')
-rw-r--r--rotord/src/libavwrapper.h11
1 files changed, 5 insertions, 6 deletions
diff --git a/rotord/src/libavwrapper.h b/rotord/src/libavwrapper.h
index 0de9e74..7822323 100644
--- a/rotord/src/libavwrapper.h
+++ b/rotord/src/libavwrapper.h
@@ -1,7 +1,6 @@
#ifndef libavwrapper_H
#define libavwrapper_H
-
#ifndef UINT64_C
#define UINT64_C(c) (c ## ULL)
#endif
@@ -11,6 +10,8 @@
#include "Poco/StringTokenizer.h"
#include "Poco/File.h"
+extern Poco::Mutex mutex; //application wide mutex
+
extern "C" {
#include <libavcodec/avcodec.h>
#include <libavformat/avformat.h>
@@ -30,10 +31,8 @@ extern "C" {
namespace libav {
- static bool b_is_one_time_inited=false;
// Some libavcodec calls are not reentrant
void maybeInitFFMpegLib();
- static int sws_flags = SWS_BICUBIC;
class video_decoder
{
@@ -88,8 +87,8 @@ namespace libav {
}
FFMS_VideoSource *source;
- FFMS_VideoProperties *props;
- FFMS_Frame *frame;
+ const FFMS_VideoProperties *props;
+ const FFMS_Frame *frame;
FFMS_ErrorInfo err;
char errmsg[1024];
int pixfmts[2];
@@ -155,7 +154,7 @@ namespace libav {
}
FFMS_AudioSource *source;
- FFMS_AudioProperties *props;
+ const FFMS_AudioProperties *props;
FFMS_Frame *frame;
FFMS_ErrorInfo err;
char errmsg[1024];