From: Calin Crisan <ccrisan@gmail.com>
Date: Sun, 28 May 2017 10:11:50 +0000 (+0300)
Subject: remove ogg format as it's no longer supported
X-Git-Url: http://www.vanbest.org/gitweb/?a=commitdiff_plain;h=3c5e6f1d33227fabea0dde37b606f8656840fecb;p=motioneye-debian

remove ogg format as it's no longer supported
---

diff --git a/motioneye/config.py b/motioneye/config.py
index e08f4a2..c1248b7 100644
--- a/motioneye/config.py
+++ b/motioneye/config.py
@@ -53,7 +53,7 @@ _additional_structure_cache = {}
 _monitor_command_cache = {}
 
 # when using the following video codecs, the ffmpeg_variable_bitrate parameter appears to have an exponential effect
-_EXPONENTIAL_QUALITY_CODECS = ['mpeg4', 'msmpeg4', 'swf', 'flv', 'mov', 'ogg', 'mkv']
+_EXPONENTIAL_QUALITY_CODECS = ['mpeg4', 'msmpeg4', 'swf', 'flv', 'mov', 'mkv']
 _EXPONENTIAL_QUALITY_FACTOR = 100000 # voodoo
 _EXPONENTIAL_DEF_QUALITY = 511 # about 75%
 _MAX_FFMPEG_VARIABLE_BITRATE = 32767
diff --git a/motioneye/mediafiles.py b/motioneye/mediafiles.py
index 0d281c7..680cdd9 100644
--- a/motioneye/mediafiles.py
+++ b/motioneye/mediafiles.py
@@ -41,7 +41,7 @@ import utils
 
 
 _PICTURE_EXTS = ['.jpg']
-_MOVIE_EXTS = ['.avi', '.mp4', '.mov', '.swf', '.flv', '.ogg', '.mkv']
+_MOVIE_EXTS = ['.avi', '.mp4', '.mov', '.swf', '.flv', '.mkv']
 
 FFMPEG_CODEC_MAPPING = {
     'mpeg4': 'mpeg4',
@@ -49,7 +49,6 @@ FFMPEG_CODEC_MAPPING = {
     'swf': 'flv1',
     'flv': 'flv1',
     'mov': 'mpeg4',
-    'ogg': 'theora',
     'mp4': 'h264',
     'mkv': 'h264',
     'hevc': 'h265'
@@ -61,7 +60,6 @@ FFMPEG_FORMAT_MAPPING = {
     'swf': 'swf',
     'flv': 'flv',
     'mov': 'mov',
-    'ogg': 'ogg',
     'mp4': 'mp4',
     'mkv': 'matroska',
     'hevc': 'mp4'
@@ -73,7 +71,6 @@ FFMPEG_EXT_MAPPING = {
     'swf': 'swf',
     'flv': 'flv',
     'mov': 'mov',
-    'ogg': 'ogg',
     'mp4': 'mp4',
     'mkv': 'mkv',
     'hevc': 'mp4'
diff --git a/motioneye/templates/main.html b/motioneye/templates/main.html
index d32f3a6..eb6ff49 100644
--- a/motioneye/templates/main.html
+++ b/motioneye/templates/main.html
@@ -746,7 +746,6 @@
                                 <option value="flv">Flash Video (.flv)</option>
                                 <option value="mov">QuickTime (.mov)</option>
                                 {% if has_new_movie_format_support %}
-                                <option value="ogg">Ogg (.ogg)</option>
                                 <option value="mp4">H.264 (.mp4)</option>
                                 <option value="hevc">HEVC (.mp4)</option>
                                 <option value="mkv">Matroska Video (.mkv)</option>