[Bf-blender-cvs] [7c76479] master: Fix compilation error with FFmpeg and Ubuntu Trusty

Sergey Sharybin noreply at git.blender.org
Fri Feb 19 22:05:28 CET 2016


Commit: 7c76479d5ff62709879cbf5ffe69a9c624b1fbda
Author: Sergey Sharybin
Date:   Fri Feb 19 22:04:07 2016 +0100
Branches: master
https://developer.blender.org/rB7c76479d5ff62709879cbf5ffe69a9c624b1fbda

Fix compilation error with FFmpeg and Ubuntu Trusty

Seems this is a confusion between Libav which was silently used
by Ubuntu instead of FFmpeg.

===================================================================

M	intern/ffmpeg/ffmpeg_compat.h

===================================================================

diff --git a/intern/ffmpeg/ffmpeg_compat.h b/intern/ffmpeg/ffmpeg_compat.h
index 78115b3..bcfa24b 100644
--- a/intern/ffmpeg/ffmpeg_compat.h
+++ b/intern/ffmpeg/ffmpeg_compat.h
@@ -447,7 +447,7 @@ AVRational av_get_r_frame_rate_compat(const AVStream *stream)
 #endif
 
 /* Since FFmpeg-1.1 this constant have AV_ prefix. */
-#if LIBAVUTIL_VERSION_INT < AV_VERSION_INT(52, 13, 100)
+#if LIBAVUTIL_VERSION_INT < AV_VERSION_INT(52, 3, 100)
 #  define AV_PIX_FMT_BGR32 PIX_FMT_BGR32
 #  define AV_PIX_FMT_YUV422P PIX_FMT_YUV422P
 #  define AV_PIX_FMT_BGRA PIX_FMT_BGRA




More information about the Bf-blender-cvs mailing list