Compare commits

..

No commits in common. "194b286e30c9c33001be3107ba69bb37bb08ad80" and "0da9097a6acdc65b2f1457b54300f1b52fa3ebe8" have entirely different histories.

5 changed files with 6 additions and 6 deletions

View file

@ -485,7 +485,7 @@ class File(models.Model):
'wanted': self.wanted, 'wanted': self.wanted,
} }
for key in ('folder', 'filename'): for key in ('folder', 'filename'):
if keys and key in keys: if key in keys:
data[key] = getattr(self, key) data[key] = getattr(self, key)
if error: if error:
data['error'] = error data['error'] = error

View file

@ -1402,7 +1402,7 @@
240, 288, 360, 432, 480, 720 and 1080. 240, 288, 360, 432, 480, 720 and 1080.
*/ */
"video": { "video": {
"formats": ["mp4"], "formats": ["webm", "mp4"],
// fixme: this should be named "ratio" or "defaultRatio", // fixme: this should be named "ratio" or "defaultRatio",
// as it also applies to clip lists (on load) // as it also applies to clip lists (on load)
"previewRatio": 1.7777777778, "previewRatio": 1.7777777778,

View file

@ -1888,7 +1888,7 @@
240, 288, 360, 432, 480, 720 and 1080. 240, 288, 360, 432, 480, 720 and 1080.
*/ */
"video": { "video": {
"formats": ["mp4"], "formats": ["webm", "mp4"],
"previewRatio": 1.375, "previewRatio": 1.375,
"resolutions": [240, 480] "resolutions": [240, 480]
} }

View file

@ -1392,7 +1392,7 @@
240, 288, 360, 432, 480, 720 and 1080. 240, 288, 360, 432, 480, 720 and 1080.
*/ */
"video": { "video": {
"formats": ["mp4"], "formats": ["webm", "mp4"],
"previewRatio": 1.3333333333, "previewRatio": 1.3333333333,
//supported resolutions are //supported resolutions are
//1080, 720, 480, 432, 360, 288, 240, 144, 96 //1080, 720, 480, 432, 360, 288, 240, 144, 96

View file

@ -1281,8 +1281,8 @@ examples (config.SITENAME.jsonc) that are part of this pan.do/ra distribution.
240, 288, 360, 432, 480, 720 and 1080. 240, 288, 360, 432, 480, 720 and 1080.
*/ */
"video": { "video": {
"downloadFormat": "mp4", "downloadFormat": "webm",
"formats": ["mp4"], "formats": ["webm", "mp4"],
"previewRatio": 1.3333333333, "previewRatio": 1.3333333333,
"resolutions": [240, 480] "resolutions": [240, 480]
} }