[Performous-commit] Vincent Le Ligeour : Removed padding on height since padding on width seems enough

[Lasse Kärkkäi. <tr...@us...>]

Module: performous
Branch: opengl2
Commit: c0a2346959c8656655f3ed4d1526de80d8fbd306

Author: Vincent Le Ligeour <yo...@us...>
Date:   Thu Dec 23 15:40:51 2010 +0100

Removed padding on height since padding on width seems enough

---

 game/ffmpeg.cc |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/game/ffmpeg.cc b/game/ffmpeg.cc
index 58c4f0b..30739c6 100644
--- a/game/ffmpeg.cc
+++ b/game/ffmpeg.cc
@@ -102,7 +102,7 @@ void FFmpeg::open() {
 	// Setup software scaling context for YUV to RGB conversion
 	if (videoStream != -1 && decodeVideo) {
 		width = (pVideoCodecCtx->width+15)&~15;
-		height = (pVideoCodecCtx->height+15)&~15;
+		height = pVideoCodecCtx->height;
 		img_convert_ctx = sws_getContext(
 		  pVideoCodecCtx->width, pVideoCodecCtx->height, pVideoCodecCtx->pix_fmt,
 		  width, height, PIX_FMT_RGB24,
@@ -243,7 +243,7 @@ void FFmpeg::decodeNextFrame() {
 				if (frameFinished) {
 					// Convert into RGB and scale the data
 					int w = (pVideoCodecCtx->width+15)&~15;
-					int h = (pVideoCodecCtx->height+15)&~15;
+					int h = pVideoCodecCtx->height;
 					std::vector<uint8_t> buffer(w * h * 3);
 					{
 						uint8_t* data = &buffer[0];