generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

make sure opencv builds fine with the recent versions of libav (e.g. from Ubuntu 14.10)

Browse Source
This commit is contained in:
Vadim Pisarevsky
2015-04-22 21:57:29 +03:00
parent a69b435c92
commit 2b2e3ee93c
7 changed files with 241 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
3rdparty/ffmpeg/ffmpeg_version.cmake vendored
View File

@@ -3,9 +3,11 @@ set(HAVE_FFMPEG_CODEC 1)
set(HAVE_FFMPEG_FORMAT 1)
set(HAVE_FFMPEG_UTIL 1)
set(HAVE_FFMPEG_SWSCALE 1)
set(HAVE_FFMPEG_RESAMPLE 0)
set(HAVE_GENTOO_FFMPEG 1)
set(ALIASOF_libavcodec_VERSION 55.18.102)
set(ALIASOF_libavformat_VERSION 55.12.100)
set(ALIASOF_libavutil_VERSION 52.38.100)
set(ALIASOF_libswscale_VERSION 2.3.100)
set(ALIASOF_libavresample_VERSION 1.0.1)