fix

killgufo · Jan 4, 2020 · 9476415 · 9476415
1 parent f3c2afc
commit 9476415
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -46,7 +46,7 @@ RUN git clone https://code.videolan.org/videolan/x264 /tmp/x264 && \
 
 RUN apt-get install -y pkg-config && git clone https://github.com/FFmpeg/FFmpeg && \
 	cd FFmpeg && git checkout remotes/origin/release/${FFMPEG_VERSION} && \
-	./configure --enable-nonfree --enable-libx264 --enable-gpl && make && \
+	./configure -enable-gpl --enable-libx264 && make && \
     make install && \
     cd .. && rm -rf FFmpeg
 

diff --git a/base-linux-armv7/Dockerfile b/base-linux-armv7/Dockerfile
@@ -39,7 +39,7 @@ RUN sed -i -e "s/;daemonize\s*=\s*yes/daemonize = no/g" /etc/php/7.0/fpm/php-fpm
 ############################
 # Clone and build machinery
 
-RUN   apt-get install libomxil-bellagio-dev -y
+RUN apt-get install libomxil-bellagio-dev -y
 RUN git clone https://github.com/FFmpeg/FFmpeg && \
 	cd FFmpeg && git checkout remotes/origin/release/3.1 && \
 	./configure --target-os=linux --enable-nonfree --enable-libx264 --enable-gpl --enable-omx && make && \