Skip to content

Commit bb92a9f

Browse files
committed
Revert "Debug, ffmpeg7 only"
This reverts commit ccd0cb5.
1 parent 999757a commit bb92a9f

File tree

3 files changed

+5
-8
lines changed

3 files changed

+5
-8
lines changed

.github/workflows/linux_cuda_wheel.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,7 @@ jobs:
6868
python-version: ['3.9']
6969
cuda-version: ['11.8', '12.6', '12.8']
7070
# TODO: put back ffmpeg 5 https://github.com/pytorch/torchcodec/issues/325
71-
# ffmpeg-version-for-tests: ['4.4.2', '6', '7']
72-
ffmpeg-version-for-tests: ['7'] # TODO
71+
ffmpeg-version-for-tests: ['4.4.2', '6', '7']
7372

7473
container:
7574
image: "pytorch/manylinux2_28-builder:cuda${{ matrix.cuda-version }}"

.github/workflows/linux_wheel.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,7 @@ jobs:
6262
fail-fast: false
6363
matrix:
6464
python-version: ['3.9']
65-
# ffmpeg-version-for-tests: ['4.4.2', '5.1.2', '6.1.1', '7.0.1']
66-
ffmpeg-version-for-tests: ['7.0.1'] # TODO
65+
ffmpeg-version-for-tests: ['4.4.2', '5.1.2', '6.1.1', '7.0.1']
6766
needs: build
6867
steps:
6968
- uses: actions/download-artifact@v4

src/torchcodec/decoders/_core/CMakeLists.txt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,10 @@ if(DEFINED ENV{BUILD_AGAINST_ALL_FFMPEG_FROM_S3})
7878
)
7979

8080

81-
# TODO
82-
# make_torchcodec_library(libtorchcodec4 ffmpeg4)
81+
make_torchcodec_library(libtorchcodec4 ffmpeg4)
8382
make_torchcodec_library(libtorchcodec7 ffmpeg7)
84-
# make_torchcodec_library(libtorchcodec6 ffmpeg6)
85-
# make_torchcodec_library(libtorchcodec5 ffmpeg5)
83+
make_torchcodec_library(libtorchcodec6 ffmpeg6)
84+
make_torchcodec_library(libtorchcodec5 ffmpeg5)
8685

8786
else()
8887
message(

0 commit comments

Comments
 (0)