summaryrefslogtreecommitdiffstats
path: root/libmpcodecs
diff options
context:
space:
mode:
authorarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-03-06 14:29:27 +0000
committerarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-03-06 14:29:27 +0000
commit6f4d10cea764cadce36724c1fb846d4ee06d4455 (patch)
treea114e8efd97962ebbbb064d37c9c66f0054d0e8d /libmpcodecs
parentee449c3839f426dd6c3e27178e95aa50d62e0ac5 (diff)
downloadmpv-6f4d10cea764cadce36724c1fb846d4ee06d4455.tar.bz2
mpv-6f4d10cea764cadce36724c1fb846d4ee06d4455.tar.xz
using new cinepak codec api
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4947 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
-rw-r--r--libmpcodecs/vd_cinepak.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/libmpcodecs/vd_cinepak.c b/libmpcodecs/vd_cinepak.c
index f4889acbe7..b2ce011eff 100644
--- a/libmpcodecs/vd_cinepak.c
+++ b/libmpcodecs/vd_cinepak.c
@@ -47,7 +47,8 @@ static void uninit(sh_video_t *sh){
//mp_image_t* mpcodecs_get_image(sh_video_t *sh, int mp_imgtype, int mp_imgflag, int w, int h);
-void decode_cinepak(void *context, unsigned char *buf, int size, unsigned char *frame, int width, int height, int bit_per_pixel, int stride_);
+//void decode_cinepak(void *context, unsigned char *buf, int size, unsigned char *frame, int width, int height, int bit_per_pixel, int stride_);
+void decode_cinepak(void *context, unsigned char *buf, int size, mp_image_t* mpi);
// decode a frame
static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags){
@@ -61,8 +62,10 @@ static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags){
return NULL;
}
- decode_cinepak(sh->context, data, len, mpi->planes[0], sh->disp_w, sh->disp_h,
- (mpi->flags&MP_IMGFLAG_YUV)?16:(mpi->imgfmt&255), mpi->stride[0]);
+// decode_cinepak(sh->context, data, len, mpi->planes[0], sh->disp_w, sh->disp_h,
+// (mpi->flags&MP_IMGFLAG_YUV)?16:(mpi->imgfmt&255), mpi->stride[0]);
+
+ decode_cinepak(sh->context, data, len, mpi);
return mpi;
}