Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop
This commit is contained in:
		
						commit
						ef87a9db7b
					
				
					 1 changed files with 2 additions and 3 deletions
				
			
		|  | @ -35,9 +35,8 @@ export class VideoProcessingService { | ||||||
| 						timestamps: ['5%'], | 						timestamps: ['5%'], | ||||||
| 					}); | 					}); | ||||||
| 			}); | 			}); | ||||||
| 	 | 
 | ||||||
| 			// JPEGに変換 (Webpでもいいが、MastodonはWebpをサポートせず表示できなくなる)
 | 			return await this.imageProcessingService.convertToWebp(`${dir}/out.png`, 498, 280); | ||||||
| 			return await this.imageProcessingService.convertToJpeg(`${dir}/out.png`, 498, 280); |  | ||||||
| 		} finally { | 		} finally { | ||||||
| 			cleanup(); | 			cleanup(); | ||||||
| 		} | 		} | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue