diff options
| author |  arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-07-20 00:00:08 +0000 |
|---|---|---|
| committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-07-20 00:00:08 +0000 |
| commit | 56c90f534975a3bb9cab5c0b1abda9010f0c50c1 (patch) | |
| tree | 83c0fa36b5347693fb5ff0bc73a4d7b9a5bfcf20 | |
| parent | 66f154a7a13d008f59f5c441349d115e41fa4f26 (diff) | |
fixed shmem size, and now compiles without divx4linux too :)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1353 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | dec_video.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/dec_video.c b/dec_video.c index c781c83ad2..28e5f27d76 100644 --- a/dec_video.c +++ b/dec_video.c @@ -176,6 +176,10 @@ switch(sh_video->codec->driver){ 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 @@ switch(sh_video->codec->driver){ 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 @@ switch(sh_video->codec->driver){ break; } +#ifdef NEW_DECORE case 7: { // DivX4Linux unsigned int t=GetTimer(); @@ -342,6 +348,7 @@ switch(sh_video->codec->driver){ break; } +#endif #ifdef USE_DIRECTSHOW case 4: { // W32/DirectShow unsigned int t=GetTimer(); |