kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix compilation error with FFmpeg and Ubuntu Trusty

Browse Source 
Seems this is a confusion between Libav which was silently used
by Ubuntu instead of FFmpeg.
This commit is contained in:
Sergey Sharybin 2016-02-19 22:04:07 +01:00
parent b5b156f089
commit 7c76479d5f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
intern/ffmpeg/ffmpeg_compat.h
View File

@ -447,7 +447,7 @@ AVRational av_get_r_frame_rate_compat(const AVStream *stream)
#endif #endif
/* Since FFmpeg-1.1 this constant have AV_ prefix. */ /* 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_BGR32 PIX_FMT_BGR32
# define AV_PIX_FMT_YUV422P PIX_FMT_YUV422P # define AV_PIX_FMT_YUV422P PIX_FMT_YUV422P
# define AV_PIX_FMT_BGRA PIX_FMT_BGRA # define AV_PIX_FMT_BGRA PIX_FMT_BGRA