[MPlayer-cvslog] r37567 - in trunk: etc/codecs.conf fmt-conversion.c

[rtogni]

Author: rtogni
Date: Mon Dec 21 23:13:27 2015
New Revision: 37567

Log:
Support qtrle monocrome files

Modified:
   trunk/etc/codecs.conf
   trunk/fmt-conversion.c

Modified: trunk/etc/codecs.conf
==============================================================================
--- trunk/etc/codecs.conf	Mon Dec 21 21:53:45 2015	(r37566)
+++ trunk/etc/codecs.conf	Mon Dec 21 23:13:27 2015	(r37567)
@@ -878,7 +878,7 @@ videocodec ffqtrle
   format 0x20656C72 ; "rle "
   driver ffmpeg
   dll "qtrle"
-  out BGR32,RGB24,BGR15,BGR8
+  out BGR32,RGB24,BGR15,BGR8,RGB1
 
 videocodec ffrpza
  info "QuickTime Apple Video"

Modified: trunk/fmt-conversion.c
==============================================================================
--- trunk/fmt-conversion.c	Mon Dec 21 21:53:45 2015	(r37566)
+++ trunk/fmt-conversion.c	Mon Dec 21 23:13:27 2015	(r37567)
@@ -42,7 +42,7 @@ static const struct {
     { IMGFMT_BGR8,       AV_PIX_FMT_RGB8 },
     { IMGFMT_BGR4,       AV_PIX_FMT_RGB4 },
     { IMGFMT_BGR1,       AV_PIX_FMT_MONOBLACK },
-    { IMGFMT_RGB1,       AV_PIX_FMT_MONOBLACK },
+    { IMGFMT_RGB1,       AV_PIX_FMT_MONOWHITE },
     { IMGFMT_RG4B,       AV_PIX_FMT_BGR4_BYTE },
     { IMGFMT_BG4B,       AV_PIX_FMT_RGB4_BYTE },
     { IMGFMT_RGB48LE,    AV_PIX_FMT_RGB48LE },