diff options
| author | Treeve Jelbert | 2022-06-12 13:44:06 +0200 |
|---|---|---|
| committer | Treeve Jelbert | 2022-06-12 13:45:41 +0200 |
| commit | c7d239626c12a9ed1463b46627351781f147266b (patch) | |
| tree | 68dd202ec044329a2c3a77a09192e6a776bef72a /video | |
| parent | 8a903496c9e8beb50713002d25639772277054bf (diff) | |
ffmpeg-svn - tweak conflicts
Diffstat (limited to 'video')
| -rwxr-xr-x | video/ffmpeg-svn/CONFLICTS | 1 | ||||
| -rw-r--r-- | video/ffmpeg-svn/HISTORY | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/video/ffmpeg-svn/CONFLICTS b/video/ffmpeg-svn/CONFLICTS index 1cb599d4de..7470c6e111 100755 --- a/video/ffmpeg-svn/CONFLICTS +++ b/video/ffmpeg-svn/CONFLICTS @@ -1 +1,2 @@ conflicts ffmpeg +conflicts ffmpeg5 diff --git a/video/ffmpeg-svn/HISTORY b/video/ffmpeg-svn/HISTORY index 8fcadf1d04..103f1ca184 100644 --- a/video/ffmpeg-svn/HISTORY +++ b/video/ffmpeg-svn/HISTORY @@ -1,3 +1,6 @@ +2022-06-12 Treeve Jelbert <treeve@sourcemage.org> + * CONFLICTS: add ffmpeg5 + 2019-07-23 Pavel Vinogradov <public@sourcemage.org> * DEPENDS: overhauled, used the ffmped DEPENDS as basis |