RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-25 00:02:13 +00:00
Code Issues Releases Wiki Activity

x1!=mpi->width bug fixed... always trust in x1

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5009 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
arpi 2002-03-09 22:07:22 +00:00
parent c8f10dc2a8
commit a90bcf88e5
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cinepak.c
View File

@ -667,9 +667,10 @@ void (*cvid_v4)(mp_image_t *mpi, unsigned int x, unsigned int y, cvid_codebook *
y_bottom += y1; y_bottom += y1;
top_size -= 12; top_size -= 12;
x = 0; x = 0;
if(x1 != (unsigned int)mpi->width) // if(x1 != (unsigned int)mpi->width)
mp_msg(MSGT_DECVIDEO, MSGL_WARN, "CVID: Warning x1 (%ld) != width (%d)\n", x1, mpi->width); // mp_msg(MSGT_DECVIDEO, MSGL_WARN, "CVID: Warning x1 (%ld) != width (%d)\n", x1, mpi->width);
x1 = mpi->width;
//x1 = mpi->width;
#if DBUG #if DBUG
mp_msg(MSGT_DECVIDEO, MSGL_WARN, " %d) %04lx %04ld <%ld,%ld> <%ld,%ld> yt %ld %d\n", 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); cur_strip, strip_id, top_size, x0, y0, x1, y1, y_bottom);
@ -782,7 +783,7 @@ x1 = mpi->width;
} }
x += 4; x += 4;
if(x >= (unsigned int)mpi->width) if(x >= (unsigned int)x1)
{ {
x = 0; x = 0;
y += 4; y += 4;
@ -832,7 +833,7 @@ x1 = mpi->width;
mask >>= 1; mask >>= 1;
x += 4; x += 4;
if(x >= (unsigned int)mpi->width) if(x >= (unsigned int)x1)
{ {
x = 0; x = 0;
y += 4; y += 4;
@ -849,7 +850,7 @@ x1 = mpi->width;
cvid_v1(mpi, x, y, v1_codebook + get_byte()); cvid_v1(mpi, x, y, v1_codebook + get_byte());
chunk_size--; chunk_size--;
x += 4; x += 4;
if(x >= (unsigned int)mpi->width) if(x >= (unsigned int)x1)
{ {
x = 0; x = 0;
y += 4; y += 4;