Merge pull request #42 from qwerty287/upd-ffmpeg

Update php-ffmpeg and add composer lock file
LycheeOrg · Jun 5, 2022 · baf5c77 · baf5c77
2 parents 568b56c + b3218a0
commit baf5c77
Show file tree

Hide file tree

Showing 4 changed files with 4,949 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,3 @@
-composer.lock
 phpunit.xml
 tests/log
 vendor

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# [PHPExif v0.7.4](http://github.com/LycheeOrg/php-exif)
+# [PHPExif v0.7.5](http://github.com/LycheeOrg/php-exif)
 
 [![GitHub Release][release-shield]](https://github.com/LycheeOrg/php-exif/releases)
 [![PHP 8.0 & 8.1][php-shield]](https://github.com/LycheeOrg/php-exif#installation-composer)
@@ -21,7 +21,7 @@ PHPExif serves as a wrapper around some native or CLI tools which access this EX
 
 ## Installation (composer)
 
-```json
+```sh
 composer require lychee-org/php-exif
 ```
 

diff --git a/composer.json b/composer.json
@@ -15,7 +15,7 @@
         "php": "^8.0",
         "ext-fileinfo": "*",
         "neitanod/forceutf8": "^2.0.4",
-        "php-ffmpeg/php-ffmpeg": "^0.17.0"
+        "php-ffmpeg/php-ffmpeg": "^1.0"
     },
     "require-dev": {
         "php-parallel-lint/php-parallel-lint": "^1.2",