diff options
author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-09-02 22:19:44 +0000 |
---|---|---|
committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-09-02 22:19:44 +0000 |
commit | 5e8ff61bd96bd0222bd242f259cce86e8078e9d0 (patch) | |
tree | 71c543228d2f2ada02ac2e72e7f6683551b89f63 /mplayer.c | |
parent | 49f2da7ee9325bf13411364311cac59cc2986c0e (diff) | |
download | mpv-5e8ff61bd96bd0222bd242f259cce86e8078e9d0.tar.bz2 mpv-5e8ff61bd96bd0222bd242f259cce86e8078e9d0.tar.xz |
-vfm should override status/priority
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7249 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mplayer.c')
-rw-r--r-- | mplayer.c | 15 |
1 files changed, 9 insertions, 6 deletions
@@ -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); |