diff options
| author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-03-09 22:07:22 +0000 |
|---|---|---|
| committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-03-09 22:07:22 +0000 |
| commit | a90bcf88e55f1ddb24476af0c42a403c97ae1247 (patch) | |
| tree | 9486227b0029fadde58c7209017fa674c025d15d /cinepak.c | |
| parent | c8f10dc2a838935a388b18362f4554240198e662 (diff) | |
| download | mpv-a90bcf88e55f1ddb24476af0c42a403c97ae1247.tar.bz2 mpv-a90bcf88e55f1ddb24476af0c42a403c97ae1247.tar.xz | |
x1!=mpi->width bug fixed... always trust in x1
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5009 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'cinepak.c')
| -rw-r--r-- | cinepak.c | 13 |
1 files changed, 7 insertions, 6 deletions
@@ -667,9 +667,10 @@ void (*cvid_v4)(mp_image_t *mpi, unsigned int x, unsigned int y, cvid_codebook * y_bottom += y1; top_size -= 12; x = 0; - if(x1 != (unsigned int)mpi->width) - mp_msg(MSGT_DECVIDEO, MSGL_WARN, "CVID: Warning x1 (%ld) != width (%d)\n", x1, mpi->width); -x1 = mpi->width; +// if(x1 != (unsigned int)mpi->width) +// mp_msg(MSGT_DECVIDEO, MSGL_WARN, "CVID: Warning x1 (%ld) != width (%d)\n", x1, mpi->width); + +//x1 = mpi->width; #if DBUG mp_msg(MSGT_DECVIDEO, MSGL_WARN, " %d) %04lx %04ld <%ld,%ld> <%ld,%ld> yt %ld %d\n", cur_strip, strip_id, top_size, x0, y0, x1, y1, y_bottom); @@ -782,7 +783,7 @@ x1 = mpi->width; } x += 4; - if(x >= (unsigned int)mpi->width) + if(x >= (unsigned int)x1) { x = 0; y += 4; @@ -832,7 +833,7 @@ x1 = mpi->width; mask >>= 1; x += 4; - if(x >= (unsigned int)mpi->width) + if(x >= (unsigned int)x1) { x = 0; y += 4; @@ -849,7 +850,7 @@ x1 = mpi->width; cvid_v1(mpi, x, y, v1_codebook + get_byte()); chunk_size--; x += 4; - if(x >= (unsigned int)mpi->width) + if(x >= (unsigned int)x1) { x = 0; y += 4; |