diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-06-18 14:29:11 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-06-18 14:29:11 +0400 |
| commit | 0d64e050ea10ef9887323613c2fc6b429ebd53c9 (patch) | |
| tree | 8954ec1670200f2f15e8379c9498e9f8a529802e /source/gameengine/VideoTexture/VideoFFmpeg.h | |
| parent | 5e6e9bd616840cb1c9d4f41d333540f5294548e9 (diff) | |
Reduce amount of deprecated symbols used from FFmpeg
This switches some areas of Blender which are related on FFmpeg stuff
from deprecated symbols to currently supported one.
Pretty straightforward changes based on documentation of FFmpeg's
API which symbols should be now used.
This should make Blender compatible with recent FFmpeg 0.11.
Should be no functional changes.
Diffstat (limited to 'source/gameengine/VideoTexture/VideoFFmpeg.h')
| -rw-r--r-- | source/gameengine/VideoTexture/VideoFFmpeg.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/source/gameengine/VideoTexture/VideoFFmpeg.h b/source/gameengine/VideoTexture/VideoFFmpeg.h index d3458211949..e63032e0c66 100644 --- a/source/gameengine/VideoTexture/VideoFFmpeg.h +++ b/source/gameengine/VideoTexture/VideoFFmpeg.h @@ -46,10 +46,6 @@ extern "C" { # define FFMPEG_CODEC_IS_POINTER 1 #endif -#if LIBAVFORMAT_VERSION_INT >= (52 << 16) -# define FFMPEG_PB_IS_POINTER 1 -#endif - #ifdef FFMPEG_CODEC_IS_POINTER static inline AVCodecContext* get_codec_from_stream(AVStream* stream) { @@ -172,7 +168,7 @@ protected: double actFrameRate (void) { return m_frameRate * m_baseFrameRate; } /// common function to video file and capture - int openStream(const char *filename, AVInputFormat *inputFormat, AVFormatParameters *formatParams); + int openStream(const char *filename, AVInputFormat *inputFormat, AVDictionary **formatParams); /// check if a frame is available and load it in pFrame, return true if a frame could be retrieved AVFrame* grabFrame(long frame); |