Enable https and openssl. Bump to 2.1.4

popcornmix · Mar 8, 2014 · 9b0793f · 9b0793f
1 parent 6ef31ad
commit 9b0793f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/Makefile.ffmpeg b/Makefile.ffmpeg
@@ -39,7 +39,9 @@ configure:
 			--disable-doc \
 			--disable-postproc \
 			--enable-gpl \
-			--enable-protocol=http \
+			--enable-protocols \
+			--enable-nonfree \
+			--enable-openssl \
 			--enable-pthreads \
 			--enable-pic \
 			--disable-armv5te \
@@ -244,7 +246,7 @@ clean:
 
 checkout: 
 	git clone git://source.ffmpeg.org/ffmpeg ffmpeg; \
-	cd ffmpeg; git checkout n2.1
+	cd ffmpeg; git checkout n2.1.4
 
 install:
 	cd ffmpeg; make -j9 DESTDIR="$(WORK)/ffmpeg_compiled" install

diff --git a/OMXReader.cpp b/OMXReader.cpp
@@ -132,7 +132,7 @@ bool OMXReader::Open(std::string filename, bool dump_format, bool live /* =false
     m_filename.replace(0, 8, "http://");
 
   if(m_filename.substr(0,6) == "mms://" || m_filename.substr(0,7) == "mmsh://" || m_filename.substr(0,7) == "mmst://" || m_filename.substr(0,7) == "mmsu://" ||
-      m_filename.substr(0,7) == "http://" || 
+      m_filename.substr(0,7) == "http://" || m_filename.substr(0,8) == "https://" ||
       m_filename.substr(0,7) == "rtmp://" || m_filename.substr(0,6) == "udp://" ||
       m_filename.substr(0,7) == "rtsp://" )
   {