diff --git a/patches/mfplat-streaming-support/0025-mfplat-Add-I420-format-information.patch b/patches/mfplat-streaming-support/0025-mfplat-Add-I420-format-information.patch deleted file mode 100644 index a5b3394e..00000000 --- a/patches/mfplat-streaming-support/0025-mfplat-Add-I420-format-information.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 9e07d838ba606bebe8cd0f902a8bb0e00adf37bc Mon Sep 17 00:00:00 2001 -From: Derek Lesho -Date: Fri, 1 May 2020 11:46:26 -0500 -Subject: [PATCH 25/45] mfplat: Add I420 format information. - -Signed-off-by: Derek Lesho ---- - dlls/mfplat/mediatype.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c -index f3895ca4d49..d8be5b1bff2 100644 ---- a/dlls/mfplat/mediatype.c -+++ b/dlls/mfplat/mediatype.c -@@ -2628,6 +2628,7 @@ static const struct uncompressed_video_format video_formats[] = - { &MFVideoFormat_A2R10G10B10, 4, 3, 1, 0 }, - { &MFVideoFormat_RGB8, 1, 3, 1, 0 }, - { &MFVideoFormat_L8, 1, 3, 1, 0 }, -+ { &MFVideoFormat_I420, 1, 0, 0, 1 }, - { &MFVideoFormat_AYUV, 4, 3, 0, 1 }, - { &MFVideoFormat_I420, 1, 0, 0, 1 }, - { &MFVideoFormat_IMC1, 2, 3, 0, 1 }, --- -2.28.0 - diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 7ee09736..d85cde61 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -51,7 +51,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "86e6c0bc28177a3794950fe2a13b8208400b6194" + echo "764a93f121c6b0f88c3444454ebb85eb7cb63295" } # Show version information @@ -2700,13 +2700,12 @@ fi # | # | Modified files: # | * dlls/mf/Makefile.in, dlls/mf/handler.c, dlls/mf/handler.h, dlls/mf/main.c, dlls/mf/session.c, dlls/mf/tests/mf.c, -# | dlls/mf/topology.c, dlls/mfplat/mediatype.c, dlls/mfplat/tests/mfplat.c, dlls/mfplat/tests/test.mp4, -# | dlls/mfreadwrite/reader.c, dlls/mfreadwrite/tests/mfplat.c, dlls/mfreadwrite/tests/resource.rc, -# | dlls/mfreadwrite/tests/test.mp4, dlls/winegstreamer/Makefile.in, dlls/winegstreamer/audioconvert.c, -# | dlls/winegstreamer/colorconvert.c, dlls/winegstreamer/gst_cbs.c, dlls/winegstreamer/gst_cbs.h, -# | dlls/winegstreamer/gst_private.h, dlls/winegstreamer/main.c, dlls/winegstreamer/media_source.c, -# | dlls/winegstreamer/mf_decode.c, dlls/winegstreamer/mfplat.c, dlls/winegstreamer/winegstreamer_classes.idl, -# | include/mfidl.idl, tools/make_makefiles, tools/makedep.c +# | dlls/mf/topology.c, dlls/mfplat/tests/mfplat.c, dlls/mfplat/tests/test.mp4, dlls/mfreadwrite/reader.c, +# | dlls/mfreadwrite/tests/mfplat.c, dlls/mfreadwrite/tests/resource.rc, dlls/mfreadwrite/tests/test.mp4, +# | dlls/winegstreamer/Makefile.in, dlls/winegstreamer/audioconvert.c, dlls/winegstreamer/colorconvert.c, +# | dlls/winegstreamer/gst_cbs.c, dlls/winegstreamer/gst_cbs.h, dlls/winegstreamer/gst_private.h, dlls/winegstreamer/main.c, +# | dlls/winegstreamer/media_source.c, dlls/winegstreamer/mf_decode.c, dlls/winegstreamer/mfplat.c, +# | dlls/winegstreamer/winegstreamer_classes.idl, include/mfidl.idl, tools/make_makefiles, tools/makedep.c # | if test "$enable_mfplat_streaming_support" -eq 1; then patch_apply mfplat-streaming-support/0001-winegstreamer-Add-IMFSeekInfo-GetNearestKeyFrames-st.patch @@ -2733,7 +2732,6 @@ if test "$enable_mfplat_streaming_support" -eq 1; then patch_apply mfplat-streaming-support/0022-WMV.patch patch_apply mfplat-streaming-support/0023-mf-Ask-for-more-samples-from-upstream-node-when-upon.patch patch_apply mfplat-streaming-support/0024-Expose-PCM-output-type-on-AAC-decoder.patch - patch_apply mfplat-streaming-support/0025-mfplat-Add-I420-format-information.patch patch_apply mfplat-streaming-support/0026-winegstreamer-Implement-Color-Converter-MFT.patch patch_apply mfplat-streaming-support/0027-HACK-Set-BPS-to-16-for-output-template.patch patch_apply mfplat-streaming-support/0028-Improve-tests.patch diff --git a/staging/upstream-commit b/staging/upstream-commit index 16f39d30..107c5c27 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -86e6c0bc28177a3794950fe2a13b8208400b6194 +764a93f121c6b0f88c3444454ebb85eb7cb63295