From 1fc39ff08c13eb835f16b8411a5bee6098faf4fe Mon Sep 17 00:00:00 2001 From: moto <855818+mthrok@users.noreply.github.com> Date: Fri, 27 Oct 2023 13:49:28 -0400 Subject: [PATCH 1/2] WIP: Update meta.yaml Update the dependency. Currently only Linux + conda ships FFmpeg integration. --- packaging/torchvision/meta.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/packaging/torchvision/meta.yaml b/packaging/torchvision/meta.yaml index 9adc13b558b..c50450d0f03 100644 --- a/packaging/torchvision/meta.yaml +++ b/packaging/torchvision/meta.yaml @@ -11,8 +11,7 @@ requirements: - {{ compiler('c') }} # [win] - libpng - libjpeg-turbo - # NOTE: The only ffmpeg version that we build is actually 4.2 - - ffmpeg >=4.2 # [not win] + - pytorch::ffmpeg >=4.2 # [linux] host: - python @@ -27,7 +26,7 @@ requirements: - numpy >=1.23.5 # [py >= 311] - requests - libpng - - ffmpeg >=4.2 # [not win] + - ffmpeg >=4.2 # [linux] - libjpeg-turbo - pillow >=5.3.0, !=8.3.* - pytorch-mutex 1.0 {{ build_variant }} # [not osx ] From 3938f4b8ea0a404101e02fb250b088de5a6309dc Mon Sep 17 00:00:00 2001 From: moto <855818+mthrok@users.noreply.github.com> Date: Mon, 30 Oct 2023 11:49:28 -0400 Subject: [PATCH 2/2] Update meta.yaml --- packaging/torchvision/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/torchvision/meta.yaml b/packaging/torchvision/meta.yaml index c50450d0f03..ba4fee5a767 100644 --- a/packaging/torchvision/meta.yaml +++ b/packaging/torchvision/meta.yaml @@ -11,7 +11,7 @@ requirements: - {{ compiler('c') }} # [win] - libpng - libjpeg-turbo - - pytorch::ffmpeg >=4.2 # [linux] + - ffmpeg >=4.2 # [linux] host: - python