Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2014-01-16 18:40:37 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2014-01-28 12:00:31 +0400
commit8c3b27ce279f1f0904af3c220d92acfa1f20a70e (patch)
tree077e32b67a7bbc644e979102eb455aeb0ed75cdd /source/blender/makesrna/intern/CMakeLists.txt
parent6fe5b3be38af229640d1926bd908361d5e7a2b15 (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/CMakeLists.txt')
-rw-r--r--source/blender/makesrna/intern/CMakeLists.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/makesrna/intern/CMakeLists.txt b/source/blender/makesrna/intern/CMakeLists.txt
index 26904cac17f..240927efb73 100644
--- a/source/blender/makesrna/intern/CMakeLists.txt
+++ b/source/blender/makesrna/intern/CMakeLists.txt
@@ -211,6 +211,9 @@ if(WITH_CODEC_QUICKTIME)
endif()
if(WITH_CODEC_FFMPEG)
+ list(APPEND INC
+ ../../../../intern/ffmpeg
+ )
list(APPEND INC_SYS
${FFMPEG_INCLUDE_DIRS}
)