aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/extractor/appletrailers.py
diff options
context:
space:
mode:
authorrupertbaxter2 <rupertbaxter2@yahoo.com>2014-08-13 04:22:45 -0700
committerrupertbaxter2 <rupertbaxter2@yahoo.com>2014-08-13 04:22:45 -0700
commitf96252b913945a173ebf2388de0c01b401b90a3a (patch)
tree7548dfc2247efb507405b817f0223e517c4ced42 /youtube_dl/extractor/appletrailers.py
parent04b89c9026e14c16d3b53cbddf8654f354174245 (diff)
parent6f600ff5d6bda54d8128e6263a468a08edfc3353 (diff)
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'youtube_dl/extractor/appletrailers.py')
-rw-r--r--youtube_dl/extractor/appletrailers.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/youtube_dl/extractor/appletrailers.py b/youtube_dl/extractor/appletrailers.py
index dc8657b67..4359b88d1 100644
--- a/youtube_dl/extractor/appletrailers.py
+++ b/youtube_dl/extractor/appletrailers.py
@@ -6,6 +6,7 @@ import json
from .common import InfoExtractor
from ..utils import (
compat_urlparse,
+ int_or_none,
)
@@ -110,8 +111,8 @@ class AppleTrailersIE(InfoExtractor):
formats.append({
'url': format_url,
'format': format['type'],
- 'width': format['width'],
- 'height': int(format['height']),
+ 'width': int_or_none(format['width']),
+ 'height': int_or_none(format['height']),
})
self._sort_formats(formats)