From a7a93fddf1a471c15c85aefb77285971f59262e3 Mon Sep 17 00:00:00 2001
From: "William F. Broderick" <billbrod@gmail.com>
Date: Thu, 8 Feb 2024 16:06:18 -0500
Subject: [PATCH] install ffmpeg via conda instead of action

---
 .github/workflows/tests.yml | 2 --
 environment.yml             | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 4185de8..60d5112 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -51,8 +51,6 @@ jobs:
           conda install -n base mamba
           conda clean --all -y
           mamba env create -f environment.yml
-      - name: Setup FFmpeg
-        uses: FedericoCarboni/setup-ffmpeg@v2
       - name: Download data
         run: |
           mkdir -p data/metamers/ref_images/
diff --git a/environment.yml b/environment.yml
index 3f26a07..562d9f5 100644
--- a/environment.yml
+++ b/environment.yml
@@ -8,6 +8,7 @@ channels:
 dependencies:
   - python>=3.7
   - pip
+  - ffmpeg
   - ipykernel
   - scipy>=1.6
   - seaborn>=0.11