diff options
| author | Treeve Jelbert | 2022-06-12 13:41:25 +0200 |
|---|---|---|
| committer | Treeve Jelbert | 2022-06-12 13:45:41 +0200 |
| commit | 8a903496c9e8beb50713002d25639772277054bf (patch) | |
| tree | ee0b1b4421dd2a142d20b7acf301aa02c657d3e1 /video | |
| parent | 0b9c8000a15317e018d4ff044d1abc475f472be6 (diff) | |
ffmpeg - tweak conflicts
Diffstat (limited to 'video')
| -rwxr-xr-x | video/ffmpeg/CONFLICTS | 1 | ||||
| -rw-r--r-- | video/ffmpeg/HISTORY | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/video/ffmpeg/CONFLICTS b/video/ffmpeg/CONFLICTS index f44a624060..4890d7d970 100755 --- a/video/ffmpeg/CONFLICTS +++ b/video/ffmpeg/CONFLICTS @@ -1 +1,2 @@ conflicts ffmpeg-svn +conflicts ffmpeg5 diff --git a/video/ffmpeg/HISTORY b/video/ffmpeg/HISTORY index 25386d77dc..054c2603ec 100644 --- a/video/ffmpeg/HISTORY +++ b/video/ffmpeg/HISTORY @@ -1,3 +1,6 @@ +2022-06-12 Treeve Jelbert <treeve@sourcemage.org> + * CONFLICTS: add ffmpeg5 + 2022-06-04 Florian Franzmann <bwlf@bandrate.org> * DEPENDS: depend on LZMA instead of lzma-utils |