mirror/mpv
0
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2024-09-20 20:03:10 +02:00
Code

-vfm should override status/priority

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7249 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
arpi 2002-09-02 22:19:44 +00:00
parent 49f2da7ee9
commit 5e8ff61bd9
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
mplayer.c
View File

@ -1238,7 +1238,7 @@ if(sh_audio){
break;
}
if(audio_codec && strcmp(sh_audio->codec->name,audio_codec)) continue;
else if(audio_fm && strcmp(sh_audio->codec->drv,audio_fm)) continue;
if(audio_fm && strcmp(sh_audio->codec->drv,audio_fm)) continue;
mp_msg(MSGT_CPLAYER,MSGL_INFO,"%s audio codec: [%s] afm:%s (%s)\n",
audio_codec?mp_gettext("Forcing"):mp_gettext("Detected"),sh_audio->codec->name,sh_audio->codec->drv,sh_audio->codec->info);
break;
@ -1295,13 +1295,16 @@ if(video_codec){
init_video(sh_video,video_codec,NULL,-1);
} else {
int status;
// try in stability order: UNTESTED, WORKING, BUGGY, BROKEN
if(video_fm) mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_TryForceVideoFmtStr,video_fm);
for(status=CODECS_STATUS__MAX;status>=CODECS_STATUS__MIN;--status){
if(video_fm) // try first the preferred codec family:
// try in stability order: UNTESTED, WORKING, BUGGY. never try CRASHING.
if(video_fm){
// try first the preferred codec family:
mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_TryForceVideoFmtStr,video_fm);
for(status=CODECS_STATUS__MAX;status>=CODECS_STATUS__MIN;--status)
if(init_video(sh_video,NULL,video_fm,status)) break;
if(init_video(sh_video,NULL,NULL,status)) break;
}
if(!sh_video->inited)
for(status=CODECS_STATUS__MAX;status>=CODECS_STATUS__MIN;--status)
if(init_video(sh_video,NULL,NULL,status)) break;
}
if(!sh_video->inited){
mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantFindVideoCodec,sh_video->format);