Rebase against b70f0d723a768b9fdc89cd835b23718f6cd61f31

patches/windowscodecs-GIF_Encoder/0009-gdiplus-Fix-a-typo-in-GIF-container-format-passed-to.patch

@@ -1,35 +0,0 @@
-From b20d8d374c84cd6fc2056c24b92832e9279ffaca Mon Sep 17 00:00:00 2001
-From: Dmitry Timoshkov <dmitry@baikal.ru>
-Date: Mon, 17 Oct 2016 15:23:39 +0800
-Subject: gdiplus: Fix a typo in GIF container format passed to
- encode_image_wic().
-
----
- dlls/gdiplus/image.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c
-index 80ad65f050d..5ff48f8131e 100644
---- a/dlls/gdiplus/image.c
-+++ b/dlls/gdiplus/image.c
-@@ -4579,7 +4579,7 @@ static GpStatus encode_image_jpeg(GpImage *image, IStream* stream,
- static GpStatus encode_image_gif(GpImage *image, IStream* stream,
-     GDIPCONST EncoderParameters* params)
- {
--    return encode_image_wic(image, stream, &CLSID_WICGifEncoder, params);
-+    return encode_image_wic(image, stream, &GUID_ContainerFormatGif, params);
- }
- 
- /*****************************************************************************
-@@ -4592,7 +4592,7 @@ GpStatus WINGDIPAPI GdipSaveImageToStream(GpImage *image, IStream* stream,
-     encode_image_func encode_image;
-     int i;
- 
--    TRACE("%p %p %p %p\n", image, stream, clsid, params);
-+    TRACE("%p %p %s %p\n", image, stream, wine_dbgstr_guid(clsid), params);
- 
-     if(!image || !stream)
-         return InvalidParameter;
--- 
-2.13.1
-