diff options
Diffstat (limited to 'metadata/md5-cache/media-video/ffmpeg-4.2.1')
| -rw-r--r-- | metadata/md5-cache/media-video/ffmpeg-4.2.1 | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/metadata/md5-cache/media-video/ffmpeg-4.2.1 b/metadata/md5-cache/media-video/ffmpeg-4.2.1 index a8df70cf3ae3..2fa175cad5a0 100644 --- a/metadata/md5-cache/media-video/ffmpeg-4.2.1 +++ b/metadata/md5-cache/media-video/ffmpeg-4.2.1 @@ -12,5 +12,9 @@ REQUIRED_USE=cuda? ( video_cards_nvidia ) libv4l? ( v4l ) fftools_cws2fws? ( zli RESTRICT=gpl? ( openssl? ( bindist ) fdk? ( bindist ) libressl? ( bindist ) ) SLOT=0/56.58.58 SRC_URI=https://ffmpeg.org/releases/ffmpeg-4.2.1.tar.bz2 +<<<<<<< HEAD _eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +======= +_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +>>>>>>> next _md5_=ab000f3cf5d1825c97ba7e184bb5e644 |