jketreno/intel-media-ffmpeg
1
0
Fork 0
Code Issues Activity

yasm has been deprecated for x86asm

Browse Source 
Signed-off-by: James P. Ketrenos <james.p.ketrenos@intel.com>
This commit is contained in:
James P. Ketrenos 2020-09-25 14:45:53 -07:00
parent fc64890c41
commit 5dce77d6b9
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile.solution
View File

@ -39,7 +39,7 @@ RUN git clone --depth 1 --branch $FFMPEG_TAG_VERSION https://github.com/ffmpeg/f
# Build FFmpeg # Build FFmpeg
WORKDIR /home/user/ffmpeg WORKDIR /home/user/ffmpeg
RUN ./configure --arch=x86_64 --disable-yasm --enable-vaapi --enable-libmfx \ RUN ./configure --arch=x86_64 --disable-x86asm --enable-vaapi --enable-libmfx \
&& make -j $(nproc --all) \ && make -j $(nproc --all) \
&& sudo make install && sudo make install

7
Dockerfile.solution.rhel
View File

@ -1,11 +1,6 @@
# Docker.solution based on the Intel-Media-SDK instructions available here: # Docker.solution based on the Intel-Media-SDK instructions available here:
# #
# https://github.com/Intel-Media-SDK/MediaSDK/wiki/Build-and-use-ffmpeg-with-MediaSDK # https://github.com/Intel-Media-SDK/MediaSDK/wiki/Build-and-use-ffmpeg-with-MediaSDK
#
# This should really be part of a multi-stage build so the final
# image isn't polluted with build artifacts
#
# NOTE: This image will only work with Ubuntu 19.04 (eoan) and newer
FROM xe-user-stage AS solution-build FROM xe-user-stage AS solution-build
USER root USER root
@ -31,7 +26,7 @@ WORKDIR /home/user/ffmpeg
ENV LIBVA_DRIVER_NAME=iHD ENV LIBVA_DRIVER_NAME=iHD
RUN ./configure --arch=x86_64 --disable-yasm --enable-vaapi --enable-libmfx \ RUN ./configure --arch=x86_64 --disable-x86asm --enable-vaapi --enable-libmfx \
&& make -j $(nproc --all) \ && make -j $(nproc --all) \
&& sudo make install && sudo make install