[corsix-th] 01/03: drop fix-parameters-to-sws_scale.patch
Alexandre Detiste
detiste-guest at moszumanska.debian.org
Tue May 31 17:35:41 UTC 2016
This is an automated email from the git hooks/post-receive script.
detiste-guest pushed a commit to branch master
in repository corsix-th.
commit 28ecc4601350affad9e239661dfa6c31249acb3f
Author: Phil Morrell <debian at emorrp1.name>
Date: Sun Apr 17 01:28:31 2016 +0100
drop fix-parameters-to-sws_scale.patch
Applied-Upstream: v0.60-beta1, commit:4ae56e1
---
debian/patches/fix-parameters-to-sws_scale.patch | 20 --------------------
debian/patches/series | 1 -
2 files changed, 21 deletions(-)
diff --git a/debian/patches/fix-parameters-to-sws_scale.patch b/debian/patches/fix-parameters-to-sws_scale.patch
deleted file mode 100644
index 62d6e5a..0000000
--- a/debian/patches/fix-parameters-to-sws_scale.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Subject: Fix parameters to sws_scale
-Author: "Stephen E. Baker" <baker.stephen.e at gmail.com>
-From: 4ae56e100911c1763cb9fd9a4b8647e323ecc032
-Last-Update: Wed, 18 Nov 2015 21:16:33 -0500
-
-Was passing destination height instead of source height, leading to segfaults
-
-Index: corsix-th/CorsixTH/Src/th_movie.cpp
-===================================================================
---- corsix-th.orig/CorsixTH/Src/th_movie.cpp
-+++ corsix-th/CorsixTH/Src/th_movie.cpp
-@@ -285,7 +285,7 @@ int THMoviePictureBuffer::write(AVFrame*
- avpicture_fill((AVPicture *)pFrameRGB, buffer, pMoviePicture->m_pixelFormat, pMoviePicture->m_iWidth, pMoviePicture->m_iHeight);
-
- /* Rescale the frame data and convert it to RGB24. */
-- sws_scale(m_pSwsContext, pFrame->data, pFrame->linesize, 0, pMoviePicture->m_iHeight, pFrameRGB->data, pFrameRGB->linesize);
-+ sws_scale(m_pSwsContext, pFrame->data, pFrame->linesize, 0, pFrame->height, pFrameRGB->data, pFrameRGB->linesize);
-
- /* Upload it to the texture we render from - note that this works because our OpenGL context shares texture namespace with the main threads' context. */
- SDL_UpdateTexture(pMoviePicture->m_pTexture, NULL, buffer, pMoviePicture->m_iWidth * 3);
diff --git a/debian/patches/series b/debian/patches/series
index 9a51f49..f52af59 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
lua.patch
-fix-parameters-to-sws_scale.patch
default_config.patch
use-AVPixelFormat-and-related.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/corsix-th.git
More information about the Pkg-games-commits
mailing list