From: Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Date: Sat, 29 Jun 2013 20:11:18 +0000 (+0200)
Subject: YoutubeIE: don't crash when trying to get automatic captions if the videos has standa... 
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=2f799533ae680dc788c8b4f6ce41272cf89689cc;p=youtube-dl

YoutubeIE: don't crash when trying to get automatic captions if the videos has standard subtitles.
---

diff --git a/youtube_dl/extractor/youtube.py b/youtube_dl/extractor/youtube.py
index 30036524f..2b03226f6 100644
--- a/youtube_dl/extractor/youtube.py
+++ b/youtube_dl/extractor/youtube.py
@@ -270,7 +270,9 @@ class YoutubeIE(InfoExtractor):
             subtitles_url = caption_url + '&' + params
             sub = self._download_webpage(subtitles_url, video_id, u'Downloading automatic captions')
             return {sub_lang: sub}
-        except KeyError:
+        # An extractor error can be raise by the download process if there are
+        # no automatic captions but there are subtitles
+        except (KeyError, ExtractorError):
             self._downloader.report_warning(err_msg)
             return {}