From: Philipp Hagemeister <phihag@phihag.de>
Date: Tue, 22 Oct 2013 22:16:26 +0000 (-0700)
Subject: Merge pull request #1622 from rbrito/fix-extension
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=6803655ced11a633a615168b32ba6cc610d56144;hp=-c;p=youtube-dl

Merge pull request #1622 from rbrito/fix-extension

extractor: youtube: Set extension of AAC audio formats to m4a.
---

6803655ced11a633a615168b32ba6cc610d56144
diff --combined youtube_dl/extractor/youtube.py
index a88cba2b4,96ead3310..7a7bbe265
--- a/youtube_dl/extractor/youtube.py
+++ b/youtube_dl/extractor/youtube.py
@@@ -236,11 -236,13 +236,13 @@@ class YoutubeIE(YoutubeBaseInfoExtracto
          '136': 'mp4',
          '137': 'mp4',
          '138': 'mp4',
-         '139': 'mp4',
-         '140': 'mp4',
-         '141': 'mp4',
          '160': 'mp4',
  
+         # Dash mp4 audio
+         '139': 'm4a',
+         '140': 'm4a',
+         '141': 'm4a',
+ 
          # Dash webm
          '171': 'webm',
          '172': 'webm',
@@@ -1150,7 -1152,7 +1152,7 @@@
              list_page = self._download_webpage(list_url, video_id)
              caption_list = xml.etree.ElementTree.fromstring(list_page.encode('utf-8'))
              original_lang_node = caption_list.find('track')
 -            if not original_lang_node or original_lang_node.attrib.get('kind') != 'asr' :
 +            if original_lang_node is None or original_lang_node.attrib.get('kind') != 'asr' :
                  self._downloader.report_warning(u'Video doesn\'t have automatic captions')
                  return {}
              original_lang = original_lang_node.attrib['lang_code']