Put back everything except ffmpeg4

Author: NicolasHug

.github/workflows/cpp_tests.yaml

@@ -21,7 +21,9 @@ jobs:
       matrix:
         # TODO put back 6.1.1. See
         # https://github.com/pytorch/torchcodec/issues/518
-        ffmpeg-version-for-tests: ['4.4.2', '5.1.2', '7.0.1']
+        # TODO
+        # ffmpeg-version-for-tests: ['4.4.2', '5.1.2', '7.0.1']
+        ffmpeg-version-for-tests: ['5.1.2', '7.0.1']
     steps:
       - name: Check out repo
         uses: actions/checkout@v3

.github/workflows/linux_cuda_wheel.yaml

@@ -68,8 +68,8 @@ jobs:
         python-version: ['3.9']
         cuda-version: ['11.8', '12.6', '12.8']
         # TODO: put back ffmpeg 5 https://github.com/pytorch/torchcodec/issues/325
-        # ffmpeg-version-for-tests: ['4.4.2', '6', '7']
-        ffmpeg-version-for-tests: ['7']  # TODO
+        # TODO
+        ffmpeg-version-for-tests: ['6', '7']
 
     container:
       image: "pytorch/manylinux2_28-builder:cuda${{ matrix.cuda-version }}"

.github/workflows/linux_wheel.yaml

@@ -62,8 +62,9 @@ jobs:
       fail-fast: false
       matrix:
         python-version: ['3.9']
+        # TODO
         # ffmpeg-version-for-tests: ['4.4.2', '5.1.2', '6.1.1', '7.0.1']
-        ffmpeg-version-for-tests: ['7.0.1']  # TODO
+        ffmpeg-version-for-tests: ['5.1.2', '6.1.1', '7.0.1']
     needs: build
     steps:
       - uses: actions/download-artifact@v4

.github/workflows/macos_wheel.yaml

@@ -63,8 +63,9 @@ jobs:
       fail-fast: false
       matrix:
         python-version: ['3.9']
+        # TODO
         # ffmpeg-version-for-tests: ['4.4.2', '5.1.2', '6.1.1', '7.0.1']
-        ffmpeg-version-for-tests: ['7.0.1']  # TODO
+        ffmpeg-version-for-tests: ['5.1.2', '6.1.1', '7.0.1']
     needs: build
     steps:
       - name: Download wheel

src/torchcodec/decoders/_core/CMakeLists.txt

@@ -81,8 +81,8 @@ if(DEFINED ENV{BUILD_AGAINST_ALL_FFMPEG_FROM_S3})
     # TODO
 	# make_torchcodec_library(libtorchcodec4 ffmpeg4)
 	make_torchcodec_library(libtorchcodec7 ffmpeg7)
-	# make_torchcodec_library(libtorchcodec6 ffmpeg6)
-	# make_torchcodec_library(libtorchcodec5 ffmpeg5)
+	make_torchcodec_library(libtorchcodec6 ffmpeg6)
+	make_torchcodec_library(libtorchcodec5 ffmpeg5)
 
 else()
     message(