summaryrefslogtreecommitdiffstats
path: root/src/jogl/native/libav/ffmpeg_tool.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/jogl/native/libav/ffmpeg_tool.h')
-rw-r--r--src/jogl/native/libav/ffmpeg_tool.h12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/jogl/native/libav/ffmpeg_tool.h b/src/jogl/native/libav/ffmpeg_tool.h
index a44bbb39a..d62cff60f 100644
--- a/src/jogl/native/libav/ffmpeg_tool.h
+++ b/src/jogl/native/libav/ffmpeg_tool.h
@@ -29,6 +29,7 @@
#ifndef _FFMPEG_TOOL_H
#define _FFMPEG_TOOL_H
+/***
#ifdef _WIN32
#include <windows.h>
// __declspec(dllimport) void __stdcall Sleep(unsigned long dwMilliseconds);
@@ -41,13 +42,15 @@
#include <gluegen_stddef.h>
#include <gluegen_stdint.h>
-#include <libavcodec/avcodec.h>
-#include <libavformat/avformat.h>
-#include <libavutil/avutil.h>
+#include "libavcodec/avcodec.h"
+#include "libavformat/avformat.h"
+#include "libavutil/avutil.h"
#if LIBAVCODEC_VERSION_MAJOR >= 54
-#include <libavresample/avresample.h>
+#include "libavresample/avresample.h"
#endif
+*/
+
#ifndef LIBAVRESAMPLE_VERSION_MAJOR
#define LIBAVRESAMPLE_VERSION_MAJOR 0
typedef void* AVAudioResampleContext;
@@ -122,6 +125,7 @@ typedef struct {
typedef struct {
+ jobject ffmpegMediaPlayer;
int32_t verbose;
uint32_t avcodecVersion;