[postprocessor/ffmpeg] Add `can_merge` method

[youtube-dl] / youtube_dl / version.py

diff --git a/youtube_dl/version.py b/youtube_dl/version.py
index 492ddf2ea0dc55df54f0ca787cd1bb66da26d22a..83c5a165971480abbf4765f60d8e7cf227172736 100644 (file)
--- a/youtube_dl/version.py
+++ b/youtube_dl/version.py
@@ -1,3 +1,3 @@
 from __future__ import unicode_literals
 
-__version__ = '2015.02.11'
+__version__ = '2015.05.10'