Skip to content

Commit a577c57

Browse files
committed
Added OpenSSL & different protocol support to FFmpeg backend
- Fixed Docker dependencies (both x86 & x86-64) - Fixes bug opencv#204
1 parent da7d022 commit a577c57

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

docker/Dockerfile_i686

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ RUN curl -O -L https://cmake.org/files/v3.9/cmake-3.9.0.tar.gz && \
2323
cd .. && \
2424
rm -rf cmake-3.9.0*
2525

26-
RUN yum install autoconf automake bzip2 cmake freetype-devel gcc gcc-c++ libtool make mercurial pkgconfig zlib-devel -y && \
26+
RUN yum install autoconf automake bzip2 cmake freetype-devel gcc gcc-c++ libtool make mercurial pkgconfig openssl-devel zlib-devel -y && \
2727
yum remove nasm -y && \
2828
mkdir ~/ffmpeg_sources && \
2929
cd ~/ffmpeg_sources && \
@@ -50,7 +50,7 @@ RUN yum install autoconf automake bzip2 cmake freetype-devel gcc gcc-c++ libtool
5050
tar xjvf ffmpeg-snapshot.tar.bz2 && \
5151
cd ffmpeg && \
5252
PATH=~/bin:$PATH && \
53-
PKG_CONFIG_PATH="$HOME/ffmpeg_build/lib/pkgconfig" ./configure --prefix="$HOME/ffmpeg_build" --extra-cflags="-I$HOME/ffmpeg_build/include" --extra-ldflags="-L$HOME/ffmpeg_build/lib" --enable-libvpx --enable-shared --enable-pic --bindir="$HOME/bin" && \
53+
PKG_CONFIG_PATH="$HOME/ffmpeg_build/lib/pkgconfig" ./configure --prefix="$HOME/ffmpeg_build" --extra-cflags="-I$HOME/ffmpeg_build/include" --extra-ldflags="-L$HOME/ffmpeg_build/lib" --enable-libvpx --enable-openssl --enable-protocol=file,ftp,http,https,httpproxy,hls,mmsh,mmst,pipe,rtmp,rtmps,rtmpt,rtmpts,rtp,sctp,srtp,tcp,udp --enable-shared --enable-pic --bindir="$HOME/bin" && \
5454
make -j4 && \
5555
make install && \
5656
echo "/root/ffmpeg_build/lib/" >> /etc/ld.so.conf && \

docker/Dockerfile_x86_64

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ RUN curl -O -L https://cmake.org/files/v3.9/cmake-3.9.0.tar.gz && \
2323
cd .. && \
2424
rm -rf cmake-3.9.0*
2525

26-
RUN yum install autoconf automake bzip2 cmake freetype-devel gcc gcc-c++ libtool make mercurial pkgconfig zlib-devel -y && \
26+
RUN yum install autoconf automake bzip2 cmake freetype-devel gcc gcc-c++ libtool make mercurial pkgconfig openssl-devel zlib-devel -y && \
2727
yum remove nasm -y && \
2828
mkdir ~/ffmpeg_sources && \
2929
cd ~/ffmpeg_sources && \
@@ -50,7 +50,7 @@ RUN yum install autoconf automake bzip2 cmake freetype-devel gcc gcc-c++ libtool
5050
tar xjvf ffmpeg-snapshot.tar.bz2 && \
5151
cd ffmpeg && \
5252
PATH=~/bin:$PATH && \
53-
PKG_CONFIG_PATH="$HOME/ffmpeg_build/lib/pkgconfig" ./configure --prefix="$HOME/ffmpeg_build" --extra-cflags="-I$HOME/ffmpeg_build/include" --extra-ldflags="-L$HOME/ffmpeg_build/lib" --enable-libvpx --enable-shared --enable-pic --bindir="$HOME/bin" && \
53+
PKG_CONFIG_PATH="$HOME/ffmpeg_build/lib/pkgconfig" ./configure --prefix="$HOME/ffmpeg_build" --extra-cflags="-I$HOME/ffmpeg_build/include" --extra-ldflags="-L$HOME/ffmpeg_build/lib" --enable-openssl --enable-libvpx --enable-protocol=file,ftp,http,https,httpproxy,hls,mmsh,mmst,pipe,rtmp,rtmps,rtmpt,rtmpts,rtp,sctp,srtp,tcp,udp --enable-shared --enable-pic --bindir="$HOME/bin" && \
5454
make -j4 && \
5555
make install && \
5656
echo "/root/ffmpeg_build/lib/" >> /etc/ld.so.conf && \
@@ -84,4 +84,4 @@ RUN curl -O https://raw.githubusercontent.com/torvalds/linux/v4.14/include/uapi/
8484
curl -O https://raw.githubusercontent.com/torvalds/linux/v4.14/include/linux/compiler.h && \
8585
mv videodev2.h v4l2-common.h v4l2-controls.h compiler.h /usr/include/linux
8686

87-
ENV PATH "$HOME/bin:$PATH"
87+
ENV PATH "$HOME/bin:$PATH"

0 commit comments

Comments
 (0)