From c07bb6bd87dc63bd47bd0cd45bd11e10d2d9c437 Mon Sep 17 00:00:00 2001 From: Eloi BAIL <eloi.bail@savoirfairelinux.com> Date: Mon, 4 May 2015 11:57:36 -0400 Subject: [PATCH] daemon: enable image encoders in contrib Refs #71918 Change-Id: I34aa7f0156559a332d648acbe5e8ee548bf04b1f --- contrib/src/ffmpeg/rules.mak | 15 +++++++++++++++ contrib/src/libav/rules.mak | 14 ++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak index 0d21d8cac1..95226d0023 100644 --- a/contrib/src/ffmpeg/rules.mak +++ b/contrib/src/ffmpeg/rules.mak @@ -63,6 +63,21 @@ FFMPEGCONF += \ --enable-encoder=libspeex \ --enable-decoder=libspeex +#encoders/decoders for images +FFMPEGCONF += \ + --enable-encoder=gif \ + --enable-decoder=gif \ + --enable-encoder=jpegls \ + --enable-decoder=jpegls \ + --enable-encoder=ljpeg \ + --enable-decoder=jpeg2000 \ + --enable-encoder=png \ + --enable-decoder=png \ + --enable-encoder=bmp \ + --enable-decoder=bmp \ + --enable-encoder=tiff \ + --enable-decoder=tiff + FFMPEGCONF += \ --enable-indev=dshow \ --enable-dxva2 diff --git a/contrib/src/libav/rules.mak b/contrib/src/libav/rules.mak index 94a762bdda..fc93d559bc 100644 --- a/contrib/src/libav/rules.mak +++ b/contrib/src/libav/rules.mak @@ -57,6 +57,20 @@ LIBAVCONF += \ --enable-encoder=libspeex \ --enable-decoder=libspeex +#encoders/decoders for images +LIBAVCONF += \ + --enable-encoder=gif \ + --enable-decoder=gif \ + --enable-encoder=jpegls \ + --enable-decoder=jpegls \ + --enable-encoder=ljpeg \ + --enable-decoder=jpeg2000 \ + --enable-encoder=png \ + --enable-decoder=png \ + --enable-encoder=bmp \ + --enable-decoder=bmp \ + --enable-encoder=tiff \ + --enable-decoder=tiff # Linux ifndef HAVE_ANDROID LIBAVCONF += \ -- GitLab