mirror/mpv
0
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2024-09-20 20:03:10 +02:00
Code

stride!=width*bpp support to cinepak decoder

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4882 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
arpi 2002-02-28 01:12:24 +00:00
parent 77f3ac91e6
commit 21f822b161
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cinepak.c
View File

@ -383,7 +383,7 @@ int i, x;
* bit_per_pixel - the number of bits per pixel allocated to the output
* frame (only 24 or 32 bpp are supported)
*/
void decode_cinepak(void *context, unsigned char *buf, int size, unsigned char *frame, int width, int height, int bit_per_pixel)
void decode_cinepak(void *context, unsigned char *buf, int size, unsigned char *frame, int width, int height, int bit_per_pixel, int stride_)
{
cinepak_info *cvinfo = (cinepak_info *)context;
cvid_codebook *v4_codebook, *v1_codebook, *codebook = NULL;
@ -429,7 +429,7 @@ void (*cvid_v4)(unsigned char *frm, unsigned char *end, int stride, cvid_codeboo
break;
}
frm_stride = width * bpp;
frm_stride = stride_ ? stride_ : width * bpp;
frm_ptr = frame;
frm_end = frm_ptr + width * height * bpp;

5
dec_video.c
View File

@ -159,7 +159,8 @@ void decode_cinepak(
unsigned char *frame,
int width,
int height,
int bit_per_pixel);
int bit_per_pixel,
int stride);
void decode_cyuv(
unsigned char *buf,
@ -865,7 +866,7 @@ switch(sh_video->codec->driver){
else
{
decode_cinepak(sh_video->context, start, in_size, sh_video->our_out_buffer,
sh_video->disp_w, sh_video->disp_h, (out_fmt==IMGFMT_YUY2)?16:(out_fmt&255));
sh_video->disp_w, sh_video->disp_h, (out_fmt==IMGFMT_YUY2)?16:(out_fmt&255), 0);
blit_frame = 3;
}
break;