Mercurial > mplayer.hg
changeset 1352:5ac130627602
fixed shmem size, and now compiles without divx4linux too :)
| author | arpi |
|---|---|
| date | Fri, 20 Jul 2001 00:00:08 +0000 |
| parents | d0d27f5800ea |
| children | c3e3b0ae4d06 |
| files | dec_video.c |
| diffstat | 1 files changed, 9 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/dec_video.c Thu Jul 19 23:40:33 2001 +0000 +++ b/dec_video.c Fri Jul 20 00:00:08 2001 +0000 @@ -176,6 +176,10 @@ break; } case 7: { // DivX4Linux +#ifndef NEW_DECORE + fprintf(stderr,"MPlayer was compiled WITHOUT DivX4Linux (libdivxdecore.so) support!\n"); + return 0; //exit(1); +#else if(verbose) printf("DivX4Linux video codec\n"); { DEC_PARAM dec_param; DEC_SET dec_set; @@ -199,11 +203,12 @@ decore(0x123, DEC_OPT_INIT, &dec_param, NULL); dec_set.postproc_level = divx_quality; decore(0x123, DEC_OPT_SETPP, &dec_set, NULL); -// sh_video->our_out_buffer = shmem_alloc(((bits*dec_param.x_dim+7)/8)*dec_param.y_dim); - sh_video->our_out_buffer = shmem_alloc(dec_param.x_dim*dec_param.y_dim*5); + sh_video->our_out_buffer = shmem_alloc(((bits*dec_param.x_dim+7)/8)*dec_param.y_dim); +// sh_video->our_out_buffer = shmem_alloc(dec_param.x_dim*dec_param.y_dim*5); } if(verbose) printf("INFO: OpenDivX video codec init OK!\n"); break; +#endif } case 5: { // FFmpeg's libavcodec #ifndef USE_LIBAVCODEC @@ -307,6 +312,7 @@ break; } +#ifdef NEW_DECORE case 7: { // DivX4Linux unsigned int t=GetTimer(); @@ -342,6 +348,7 @@ break; } +#endif #ifdef USE_DIRECTSHOW case 4: { // W32/DirectShow unsigned int t=GetTimer();