mirror of
https://github.com/RPCS3/ffmpeg-core.git
synced 2025-04-14 12:31:01 +00:00
Add mjpeg2jpeg bitstream filter
This commit is contained in:
parent
b5334d0b5a
commit
67b060e11e
2
.github/workflows/build.yml
vendored
2
.github/workflows/build.yml
vendored
@ -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
|
||||
|
@ -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)
|
||||
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user