# HG changeset patch # User reimar # Date 1365171700 0 # Node ID fbbf13706c50ccd350637155e12c70a841719c53 # Parent 01f4eea55d751e31d6be2202eeca142d78068746 Do not try with scale filter etc. when the format is a HWACCEL format. diff -r 01f4eea55d75 -r fbbf13706c50 libmpcodecs/vd.c --- a/libmpcodecs/vd.c Fri Apr 05 13:46:51 2013 +0000 +++ b/libmpcodecs/vd.c Fri Apr 05 14:21:40 2013 +0000 @@ -223,7 +223,7 @@ palette = 1; } } - if (j < 0) { + if (j < 0 && !IMGFMT_IS_HWACCEL(preferred_outfmt)) { // TODO: no match - we should use conversion... if (strcmp(vf->info->name, "scale") && palette != -1) { mp_msg(MSGT_DECVIDEO, MSGL_INFO, MSGTR_CouldNotFindColorspace); @@ -264,6 +264,8 @@ vf_uninit_filter(vp); } } + } + if (j < 0) { mp_msg(MSGT_CPLAYER, MSGL_WARN, MSGTR_VOincompCodec); sh->vf_initialized = -1; return 0; // failed