summaryrefslogtreecommitdiffstats
path: root/dec_video.c
diff options
context:
space:
mode:
authorarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-03-02 23:43:23 +0000
committerarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-03-02 23:43:23 +0000
commit2abca4208c7ddeb4a494f7eb778de63f439df79c (patch)
tree5d8f2081535656748fd988cc83e45c336dd5c3e7 /dec_video.c
parent0fdb53c942f0c9ed3191be60dd792e7cf74581b9 (diff)
downloadmpv-2abca4208c7ddeb4a494f7eb778de63f439df79c.tar.bz2
mpv-2abca4208c7ddeb4a494f7eb778de63f439df79c.tar.xz
Cinepak decoder now use mp_image_t -> YV12 worx, others disabled
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4917 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'dec_video.c')
-rw-r--r--dec_video.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/dec_video.c b/dec_video.c
index 0e6e6f42b8..4be1e2c74b 100644
--- a/dec_video.c
+++ b/dec_video.c
@@ -156,11 +156,7 @@ void decode_cinepak(
void *context,
unsigned char *buf,
int size,
- unsigned char *frame,
- unsigned int width,
- unsigned int height,
- int bit_per_pixel,
- int stride);
+ mp_image_t *mpi);
void decode_cyuv(
unsigned char *buf,
@@ -865,9 +861,8 @@ switch(sh_video->codec->driver){
blit_frame = 0;
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_YV12)?12:(out_fmt==IMGFMT_YUY2)?16:(out_fmt&255), 0);
- blit_frame = 3;
+ decode_cinepak(sh_video->context, start, in_size, mpi);
+ blit_frame = 2;
}
break;
#ifdef USE_XANIM