Mercurial > mplayer.hg

comparison dec_video.c @ 4937:5f3f768a7596

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
oops...changed the wrong codec's image type
author melanson
date Mon, 04 Mar 2002 06:10:43 +0000
parents 026329111b09
children f896676db962
comparison
equal deleted inserted replaced
4936:026329111b09 4937:5f3f768a7596
458 mp_image_setfmt(sh_video->image,out_fmt); 458 mp_image_setfmt(sh_video->image,out_fmt);
459 459
460 switch(sh_video->codec->driver){ 460 switch(sh_video->codec->driver){
461 case VFM_ROQVIDEO: 461 case VFM_ROQVIDEO:
462 #ifdef USE_MP_IMAGE 462 #ifdef USE_MP_IMAGE
463 sh_video->image->type=MP_IMGTYPE_STATIC; 463 sh_video->image->type=MP_IMGTYPE_IP;
464 #else 464 #else
465 sh_video->our_out_buffer_size = sh_video->disp_w * sh_video->disp_h * 1.5; 465 sh_video->our_out_buffer_size = sh_video->disp_w * sh_video->disp_h * 1.5;
466 sh_video->our_out_buffer = (char*)memalign(64, sh_video->our_out_buffer_size); 466 sh_video->our_out_buffer = (char*)memalign(64, sh_video->our_out_buffer_size);
467 #endif 467 #endif
468 sh_video->context = roq_decode_video_init(); 468 sh_video->context = roq_decode_video_init();
469 break; 469 break;
470 case VFM_CINEPAK: { 470 case VFM_CINEPAK: {
471 #ifdef USE_MP_IMAGE 471 #ifdef USE_MP_IMAGE
472 sh_video->image->type=MP_IMGTYPE_IP; 472 sh_video->image->type=MP_IMGTYPE_STATIC;
473 #else 473 #else
474 int bpp=((out_fmt&255)+7)/8; 474 int bpp=((out_fmt&255)+7)/8;
475 sh_video->our_out_buffer_size = sh_video->disp_w*sh_video->disp_h*bpp; 475 sh_video->our_out_buffer_size = sh_video->disp_w*sh_video->disp_h*bpp;
476 sh_video->our_out_buffer = (char*)memalign(64, sh_video->our_out_buffer_size); 476 sh_video->our_out_buffer = (char*)memalign(64, sh_video->our_out_buffer_size);
477 #endif 477 #endif