mirror of
https://github.com/mpv-player/mpv
synced 2025-01-02 04:42:10 +00:00
fixed shmem size, and now compiles without divx4linux too :)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1353 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
66f154a7a1
commit
56c90f5349
11
dec_video.c
11
dec_video.c
@ -176,6 +176,10 @@ switch(sh_video->codec->driver){
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case 7: { // DivX4Linux
|
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");
|
if(verbose) printf("DivX4Linux video codec\n");
|
||||||
{ DEC_PARAM dec_param;
|
{ DEC_PARAM dec_param;
|
||||||
DEC_SET dec_set;
|
DEC_SET dec_set;
|
||||||
@ -199,11 +203,12 @@ switch(sh_video->codec->driver){
|
|||||||
decore(0x123, DEC_OPT_INIT, &dec_param, NULL);
|
decore(0x123, DEC_OPT_INIT, &dec_param, NULL);
|
||||||
dec_set.postproc_level = divx_quality;
|
dec_set.postproc_level = divx_quality;
|
||||||
decore(0x123, DEC_OPT_SETPP, &dec_set, NULL);
|
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(((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(dec_param.x_dim*dec_param.y_dim*5);
|
||||||
}
|
}
|
||||||
if(verbose) printf("INFO: OpenDivX video codec init OK!\n");
|
if(verbose) printf("INFO: OpenDivX video codec init OK!\n");
|
||||||
break;
|
break;
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
case 5: { // FFmpeg's libavcodec
|
case 5: { // FFmpeg's libavcodec
|
||||||
#ifndef USE_LIBAVCODEC
|
#ifndef USE_LIBAVCODEC
|
||||||
@ -307,6 +312,7 @@ switch(sh_video->codec->driver){
|
|||||||
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
#ifdef NEW_DECORE
|
||||||
case 7: {
|
case 7: {
|
||||||
// DivX4Linux
|
// DivX4Linux
|
||||||
unsigned int t=GetTimer();
|
unsigned int t=GetTimer();
|
||||||
@ -342,6 +348,7 @@ switch(sh_video->codec->driver){
|
|||||||
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
#ifdef USE_DIRECTSHOW
|
#ifdef USE_DIRECTSHOW
|
||||||
case 4: { // W32/DirectShow
|
case 4: { // W32/DirectShow
|
||||||
unsigned int t=GetTimer();
|
unsigned int t=GetTimer();
|
||||||
|
Loading…
Reference in New Issue
Block a user