Add mjpeg2jpeg bitstream filter

Vita3K · Jun 21, 2023 · 2cea5cd · 2cea5cd
1 parent f643d93
commit 2cea5cd
Show file tree

Hide file tree

Showing 23 changed files with 3 additions and 2 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -46,7 +46,7 @@ jobs:
         run: |
           (cd ${{ matrix.vcpkg-root }} && git fetch origin)
           (cd ${{ matrix.vcpkg-root }} && git reset --hard)
-          (cd ${{ matrix.vcpkg-root }} && git checkout 217194cea7e3491c14779c763beec50b6a4575d6)
+          (cd ${{ matrix.vcpkg-root }} && git checkout f6a5d4e8eb7476b8d7fc12a56dff300c1c986131)
           (cd ${{ matrix.vcpkg-root }} && git apply --ignore-space-change --ignore-whitespace --3way ${{ github.workspace }}/ffmpeg.patch)
 
       - name: Build ffmpeg

diff --git a/ffmpeg.patch b/ffmpeg.patch
@@ -2,7 +2,7 @@ diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake
 index 35bac875b..5137c69be 100644
 --- a/ports/ffmpeg/portfile.cmake
 +++ b/ports/ffmpeg/portfile.cmake
-@@ -42,7 +42,19 @@ else()
+@@ -42,7 +42,20 @@ else()
      set(LIB_PATH_VAR "LIBRARY_PATH")
  endif()
 
@@ -19,6 +19,7 @@ index 35bac875b..5137c69be 100644
 +string(APPEND OPTIONS " --enable-demuxer=h264 --enable-demuxer=m4v --enable-demuxer=mp3 --enable-demuxer=mpegvideo --enable-demuxer=mpegps --enable-demuxer=mjpeg --enable-demuxer=mov --enable-demuxer=avi --enable-demuxer=aac --enable-demuxer=pmp --enable-demuxer=oma --enable-demuxer=pcm_s16le --enable-demuxer=pcm_s8 --enable-demuxer=wav")
 +string(APPEND OPTIONS " --enable-parser=h264 --enable-parser=mpeg4video --enable-parser=mpegaudio --enable-parser=mpegvideo --enable-parser=mjpeg --enable-parser=aac --enable-parser=aac_latm")
 +string(APPEND OPTIONS " --enable-protocol=file")
++string(APPEND OPTIONS " --enable-bsf=mjpeg2jpeg")
 +string(APPEND OPTIONS " --enable-indev=dshow")
 
  if(VCPKG_TARGET_IS_WINDOWS)

diff --git a/lib/linux/x86_64/libavcodec.a b/lib/linux/x86_64/libavcodec.a
diff --git a/lib/linux/x86_64/libavdevice.a b/lib/linux/x86_64/libavdevice.a
diff --git a/lib/linux/x86_64/libavfilter.a b/lib/linux/x86_64/libavfilter.a
diff --git a/lib/linux/x86_64/libavformat.a b/lib/linux/x86_64/libavformat.a
diff --git a/lib/linux/x86_64/libavutil.a b/lib/linux/x86_64/libavutil.a
diff --git a/lib/linux/x86_64/libswresample.a b/lib/linux/x86_64/libswresample.a
diff --git a/lib/linux/x86_64/libswscale.a b/lib/linux/x86_64/libswscale.a
diff --git a/lib/macos/x86_64/libavcodec.a b/lib/macos/x86_64/libavcodec.a
diff --git a/lib/macos/x86_64/libavdevice.a b/lib/macos/x86_64/libavdevice.a
diff --git a/lib/macos/x86_64/libavfilter.a b/lib/macos/x86_64/libavfilter.a
diff --git a/lib/macos/x86_64/libavformat.a b/lib/macos/x86_64/libavformat.a
diff --git a/lib/macos/x86_64/libavutil.a b/lib/macos/x86_64/libavutil.a
diff --git a/lib/macos/x86_64/libswresample.a b/lib/macos/x86_64/libswresample.a
diff --git a/lib/macos/x86_64/libswscale.a b/lib/macos/x86_64/libswscale.a
diff --git a/lib/windows/x86_64/avcodec.lib b/lib/windows/x86_64/avcodec.lib
diff --git a/lib/windows/x86_64/avdevice.lib b/lib/windows/x86_64/avdevice.lib
diff --git a/lib/windows/x86_64/avfilter.lib b/lib/windows/x86_64/avfilter.lib
diff --git a/lib/windows/x86_64/avformat.lib b/lib/windows/x86_64/avformat.lib
diff --git a/lib/windows/x86_64/avutil.lib b/lib/windows/x86_64/avutil.lib
diff --git a/lib/windows/x86_64/swresample.lib b/lib/windows/x86_64/swresample.lib
diff --git a/lib/windows/x86_64/swscale.lib b/lib/windows/x86_64/swscale.lib