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 b4e96836e324a1e2d4fae3bafa693750a8f9c253 Author: Alexandre Detiste <[email protected]> Date: Sun Dec 6 22:03:37 2015 +0100 quilt refresh --- debian/patches/fix-parameters-to-sws_scale.patch | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/debian/patches/fix-parameters-to-sws_scale.patch b/debian/patches/fix-parameters-to-sws_scale.patch index d3bbee3..62d6e5a 100644 --- a/debian/patches/fix-parameters-to-sws_scale.patch +++ b/debian/patches/fix-parameters-to-sws_scale.patch @@ -5,9 +5,11 @@ Last-Update: Wed, 18 Nov 2015 21:16:33 -0500 Was passing destination height instead of source height, leading to segfaults ---- a/CorsixTH/Src/th_movie.cpp -+++ b/CorsixTH/Src/th_movie.cpp -@@ -283,7 +283,7 @@ int THMoviePictureBuffer::write(AVFrame* pFrame, double dPts) +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. */ @@ -15,4 +17,4 @@ Was passing destination height instead of source height, leading to segfaults + 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, nullptr, buffer, pMoviePicture->m_iWidth * 3); + SDL_UpdateTexture(pMoviePicture->m_pTexture, NULL, buffer, pMoviePicture->m_iWidth * 3); -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/corsix-th.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
