diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-02-20 00:04:07 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-02-20 00:05:06 +0300 |
commit | 7c76479d5ff62709879cbf5ffe69a9c624b1fbda (patch) | |
tree | 98380fe76923b0bc121a33c742ee85841b10c9c8 /intern/ffmpeg | |
parent | b5b156f08973a5130d68788da9860747f7e459c8 (diff) |
Fix compilation error with FFmpeg and Ubuntu Trusty
Seems this is a confusion between Libav which was silently used
by Ubuntu instead of FFmpeg.
Diffstat (limited to 'intern/ffmpeg')
-rw-r--r-- | intern/ffmpeg/ffmpeg_compat.h | 2 |
1 files changed, 1 insertions, 1 deletions
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 |