summaryrefslogtreecommitdiffstats
path: root/dec_video.c
diff options
context:
space:
mode:
authorarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-12-21 16:39:54 +0000
committerarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-12-21 16:39:54 +0000
commitf7eadf849c6884e870b15d5b0a4799f72f2b6ce4 (patch)
tree1f2cb0a1ad09aabcbcb5aaf2ee28479cee7ed56e /dec_video.c
parent2741174c2cbc122e5791549f10e84aedaea3a69b (diff)
downloadmpv-f7eadf849c6884e870b15d5b0a4799f72f2b6ce4.tar.bz2
mpv-f7eadf849c6884e870b15d5b0a4799f72f2b6ce4.tar.xz
native opensourec Cinepak (CVID) codec by im Ferguson <timf@mail.csse.monash.edu.au>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3644 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'dec_video.c')
-rw-r--r--dec_video.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/dec_video.c b/dec_video.c
index 6c4559525b..0d2644e4a5 100644
--- a/dec_video.c
+++ b/dec_video.c
@@ -311,6 +311,13 @@ unsigned int out_fmt=sh_video->codec->outfmt[sh_video->outfmtidx];
sh_video->our_out_buffer=NULL;
switch(sh_video->codec->driver){
+ case VFM_CINEPAK: {
+ int bpp=((out_fmt&255)+7)/8;
+ sh_video->our_out_buffer =
+ (char*)memalign(64, sh_video->disp_w*sh_video->disp_h*bpp);
+ sh_video->context = decode_cinepak_init();
+ break;
+ }
case VFM_XANIM: {
#ifdef USE_XANIM
int ret=xacodec_init_video(sh_video,out_fmt);
@@ -555,6 +562,11 @@ unsigned int t2;
//-------------------- Decode a frame: -----------------------
switch(sh_video->codec->driver){
+ case VFM_CINEPAK:
+ decode_cinepak(sh_video->context, start, in_size, sh_video->our_out_buffer,
+ sh_video->disp_w, sh_video->disp_h, out_fmt&255);
+ blit_frame = 3;
+ break;
#ifdef USE_XANIM
case VFM_XANIM: {
xacodec_image_t* image=xacodec_decode_frame(start,in_size,drop_frame?1:0);