summaryrefslogtreecommitdiff
path: root/src/libxinevdec/rgb.c
diff options
context:
space:
mode:
authorMike Melanson <mike@multimedia.cx>2002-08-28 03:32:48 +0000
committerMike Melanson <mike@multimedia.cx>2002-08-28 03:32:48 +0000
commitd1606decedff8ef07319d9ea4830ececf69f62d0 (patch)
treebe6bc8b8ed1236513b6cf7fdbcaf028df4c79ef5 /src/libxinevdec/rgb.c
parent28280f2f9870a7854ffdd4bccd48bb62468ce6ee (diff)
downloadxine-lib-d1606decedff8ef07319d9ea4830ececf69f62d0.tar.gz
xine-lib-d1606decedff8ef07319d9ea4830ececf69f62d0.tar.bz2
revised palette conversion subsystem to make a little more sense
CVS patchset: 2539 CVS date: 2002/08/28 03:32:48
Diffstat (limited to 'src/libxinevdec/rgb.c')
-rw-r--r--src/libxinevdec/rgb.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/libxinevdec/rgb.c b/src/libxinevdec/rgb.c
index 3c6368ee0..7b01fcbb7 100644
--- a/src/libxinevdec/rgb.c
+++ b/src/libxinevdec/rgb.c
@@ -21,7 +21,7 @@
* Actually, this decoder just converts a raw RGB image to a YUY2 map
* suitable for display under xine.
*
- * $Id: rgb.c,v 1.3 2002/07/20 04:24:59 tmmm Exp $
+ * $Id: rgb.c,v 1.4 2002/08/28 03:37:17 tmmm Exp $
*/
#include <stdio.h>
@@ -162,9 +162,9 @@ static void rgb_decode_data (video_decoder_t *this_gen,
/* iterate through each row */
buf_ptr = 0;
- row_ptr = this->yuv_planes.row_stride *
+ row_ptr = this->yuv_planes.row_width *
(this->yuv_planes.row_count - 1);
- for (; row_ptr >= 0; row_ptr -= this->yuv_planes.row_stride) {
+ for (; row_ptr >= 0; row_ptr -= this->yuv_planes.row_width) {
for (pixel_ptr = 0; pixel_ptr < this->width; pixel_ptr++) {
if (this->bytes_per_pixel == 1) {
@@ -206,9 +206,6 @@ static void rgb_decode_data (video_decoder_t *this_gen,
}
}
-
- /* take care of the extra 2 pixels on the C lines */
- FINISH_LINE(this->yuv_planes, row_ptr);
}
yuv444_to_yuy2(&this->yuv_planes, img->base[0], img->pitches[0]);