From: Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Date: Mon, 20 Jul 2015 18:25:53 +0000 (+0200)
Subject: [YoutubeDL] don't default to 'bestvideo+bestaudio/best' for live videos
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=8250c32f49fed0986bd514d1435e00a0182e8314;p=youtube-dl

[YoutubeDL] don't default to 'bestvideo+bestaudio/best' for live videos

Doesn't work currently.
---

diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py
index 00af78e06..702a6ad50 100755
--- a/youtube_dl/YoutubeDL.py
+++ b/youtube_dl/YoutubeDL.py
@@ -1104,7 +1104,8 @@ class YoutubeDL(object):
         if req_format is None:
             req_format_list = []
             if (self.params.get('outtmpl', DEFAULT_OUTTMPL) != '-' and
-                    info_dict['extractor'] in ['youtube', 'ted']):
+                    info_dict['extractor'] in ['youtube', 'ted'] and
+                    not info_dict.get('is_live')):
                 merger = FFmpegMergerPP(self)
                 if merger.available and merger.can_merge():
                     req_format_list.append('bestvideo+bestaudio')