Merge remote-tracking branch 'xavierbeynon/audiomack'

diff --combined youtube_dl/__init__.py
index 59b8510563e7651d60abac526634970809979b2f,78cdf14dfa58b76f9891b37ca9d98bf5cb37f4cf..4f5ce604fc120afad246058bfabd15808ef338f0
--- 1/youtube_dl/__init__.py
--- 2/youtube_dl/__init__.py
+++ b/youtube_dl/__init__.py
@@@ -79,9 -79,7 +79,10 @@@ __authors__  = 
      'Carlos Ramos',
      '5moufl',
      'lenaten',
 +    'Dennis Scheiba',
 +    'Damon Timm',
 +    'winwon',
+     'Xavier Beynon'
  )
  
  __license__ = 'Public Domain'
@@@ -258,6 -256,8 +259,6 @@@ def _real_main(argv=None)
          date = DateRange.day(opts.date)
      else:
          date = DateRange(opts.dateafter, opts.datebefore)
 -    if opts.default_search not in ('auto', 'auto_warning', 'error', 'fixup_error', None) and ':' not in opts.default_search:
 -        parser.error(u'--default-search invalid; did you forget a colon (:) at the end?')
  
      # Do not download videos when there are audio-only formats
      if opts.extractaudio and not opts.keepvideo and opts.format is None:
@@@ -285,7 -285,7 +286,7 @@@
                       u' file! Use "{0}.%(ext)s" instead of "{0}" as the output'
                       u' template'.format(outtmpl))
  
 -    any_printing = opts.geturl or opts.gettitle or opts.getid or opts.getthumbnail or opts.getdescription or opts.getfilename or opts.getformat or opts.getduration or opts.dumpjson
 +    any_printing = opts.geturl or opts.gettitle or opts.getid or opts.getthumbnail or opts.getdescription or opts.getfilename or opts.getformat or opts.getduration or opts.dumpjson or opts.dump_single_json
      download_archive_fn = os.path.expanduser(opts.download_archive) if opts.download_archive is not None else opts.download_archive
  
      ydl_opts = {
@@@ -305,7 -305,6 +306,7 @@@
          'forcefilename': opts.getfilename,
          'forceformat': opts.getformat,
          'forcejson': opts.dumpjson,
 +        'dump_single_json': opts.dump_single_json,
          'simulate': opts.simulate,
          'skip_download': (opts.skip_download or opts.simulate or any_printing),
          'format': opts.format,
@@@ -371,7 -370,6 +372,7 @@@
          'youtube_include_dash_manifest': opts.youtube_include_dash_manifest,
          'encoding': opts.encoding,
          'exec_cmd': opts.exec_cmd,
 +        'extract_flat': opts.extract_flat,
      }
  
      with YoutubeDL(ydl_opts) as ydl:

diff --combined youtube_dl/extractor/__init__.py
index ab4af20790ee99890e199f84ba159d75c8a6777e,29f32cdef96aaccdd7569fbc3b98649f8db3037a..691fef5ca18c83656990ee6aad86288470433208
--- 1/youtube_dl/extractor/__init__.py
--- 2/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -20,13 -20,13 +20,14 @@@ from .arte import 
      ArteTVDDCIE,
      ArteTVEmbedIE,
  )
+ from .audiomack import AudiomackIE
  from .auengine import AUEngineIE
  from .bambuser import BambuserIE, BambuserChannelIE
  from .bandcamp import BandcampIE, BandcampAlbumIE
  from .bbccouk import BBCCoUkIE
  from .beeg import BeegIE
  from .behindkink import BehindKinkIE
 +from .bild import BildIE
  from .bilibili import BiliBiliIE
  from .blinkx import BlinkxIE
  from .bliptv import BlipTVIE, BlipTVUserIE
@@@ -135,7 -135,6 +136,7 @@@ from .gamestar import GameStarI
  from .gametrailers import GametrailersIE
  from .gdcvault import GDCVaultIE
  from .generic import GenericIE
 +from .glide import GlideIE
  from .globo import GloboIE
  from .godtube import GodTubeIE
  from .golem import GolemIE
@@@ -369,7 -368,6 +370,7 @@@ from .teachingchannel import TeachingCh
  from .teamcoco import TeamcocoIE
  from .techtalks import TechTalksIE
  from .ted import TEDIE
 +from .telecinco import TelecincoIE
  from .telemb import TeleMBIE
  from .tenplay import TenPlayIE
  from .testurl import TestURLIE
@@@ -424,7 -422,6 +425,7 @@@ from .videopremium import VideoPremiumI
  from .videott import VideoTtIE
  from .videoweed import VideoWeedIE
  from .vidme import VidmeIE
 +from .vidzi import VidziIE
  from .vimeo import (
      VimeoIE,
      VimeoAlbumIE,
@@@ -493,8 -490,10 +494,8 @@@ from .youtube import 
      YoutubeUserIE,
      YoutubeWatchLaterIE,
  )
 -
  from .zdf import ZDFIE
  
 -
  _ALL_CLASSES = [
      klass
      for name, klass in globals().items()