From 7c76479d5ff62709879cbf5ffe69a9c624b1fbda Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Fri, 19 Feb 2016 22:04:07 +0100 Subject: [PATCH] Fix compilation error with FFmpeg and Ubuntu Trusty Seems this is a confusion between Libav which was silently used by Ubuntu instead of FFmpeg. --- intern/ffmpeg/ffmpeg_compat.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/intern/ffmpeg/ffmpeg_compat.h b/intern/ffmpeg/ffmpeg_compat.h index 78115b325df..bcfa24b06a8 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