summary refs log tree commit diff
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2015-01-26 14:36:22 +0100
committerPhilipp Hagemeister <phihag@phihag.de>2015-01-26 14:36:22 +0100
commit9f0df77ab13ca19bc074b501296bb6a494193cd1 (patch)
tree01ce9f2d2ee7b3d2b331f6cc93b5dd9633f0c638
parente72c7e41238681338c92427f6731c74947645308 (diff)
downloadyoutube-dl-9f0df77ab13ca19bc074b501296bb6a494193cd1.tar.gz
youtube-dl-9f0df77ab13ca19bc074b501296bb6a494193cd1.tar.xz
youtube-dl-9f0df77ab13ca19bc074b501296bb6a494193cd1.zip
[YoutubeDL] Allow format filtering by fps
-rwxr-xr-xyoutube_dl/YoutubeDL.py2
-rw-r--r--youtube_dl/options.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py
index ae62432c6..b5dd77e3f 100755
--- a/youtube_dl/YoutubeDL.py
+++ b/youtube_dl/YoutubeDL.py
@@ -820,7 +820,7 @@ class YoutubeDL(object):
             '!=': operator.ne,
         }
         operator_rex = re.compile(r'''(?x)\s*\[
-            (?P<key>width|height|tbr|abr|vbr|filesize)
+            (?P<key>width|height|tbr|abr|vbr|filesize|fps)
             \s*(?P<op>%s)(?P<none_inclusive>\s*\?)?\s*
             (?P<value>[0-9.]+(?:[kKmMgGtTpPeEzZyY]i?[Bb]?)?)
             \]$
diff --git a/youtube_dl/options.py b/youtube_dl/options.py
index dbc6f5528..5e4a1ad9b 100644
--- a/youtube_dl/options.py
+++ b/youtube_dl/options.py
@@ -297,7 +297,7 @@ def parseOpts(overrideArguments=None):
             ' You can filter the video results by putting a condition in'
             ' brackets, as in -f "best[height=720]"'
             ' (or -f "[filesize>10M]"). '
-            ' This works for filesize, height, width, tbr, abr, and vbr'
+            ' This works for filesize, height, width, tbr, abr, vbr, and fps'
             ' and the comparisons <, <=, >, >=, =, != .'
             ' Formats for which the value is not known are excluded unless you'
             ' put a question mark (?) after the operator.'