Merge remote-tracking branch 'origin/master' into dev/0.15.0

pull/243/head
Josh Moore 1 year ago
commit 0721510b31

2
.github/README.md vendored

@ -124,7 +124,7 @@ ass supports two installation methods: Docker (recommended) & local (manual).
1. Clone the ass repo using `git clone https://github.com/tycrek/ass.git && cd ass/` 1. Clone the ass repo using `git clone https://github.com/tycrek/ass.git && cd ass/`
2. Run the command that corresponds to your OS: 2. Run the command that corresponds to your OS:
- **Linux**: `./install/docker-linux.sh` (uses `#!/bin/bash`) - **Linux**: `./install/docker-linux.sh` (uses `#!/bin/bash`)
- **Windows**: `install/docker-windows.bat` (from Command Prompt) - **Windows**: `install\docker-windows.bat` (from Command Prompt)
- These scripts are identical using the equivalent commands in each OS. - These scripts are identical using the equivalent commands in each OS.
3. Work through the setup process when prompted. 3. Work through the setup process when prompted.

@ -26,8 +26,8 @@ function getCommand(src: String, dest: String) {
'-v', (isProd ? 'error' : 'debug'), // Log level '-v', (isProd ? 'error' : 'debug'), // Log level
'-i', src, // Input file '-i', src, // Input file
'-ss', '00:00:01.000', // Timestamp of frame to grab '-ss', '00:00:01.000', // Timestamp of frame to grab
'-vf', `scale=${THUMBNAIL.WIDTH}:${THUMBNAIL.HEIGHT}:force_original_aspect_ratio=increase,crop=${THUMBNAIL.WIDTH}:${THUMBNAIL.HEIGHT}`, // Dimensions of output file
'-frames:v', '1', // Number of frames to grab '-frames:v', '1', // Number of frames to grab
'-s', `${THUMBNAIL.WIDTH}x${THUMBNAIL.HEIGHT}`, // Dimensions of output file
dest // Output file dest // Output file
]); ]);
} }

Loading…
Cancel
Save