Commit ffe669f7862ec15e29b9e84e76222ac3006cb4cf

Authored by Silvan Calarco
1 parent e13e90daae
Exists in master

Makefile.defs: defines after ffmpeg 2.1 update

Showing 1 changed file with 14 additions and 3 deletions Side-by-side Diff

... ... @@ -142,6 +142,13 @@
142 142 libf77blas.so.3[][64bit] = libatlas
143 143 libptcblas.so.3[][64bit] = libatlas
144 144 libptf77blas.so.3[][64bit] = libatlas
  145 +# ffmpeg / libav
  146 +libavutil.so.52[][64bit] = libavutil-ffmpeg
  147 +libavutil.so.52[LIBAVUTIL_52][64bit] = libavutil-ffmpeg
  148 +libswscale.so.2[][64bit] = libswscale-ffmpeg
  149 +libswscale.so.2[LIBSWSCALE_2][64bit] = libswscale-ffmpeg
  150 +libpostproc.so.51[][64bit] = libpostproc-ffmpeg
  151 +libpostproc.so.51[LIBPOSTPROC_51][64bit] = libpostproc-ffmpeg
145 152 else
146 153 libGL.so.1 = libGL-Mesa-dri
147 154 libGLU.so.1 = libGL-Mesa-dri
... ... @@ -170,6 +177,13 @@
170 177 libf77blas.so.3 = libatlas
171 178 libptcblas.so.3 = libatlas
172 179 libptf77blas.so.3 = libatlas
  180 +# ffmpeg / libav
  181 +libavutil.so.52 = libavutil-ffmpeg
  182 +libavutil.so.52[LIBAVUTIL_52] = libavutil-ffmpeg
  183 +libswscale.so.2 = libswscale-ffmpeg
  184 +libswscale.so.2[LIBSWSCALE_2] = libswscale-ffmpeg
  185 +libpostproc.so.51 = libpostproc-ffmpeg
  186 +libpostproc.so.51[LIBPOSTPROC_51] = libpostproc-ffmpeg
173 187 endif
174 188 /usr/bin/python = python
175 189 python[abi] = python
... ... @@ -227,9 +241,6 @@
227 241 libgudev-1.0.so.0 = udev
228 242 libexpect5.44.1.15.so = expect
229 243  
230   -# ffmpeg / libav
231   -libpostproc.so.51 = libpostproc-ffmpeg
232   -libpostproc.so.51[LIBPOSTPROC_51] = libpostproc-ffmpeg
233 244 ffmpegpresets := ffmpeg-presets
234 245  
235 246 # libreoffice