projects
/
blender.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9c6fc9f
)
Attempt to fix compilation against libav-0.8.9
author
Sergey Sharybin <sergey.vfx@gmail.com>
Wed, 11 Dec 2013 16:40:00 +0000
(22:40 +0600)
committer
Sergey Sharybin <sergey.vfx@gmail.com>
Wed, 11 Dec 2013 16:40:45 +0000
(22:40 +0600)
intern/ffmpeg/ffmpeg_compat.h
patch
|
blob
|
history
diff --git
a/intern/ffmpeg/ffmpeg_compat.h
b/intern/ffmpeg/ffmpeg_compat.h
index 459bee48e0e2b611a5d3fdbfd90c4fc4bae33649..cca5f64d9ac46372b35f99ec79fa4d8875273147 100644
(file)
--- a/
intern/ffmpeg/ffmpeg_compat.h
+++ b/
intern/ffmpeg/ffmpeg_compat.h
@@
-90,7
+90,7
@@
#define FFMPEG_HAVE_DECODE_AUDIO4
#endif
-#if ((LIBAVUTIL_VERSION_MAJOR > 51) || (LIBAVUTIL_VERSION_MAJOR == 51) && (LIBAVUTIL_VERSION_MINOR >=
32
))
+#if ((LIBAVUTIL_VERSION_MAJOR > 51) || (LIBAVUTIL_VERSION_MAJOR == 51) && (LIBAVUTIL_VERSION_MINOR >=
21
))
#define FFMPEG_FFV1_ALPHA_SUPPORTED
#define FFMPEG_SAMPLE_FMT_S16P_SUPPORTED
#else