[MPlayer-cvslog] r36168 - trunk/libmpcodecs/vd.c

[reimar]

Author: reimar
Date: Fri Apr  5 16:21:40 2013
New Revision: 36168

Log:
Do not try with scale filter etc. when the format is a HWACCEL format.

Modified:
   trunk/libmpcodecs/vd.c

Modified: trunk/libmpcodecs/vd.c
==============================================================================
--- trunk/libmpcodecs/vd.c	Fri Apr  5 15:46:51 2013	(r36167)
+++ trunk/libmpcodecs/vd.c	Fri Apr  5 16:21:40 2013	(r36168)
@@ -223,7 +223,7 @@ int mpcodecs_config_vo(sh_video_t *sh, i
                 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 @@ int mpcodecs_config_vo(sh_video_t *sh, i
                 vf_uninit_filter(vp);
             }
         }
+    }
+    if (j < 0) {
         mp_msg(MSGT_CPLAYER, MSGL_WARN, MSGTR_VOincompCodec);
         sh->vf_initialized = -1;
         return 0;               // failed