- up to 0.99, still doesn't build with boost 1.70

[packages/vcmi.git] / ffmpeg3.patch

diff --git a/ffmpeg3.patch b/ffmpeg3.patch
deleted file mode 100644 (file)
index 919d31e..0000000
--- a/ffmpeg3.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff -ur vcmi-0.98.orig/client/CVideoHandler.cpp vcmi-0.98/client/CVideoHandler.cpp
---- vcmi-0.98.orig/client/CVideoHandler.cpp    2015-04-01 09:34:22.000000000 +0200
-+++ vcmi-0.98/client/CVideoHandler.cpp 2016-03-29 01:45:43.689696331 +0200
-@@ -155,7 +155,7 @@
-       }\r
- \r
-       // Allocate video frame\r
--      frame = avcodec_alloc_frame();\r
-+      frame = av_frame_alloc();\r
-       \r
-       //setup scaling\r
-       \r
-@@ -201,21 +201,21 @@
- #endif\r
-       { // Convert the image into YUV format that SDL uses\r
-               sws = sws_getContext(codecContext->width, codecContext->height, codecContext->pix_fmt, \r
--                                                       pos.w, pos.h, PIX_FMT_YUV420P, \r
-+                                                       pos.w, pos.h, AV_PIX_FMT_YUV420P, \r
-                                                        SWS_BICUBIC, nullptr, nullptr, nullptr);\r
-       }\r
-       else\r
-       {\r
- \r
--              PixelFormat screenFormat = PIX_FMT_NONE;\r
-+              AVPixelFormat screenFormat = AV_PIX_FMT_NONE;\r
-               if (screen->format->Bshift > screen->format->Rshift)\r
-               {\r
-                       // this a BGR surface\r
-                       switch (screen->format->BytesPerPixel)\r
-                       {\r
--                              case 2: screenFormat = PIX_FMT_BGR565; break;\r
--                              case 3: screenFormat = PIX_FMT_BGR24; break;\r
--                              case 4: screenFormat = PIX_FMT_BGR32; break;\r
-+                              case 2: screenFormat = AV_PIX_FMT_BGR565; break;\r
-+                              case 3: screenFormat = AV_PIX_FMT_BGR24; break;\r
-+                              case 4: screenFormat = AV_PIX_FMT_BGR32; break;\r
-                               default: return false;\r
-                       }\r
-               }\r
-@@ -224,9 +224,9 @@
-                       // this a RGB surface\r
-                       switch (screen->format->BytesPerPixel)\r
-                       {\r
--                              case 2: screenFormat = PIX_FMT_RGB565; break;\r
--                              case 3: screenFormat = PIX_FMT_RGB24; break;\r
--                              case 4: screenFormat = PIX_FMT_RGB32; break;\r
-+                              case 2: screenFormat = AV_PIX_FMT_RGB565; break;\r
-+                              case 3: screenFormat = AV_PIX_FMT_RGB24; break;\r
-+                              case 4: screenFormat = AV_PIX_FMT_RGB32; break;\r
-                               default: return false;\r
-                       }\r
-               }\r