mirror of
https://github.com/xuthus83/pigallery2.git
synced 2024-11-03 21:04:03 +08:00
Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
02e1fd3ace
@ -52,6 +52,10 @@ export class VideoConverterWorker {
|
|||||||
})
|
})
|
||||||
.on('error', (e: any) => {
|
.on('error', (e: any) => {
|
||||||
reject('[FFmpeg] ' + e.toString() + ' executed: ' + executedCmd);
|
reject('[FFmpeg] ' + e.toString() + ' executed: ' + executedCmd);
|
||||||
|
})
|
||||||
|
.on('stderr', function (line: string) {
|
||||||
|
// Although this is under `stderr` event, all of ffmpeg output come here.
|
||||||
|
Logger.debug('[FFmpeg] ' + line);
|
||||||
});
|
});
|
||||||
|
|
||||||
// set custom input options
|
// set custom input options
|
||||||
|
@ -768,7 +768,7 @@ export class VideoTranscodingConfig {
|
|||||||
tags: {
|
tags: {
|
||||||
name: $localize`Custom Output Options`,
|
name: $localize`Custom Output Options`,
|
||||||
priority: ConfigPriority.underTheHood,
|
priority: ConfigPriority.underTheHood,
|
||||||
hint: '-pass 2; -minrate 1M; -maxrate 1M; -bufsize 2M',
|
hint: '-pass 2;-minrate 1M;-maxrate 1M;-bufsize 2M',
|
||||||
uiAllowSpaces: true
|
uiAllowSpaces: true
|
||||||
},
|
},
|
||||||
description: $localize`It will be sent to ffmpeg as it is, as custom output options.`,
|
description: $localize`It will be sent to ffmpeg as it is, as custom output options.`,
|
||||||
|
Loading…
Reference in New Issue
Block a user