Skip to content

Commit 6194369

Browse files
atalmanmalfet
andauthored
[cherry-pick] Restrict ffmpeg to 4.2+.X versions to resolve linux conda build failures (#8607)
Co-authored-by: Nikita Shulga <2453524+malfet@users.noreply.github.com>
1 parent 5bada1f commit 6194369

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

packaging/torchvision/meta.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ requirements:
1111
- {{ compiler('c') }} # [win]
1212
- libpng
1313
- libjpeg-turbo
14-
- ffmpeg >=4.2 # [linux]
14+
- ffmpeg >=4.2.2, <5.0.0 # [linux]
1515

1616
host:
1717
- python
1818
- setuptools
1919
- pytorch-mutex 1.0 {{ build_variant }} # [not osx ]
20-
{{ environ.get('CONDA_PYTORCH_BUILD_CONSTRAINT') }}
20+
{{ environ.get('CONDA_PYTORCH_BUILD_CONSTRAINT', 'pytorch') }}
2121
{{ environ.get('CONDA_CUDATOOLKIT_CONSTRAINT', '') }}
2222

2323
run:
@@ -26,11 +26,11 @@ requirements:
2626
- numpy >=1.23.5 # [py >= 311]
2727
- requests
2828
- libpng
29-
- ffmpeg >=4.2 # [linux]
29+
- ffmpeg >=4.2.2, <5.0.0 # [linux]
3030
- libjpeg-turbo
3131
- pillow >=5.3.0, !=8.3.*
3232
- pytorch-mutex 1.0 {{ build_variant }} # [not osx ]
33-
{{ environ.get('CONDA_PYTORCH_CONSTRAINT') }}
33+
{{ environ.get('CONDA_PYTORCH_CONSTRAINT', 'pytorch') }}
3434
{{ environ.get('CONDA_CUDATOOLKIT_CONSTRAINT', '') }}
3535

3636
{% if build_variant == 'cpu' %}

0 commit comments

Comments
 (0)