summaryrefslogtreecommitdiffstats
path: root/src/jogl/native/libav/ffmpeg_tool.h
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2013-08-28 02:44:29 +0200
committerSven Gothel <[email protected]>2013-08-28 02:44:29 +0200
commit15ec34db947f89b1d20043b729a09413a425de5d (patch)
treed5545d00009717cdabbb6e52963dbcdea7cc48b9 /src/jogl/native/libav/ffmpeg_tool.h
parent5031a42647442b71ef32041d332ed5f22d3e6ecf (diff)
Fix libav/ffmpeg compilation: Use 'dot less' dir/file names; Compile ffmpeg version dependent c-files individually and inject object files. ; ffmpeg *register_all() at setStream0(..)
- Use 'dot less' dir/file names - Compile ffmpeg version dependent c-files individually and inject object files. - ffmpeg *register_all() at setStream0(..) - Only register devices if available _and_ camera is requested.
Diffstat (limited to 'src/jogl/native/libav/ffmpeg_tool.h')
-rw-r--r--src/jogl/native/libav/ffmpeg_tool.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/jogl/native/libav/ffmpeg_tool.h b/src/jogl/native/libav/ffmpeg_tool.h
index 90d795b91..ea9625da6 100644
--- a/src/jogl/native/libav/ffmpeg_tool.h
+++ b/src/jogl/native/libav/ffmpeg_tool.h
@@ -29,7 +29,6 @@
#ifndef _FFMPEG_TOOL_H
#define _FFMPEG_TOOL_H
-/***
#ifdef _WIN32
#include <windows.h>
// __declspec(dllimport) void __stdcall Sleep(unsigned long dwMilliseconds);
@@ -49,8 +48,6 @@
#include "libavresample/avresample.h"
#endif
-*/
-
#ifndef LIBAVRESAMPLE_VERSION_MAJOR
#define LIBAVRESAMPLE_VERSION_MAJOR 0
typedef void* AVAudioResampleContext;