Mercurial > mplayer.hg

changeset 34512:01c1e065120e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Support 32-bit sunrast playback via FFmpeg.
author cehoyos
date Tue, 24 Jan 2012 18:53:23 +0000
parents 169789211ed9
children d2d5369f1d16
files etc/codecs.conf fmt-conversion.c
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/etc/codecs.conf	Tue Jan 24 18:39:51 2012 +0000
+++ b/etc/codecs.conf	Tue Jan 24 18:53:23 2012 +0000
@@ -654,7 +654,7 @@
   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"
--- a/fmt-conversion.c	Tue Jan 24 18:39:51 2012 +0000
+++ b/fmt-conversion.c	Tue Jan 24 18:53:23 2012 +0000
@@ -61,6 +61,8 @@
 //     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},