Mercurial > mplayer.hg

changeset 36074:fbbf13706c50

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Do not try with scale filter etc. when the format is a HWACCEL format.
author reimar
date Fri, 05 Apr 2013 14:21:40 +0000
parents 01f4eea55d75
children b14ea6320969
files libmpcodecs/vd.c
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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