Mercurial > mplayer.hg
comparison libmpcodecs/dec_video.c @ 22405:1b1761cbba3b
Discard earlier failure in building filter chain when trying a new codec.
Avoids an incorrect "FATAL: Could not initialize video filters (-vf) or video output (-vo)."
message in some rare cases.
author | reimar |
---|---|
date | Sat, 03 Mar 2007 16:59:39 +0000 |
parents | 8bf15e2ca61e |
children | af2ea92641a8 |
comparison
equal
deleted
inserted
replaced
22404:521cd55ab99b | 22405:1b1761cbba3b |
---|---|
255 sh_video->bih->biWidth = sh_video->disp_w; | 255 sh_video->bih->biWidth = sh_video->disp_w; |
256 sh_video->bih->biHeight = sh_video->disp_h; | 256 sh_video->bih->biHeight = sh_video->disp_h; |
257 } | 257 } |
258 // init() | 258 // init() |
259 mp_msg(MSGT_DECVIDEO,MSGL_INFO,MSGTR_OpeningVideoDecoder,mpvdec->info->short_name,mpvdec->info->name); | 259 mp_msg(MSGT_DECVIDEO,MSGL_INFO,MSGTR_OpeningVideoDecoder,mpvdec->info->short_name,mpvdec->info->name); |
260 // clear vf init error, it is no longer relevant | |
261 if (sh_video->vf_inited < 0) | |
262 sh_video->vf_inited = 0; | |
260 if(!mpvdec->init(sh_video)){ | 263 if(!mpvdec->init(sh_video)){ |
261 mp_msg(MSGT_DECVIDEO,MSGL_INFO,MSGTR_VDecoderInitFailed); | 264 mp_msg(MSGT_DECVIDEO,MSGL_INFO,MSGTR_VDecoderInitFailed); |
262 sh_video->disp_w=orig_w; | 265 sh_video->disp_w=orig_w; |
263 sh_video->disp_h=orig_h; | 266 sh_video->disp_h=orig_h; |
264 if (sh_video->bih) { | 267 if (sh_video->bih) { |