From 64a080f446fd9229d611cbee51fa0beb200a92ad Mon Sep 17 00:00:00 2001 From: Mikael Finstad Date: Wed, 1 Apr 2020 23:17:51 +0800 Subject: [PATCH] use a proper tagged version for ffmpeg --- README.md | 4 +++- package.json | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index b5ed9882..0c773227 100644 --- a/README.md +++ b/README.md @@ -129,7 +129,7 @@ The CSV export/import function takes csv files with one cut segment on each line `segment start` and `segment end` are expressed in seconds or left empty. Empty `segment end` means segment ends at the duration of the video. -Note that you must use comma `,` (not semicolon `;`) +Note that you must use comma `,` to separate the fields (not semicolon `;`) ### example.csv ```csv @@ -151,3 +151,5 @@ This project is maintained by me alone. The project will always remain free and --- Made with ❤️ in 🇳🇴 + +More apps by [mifi.no](https://mifi.no/) \ No newline at end of file diff --git a/package.json b/package.json index 9515cfc4..9a1d15c4 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "scripts": { "start": "concurrently -k \"BROWSER=none PORT=3001 react-scripts start\" \"wait-on http://localhost:3001 && electron .\"", "icon-gen": "mkdirp icon-build && svg2png src/icon.svg -o ./icon-build/app-512.png -w 512 -h 512 && mkdirp icns-build && icon-gen -i src/icon.svg -o ./icns-build --icns --icns-sizes 512,1024 && mkdirp build-resources/appx && npx svg2png src/icon.svg --output=build-resources/appx/StoreLogo.png --width=50 --height=50 && npx svg2png src/icon.svg --output=build-resources/appx/Square150x150Logo.png --width=300 --height=300 && npx svg2png src/icon.svg --output=build-resources/appx/Square44x44Logo.png --width=44 --height=44 && npx svg2png src/icon.svg --output=build-resources/appx/Wide310x150Logo.png --width=620 --height=300", - "download-ffmpeg": "mkdir -p ffmpeg-mac && wget https://github.com/mifi/ffmpeg-build-script/releases/download/v2.1.4/ffmpeg -O ffmpeg-mac/ffmpeg && wget https://github.com/mifi/ffmpeg-build-script/releases/download/v2.1.4/ffprobe -O ffmpeg-mac/ffprobe && chmod +x ffmpeg-mac/ffmpeg && chmod +x ffmpeg-mac/ffprobe", + "download-ffmpeg": "mkdir -p ffmpeg-mac && wget https://github.com/mifi/ffmpeg-build-script/releases/download/n4.2.2/ffmpeg -O ffmpeg-mac/ffmpeg && wget https://github.com/mifi/ffmpeg-build-script/releases/download/n4.2.2/ffprobe -O ffmpeg-mac/ffprobe && chmod +x ffmpeg-mac/ffmpeg && chmod +x ffmpeg-mac/ffprobe", "build": "yarn icon-gen && react-scripts build", "test": "react-scripts test", "eject": "react-scripts eject",