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

[cehoyos]

Author: cehoyos
Date: Tue Jan 24 19:53:23 2012
New Revision: 34600

Log:
Support 32-bit sunrast playback via FFmpeg.

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

Modified: trunk/etc/codecs.conf
==============================================================================
--- trunk/etc/codecs.conf	Tue Jan 24 19:39:51 2012	(r34599)
+++ trunk/etc/codecs.conf	Tue Jan 24 19:53:23 2012	(r34600)
@@ -654,7 +654,7 @@ videocodec ffsunras
   fourcc "sun " ; sun is an internal MPlayer FOURCC
   driver ffmpeg
   dll sunrast
-  out BGR32,BGR24,BGR8,Y800,RGB32,RGB24,RGB8
+  out BGR24,BGR8,Y800,RGB24,RGBA,BGRA
 
 videocodec ffindeo3
   info "FFmpeg Intel Indeo 3.1/3.2"

Modified: trunk/fmt-conversion.c
==============================================================================
--- trunk/fmt-conversion.c	Tue Jan 24 19:39:51 2012	(r34599)
+++ trunk/fmt-conversion.c	Tue Jan 24 19:53:23 2012	(r34600)
@@ -61,6 +61,8 @@ static const struct {
 //     note that most other PIX_FMT values are enums
 #ifdef PIX_FMT_0RGB32
     {IMGFMT_BGR32,   PIX_FMT_0RGB32},
+    {IMGFMT_BGRA,    PIX_FMT_BGR0},
+    {IMGFMT_RGBA,    PIX_FMT_RGB0},
 #endif
 #if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51, 20, 1)
     {IMGFMT_GBR24P,  PIX_FMT_GBRP},