diff options
author | Anton Khirnov <anton@khirnov.net> | 2014-01-16 18:40:37 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-01-28 12:00:31 +0400 |
commit | 8c3b27ce279f1f0904af3c220d92acfa1f20a70e (patch) | |
tree | 077e32b67a7bbc644e979102eb455aeb0ed75cdd /source/blender/makesrna/intern/SConscript | |
parent | 6fe5b3be38af229640d1926bd908361d5e7a2b15 (diff) |
Change libavcodec CODEC_ID_* to AV_CODEC_ID_*
CODEC_ID_* have been replaced with AV_CODEC_ID_* in new libavcodec
versions.
Update the code to use those new identifiers.
Added a compatibility code to ffmpeg_compat.h
Diffstat (limited to 'source/blender/makesrna/intern/SConscript')
-rw-r--r-- | source/blender/makesrna/intern/SConscript | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/SConscript b/source/blender/makesrna/intern/SConscript index fe6950e62dd..b2229181303 100644 --- a/source/blender/makesrna/intern/SConscript +++ b/source/blender/makesrna/intern/SConscript @@ -108,7 +108,7 @@ if env['WITH_BF_FRAMESERVER']: if env['WITH_BF_FFMPEG']: defs.append('WITH_FFMPEG') - incs += ' ' + env['BF_FFMPEG_INC'] + incs += ' ' + env['BF_FFMPEG_INC'] + ' #/intern/ffmpeg' if env['WITH_BF_QUICKTIME']: defs.append('WITH_QUICKTIME') |