diff options
| author | melanson <melanson@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-02-10 01:23:36 +0000 |
|---|---|---|
| committer | melanson <melanson@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-02-10 01:23:36 +0000 |
| commit | b3cf29263b9fa75643621490d581d2db02860813 (patch) | |
| tree | c8dfbbaf1a36942515622b8338d22d73786b940f /dec_video.c | |
| parent | 00d399805667f38c9508b63345fed34b7f8c2131 (diff) | |
| download | mpv-b3cf29263b9fa75643621490d581d2db02860813.tar.bz2 mpv-b3cf29263b9fa75643621490d581d2db02860813.tar.xz | |
Fixed FILM demuxer so that it now plays (my) FILM files
correctly; modified Cinepak decoder in order to deal with the deviant CVID
data from FILM files
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4629 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'dec_video.c')
| -rw-r--r-- | dec_video.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/dec_video.c b/dec_video.c index f0468cd8ff..c96674ffdc 100644 --- a/dec_video.c +++ b/dec_video.c @@ -824,9 +824,14 @@ if( !(mpi->flags&MP_IMGFLAG_ALLOCATED) && !(mpi->flags&MP_IMGFLAG_DIRECT) ){ //-------------------- 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==IMGFMT_YUY2)?16:(out_fmt&255)); - blit_frame = 3; + if (in_size == 0) + 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_YUY2)?16:(out_fmt&255)); + blit_frame = 3; + } break; #ifdef USE_XANIM case VFM_XANIM: { |