From ffe669f7862ec15e29b9e84e76222ac3006cb4cf Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Sun, 9 Mar 2014 14:51:21 +0100 Subject: [PATCH] Makefile.defs: defines after ffmpeg 2.1 update --- Makefile.defs | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index 656da3b..f890ed6 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -142,6 +142,13 @@ libcblas.so.3[][64bit] = libatlas libf77blas.so.3[][64bit] = libatlas libptcblas.so.3[][64bit] = libatlas libptf77blas.so.3[][64bit] = libatlas +# ffmpeg / libav +libavutil.so.52[][64bit] = libavutil-ffmpeg +libavutil.so.52[LIBAVUTIL_52][64bit] = libavutil-ffmpeg +libswscale.so.2[][64bit] = libswscale-ffmpeg +libswscale.so.2[LIBSWSCALE_2][64bit] = libswscale-ffmpeg +libpostproc.so.51[][64bit] = libpostproc-ffmpeg +libpostproc.so.51[LIBPOSTPROC_51][64bit] = libpostproc-ffmpeg else libGL.so.1 = libGL-Mesa-dri libGLU.so.1 = libGL-Mesa-dri @@ -170,6 +177,13 @@ libcblas.so.3 = libatlas libf77blas.so.3 = libatlas libptcblas.so.3 = libatlas libptf77blas.so.3 = libatlas +# ffmpeg / libav +libavutil.so.52 = libavutil-ffmpeg +libavutil.so.52[LIBAVUTIL_52] = libavutil-ffmpeg +libswscale.so.2 = libswscale-ffmpeg +libswscale.so.2[LIBSWSCALE_2] = libswscale-ffmpeg +libpostproc.so.51 = libpostproc-ffmpeg +libpostproc.so.51[LIBPOSTPROC_51] = libpostproc-ffmpeg endif /usr/bin/python = python python[abi] = python @@ -227,9 +241,6 @@ libudev.so.0 = udev libgudev-1.0.so.0 = udev libexpect5.44.1.15.so = expect -# ffmpeg / libav -libpostproc.so.51 = libpostproc-ffmpeg -libpostproc.so.51[LIBPOSTPROC_51] = libpostproc-ffmpeg ffmpegpresets := ffmpeg-presets # libreoffice