Merge tag 'upstream/2015.11.10'

[youtubedl] / debian / control

diff --git a/debian/control b/debian/control
index cc86162ca9f7968e97fdac39a6c3968134a31f32..92e8c8b1332b36788d1fd1404473e8469680c942 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -22,9 +22,8 @@ Depends:
  ${python:Depends}
 Recommends:
  aria2 | wget | curl,
  ${python:Depends}
 Recommends:
  aria2 | wget | curl,

- libav-tools | ffmpeg,
- libav-tools | ffmpeg (>= 4:0.6) | ffprobe,
- mplayer2 | mplayer,
+ ffmpeg | libav-tools,
+ mpv | mplayer | mplayer2,

  rtmpdump
 Description: downloader of videos from YouTube and other sites
  youtube-dl is a small command-line program to download videos from
  rtmpdump
 Description: downloader of videos from YouTube and other sites
  youtube-dl is a small command-line program to download videos from