Skip to content

Commit 67b060e

Browse files
saturnskyAniLeo
authored andcommitted
Add mjpeg2jpeg bitstream filter
1 parent b5334d0 commit 67b060e

23 files changed

+3
-2
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
run: |
4747
(cd ${{ matrix.vcpkg-root }} && git fetch origin)
4848
(cd ${{ matrix.vcpkg-root }} && git reset --hard)
49-
(cd ${{ matrix.vcpkg-root }} && git checkout 217194cea7e3491c14779c763beec50b6a4575d6)
49+
(cd ${{ matrix.vcpkg-root }} && git checkout f6a5d4e8eb7476b8d7fc12a56dff300c1c986131)
5050
(cd ${{ matrix.vcpkg-root }} && git apply --ignore-space-change --ignore-whitespace --3way ${{ github.workspace }}/ffmpeg.patch)
5151
5252
- name: Build ffmpeg

ffmpeg.patch

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake
22
index 35bac875b..5137c69be 100644
33
--- a/ports/ffmpeg/portfile.cmake
44
+++ b/ports/ffmpeg/portfile.cmake
5-
@@ -42,7 +42,19 @@ else()
5+
@@ -42,7 +42,20 @@ else()
66
set(LIB_PATH_VAR "LIBRARY_PATH")
77
endif()
88

@@ -19,6 +19,7 @@ index 35bac875b..5137c69be 100644
1919
+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")
2020
+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")
2121
+string(APPEND OPTIONS " --enable-protocol=file")
22+
+string(APPEND OPTIONS " --enable-bsf=mjpeg2jpeg")
2223
+string(APPEND OPTIONS " --enable-indev=dshow")
2324

2425
if(VCPKG_TARGET_IS_WINDOWS)

lib/linux/x86_64/libavcodec.a

58.9 KB
Binary file not shown.

lib/linux/x86_64/libavdevice.a

32 Bytes
Binary file not shown.

lib/linux/x86_64/libavfilter.a

80 Bytes
Binary file not shown.

lib/linux/x86_64/libavformat.a

152 Bytes
Binary file not shown.

lib/linux/x86_64/libavutil.a

168 Bytes
Binary file not shown.

lib/linux/x86_64/libswresample.a

32 Bytes
Binary file not shown.

lib/linux/x86_64/libswscale.a

80 Bytes
Binary file not shown.

lib/macos/x86_64/libavcodec.a

32.4 KB
Binary file not shown.

0 commit comments

Comments
 (0)