diff options
| author | Marcus von Appen <mva@FreeBSD.org> | 2013-05-19 12:36:00 +0000 |
|---|---|---|
| committer | Marcus von Appen <mva@FreeBSD.org> | 2013-05-19 12:36:00 +0000 |
| commit | efd0bfb812d452179703d83b41607b263bcb90a7 (patch) | |
| tree | 43fdb71253bff560fb13652267ac39f2d85ba1c1 /graphics/blender/files | |
| parent | d97d6aaa95bdd6b51ba24af4af5451b3887bb082 (diff) | |
Notes
Diffstat (limited to 'graphics/blender/files')
| -rw-r--r-- | graphics/blender/files/patch-intern_ffmpeg_compat.h | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/graphics/blender/files/patch-intern_ffmpeg_compat.h b/graphics/blender/files/patch-intern_ffmpeg_compat.h index 59b8a07ad16e..67a169addf40 100644 --- a/graphics/blender/files/patch-intern_ffmpeg_compat.h +++ b/graphics/blender/files/patch-intern_ffmpeg_compat.h @@ -1,44 +1,44 @@ ---- intern/ffmpeg/ffmpeg_compat.h.orig 2013-03-06 17:47:13.000000000 +0100 -+++ intern/ffmpeg/ffmpeg_compat.h 2013-03-06 17:49:33.000000000 +0100 -@@ -113,14 +113,14 @@ +--- intern/ffmpeg/ffmpeg_compat.h.orig 2013-05-09 10:51:58.000000000 +0200 ++++ intern/ffmpeg/ffmpeg_compat.h 2013-05-09 10:53:27.000000000 +0200 +@@ -179,14 +179,14 @@ #define avformat_close_input(x) av_close_input_file(*(x)) #endif -#if ((LIBAVCODEC_VERSION_MAJOR < 53) || (LIBAVCODEC_VERSION_MAJOR == 53 && LIBAVCODEC_VERSION_MINOR < 35)) --static inline +-FFMPEG_INLINE -int avcodec_open2(AVCodecContext *avctx, AVCodec *codec, AVDictionary **options) -{ - /* TODO: no options are taking into account */ - return avcodec_open(avctx, codec); -} -#endif -+// #if ((LIBAVCODEC_VERSION_MAJOR < 53) || (LIBAVCODEC_VERSION_MAJOR == 53 && LIBAVCODEC_VERSION_MINOR < 35)) -+// static inline -+// int avcodec_open2(AVCodecContext *avctx, AVCodec *codec, AVDictionary **options) -+// { -+// /* TODO: no options are taking into account */ -+// return avcodec_open(avctx, codec); -+// } -+// #endif ++//#if ((LIBAVCODEC_VERSION_MAJOR < 53) || (LIBAVCODEC_VERSION_MAJOR == 53 && LIBAVCODEC_VERSION_MINOR < 35)) ++//FFMPEG_INLINE ++//int avcodec_open2(AVCodecContext *avctx, AVCodec *codec, AVDictionary **options) ++//{ ++// /* TODO: no options are taking into account */ ++// return avcodec_open(avctx, codec); ++//} ++//#endif #if ((LIBAVFORMAT_VERSION_MAJOR < 53) || (LIBAVFORMAT_VERSION_MAJOR == 53 && LIBAVFORMAT_VERSION_MINOR < 21)) - static inline -@@ -130,12 +130,12 @@ + FFMPEG_INLINE +@@ -196,12 +196,12 @@ return av_new_stream(s, 0); } --static inline +-FFMPEG_INLINE -int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options) -{ - /* TODO: no options are taking into account */ - return av_find_stream_info(ic); -} -+// static inline -+// int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options) -+// { -+// /* TODO: no options are taking into account */ -+// return av_find_stream_info(ic); -+// } ++//FFMPEG_INLINE ++//int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options) ++//{ ++// /* TODO: no options are taking into account */ ++// return av_find_stream_info(ic); ++//} #endif #if ((LIBAVFORMAT_VERSION_MAJOR > 53) || ((LIBAVFORMAT_VERSION_MAJOR == 53) && (LIBAVFORMAT_VERSION_MINOR > 32)) || ((LIBAVFORMAT_VERSION_MAJOR == 53) && (LIBAVFORMAT_VERSION_MINOR == 24) && (LIBAVFORMAT_VERSION_MICRO >= 100))) |