Merge branch 'release-1.1.1'

.travis.yml

@@ -5,11 +5,8 @@ addons:
     apt:
         packages:
             - language-pack-fr
-install:
-    - composer install
-script: composer exec -v phpunit
-after_success:
-    - bash <(curl -s https://codecov.io/bash)
+install: composer install
+after_success: bash <(curl -s https://codecov.io/bash)
 before_deploy:
     - yarn install --ignore-scripts
     - yarn grunt doc

classes/VideoDownload.php

@@ -327,6 +327,8 @@ public function getAudioStream($url, $format, $password = null)
         $video = $this->getJSON($url, $format, $password);
         if (in_array($video->protocol, ['m3u8', 'm3u8_native'])) {
             throw new Exception(_('Conversion of M3U8 files is not supported.'));
+        } elseif ($video->protocol == 'http_dash_segments') {
+            throw new Exception(_('Conversion of DASH segments is not supported.'));
         }
 
         $avconvProc = $this->getAvconvProcess($video, $this->config->audioBitrate);

composer.json

@@ -22,8 +22,8 @@
     "squizlabs/php_codesniffer": "~3.2.2",
     "phpunit/phpunit": "~6.5.2",
     "doctrine/instantiator": "~1.0.0",
-    "ffmpeg/ffmpeg": "~3.4.1",
-    "rg3/youtube-dl": "2018.03.20",
+    "ffmpeg/ffmpeg": "4.0",
+    "rg3/youtube-dl": "2018.05.01",
     "heroku/heroku-buildpack-php": "*",
     "anam/phantomjs-linux-x86-binary": "~2.1.1"
   },
@@ -39,20 +39,20 @@
       "type": "package",
       "package": {
         "name": "rg3/youtube-dl",
-        "version": "2018.03.20",
+        "version": "2018.05.01",
         "dist": {
           "type": "zip",
-          "url": "https://github.com/rg3/youtube-dl/archive/2018.03.20.zip"
+          "url": "https://github.com/rg3/youtube-dl/archive/2018.05.01.zip"
         }
       }
     },
     {
       "type": "package",
       "package": {
         "name": "ffmpeg/ffmpeg",
-        "version": "3.4.1",
+        "version": "4.0",
         "dist": {
-          "url": "https://johnvansickle.com/ffmpeg/releases/ffmpeg-3.4.1-64bit-static.tar.xz",
+          "url": "https://johnvansickle.com/ffmpeg/releases/ffmpeg-4.0-64bit-static.tar.xz",
           "type": "xz"
         },
         "bin": [