From 386ab83ceb20650ce4e1d31c6f58f6c1d4e1dbeb Mon Sep 17 00:00:00 2001
From: reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Tue, 26 Jul 2005 10:11:56 +0000
Subject: Make it possible to use libavcodecs png decoder. Disable BGR output
 for binary wmv decoders, since these are slooow.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16099 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 etc/codecs.conf | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

(limited to 'etc')

diff --git a/etc/codecs.conf b/etc/codecs.conf
index c6c2ae117e..58b6343488 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -101,6 +101,15 @@ videocodec nuv
   driver nuv
   out I420,IYUV
 
+videocodec ffpng
+  info "FFmpeg PNG decoder"
+  status working
+  fourcc mpng,MPNG
+  fourcc "png " ; for PNG-encoded QuickTime files
+  driver ffmpeg
+  dll png
+  out BGR32,BGR24,BGR8,Y800,RGB32,RGB24,RGB8
+
 videocodec mpng
   info "PNG image decoder"
   status working
@@ -644,7 +653,7 @@ videocodec mpeg4ds
   dll "mpg4ds32.ax"
   guid 0x82CCD3E0, 0xF71A, 0x11D0, 0x9F, 0xE5, 0x00, 0x60, 0x97, 0x78, 0xEA, 0x66
   out YUY2
-  out BGR32,BGR24,BGR16,BGR15
+;  out BGR32,BGR24,BGR16,BGR15
 
 videocodec mpeg4
   info "Microsoft MPEG-4 v1/v2"
@@ -666,7 +675,7 @@ videocodec wmv8
   guid 0x521fb373, 0x7654, 0x49f2, 0xbd, 0xb1, 0x0c, 0x6e, 0x66, 0x60, 0x71, 0x4f
   out YV12,I420,IYUV
   out YUY2,UYVY
-  out BGR32,BGR24,BGR16,BGR15
+;  out BGR32,BGR24,BGR16,BGR15
 
 videocodec wmv7
   info "Windows Media Video 7"
@@ -676,7 +685,7 @@ videocodec wmv7
   dll "wmvds32.ax"
   guid 0x4facbba1, 0xffd8, 0x4cd7, 0x82, 0x28, 0x61, 0xe2, 0xf6, 0x5c, 0xb1, 0xae
   out YUY2,UYVY
-  out BGR32,BGR24,BGR16,BGR15
+;  out BGR32,BGR24,BGR16,BGR15
 
 videocodec wmv9dmo
   info "Windows Media Video 9 DMO"
@@ -688,7 +697,7 @@ videocodec wmv9dmo
   guid 0x724bb6a4, 0xe526, 0x450f, 0xaf, 0xfa, 0xab, 0x9b, 0x45, 0x12, 0x91, 0x11
   out YV12 ;,I420,IYUV
   out YUY2,UYVY
-  out BGR32,BGR24,BGR16 ;,BGR15
+;  out BGR32,BGR24,BGR16 ;,BGR15
 
 videocodec wmvdmo
   info "Windows Media Video DMO"
@@ -702,7 +711,7 @@ videocodec wmvdmo
   guid 0x82d353df, 0x90bd, 0x4382, 0x8b, 0xc2, 0x3f, 0x61, 0x92, 0xb7, 0x6e, 0x34
   out YV12 ;,I420,IYUV
   out YUY2,UYVY
-  out BGR32,BGR24,BGR16 ;,BGR15
+;  out BGR32,BGR24,BGR16 ;,BGR15
 
 videocodec wmvadmo
   info "Windows Media Video Adv DMO"
@@ -714,7 +723,7 @@ videocodec wmvadmo
   guid 0x03be3ac4, 0x84b7, 0x4e0e, 0xa7, 0x8d, 0xd3, 0x52, 0x4e, 0x60, 0x39, 0x5a
   out YV12 ;,I420,IYUV
   out YUY2,UYVY
-  out BGR32,BGR24,BGR16 ;,BGR15
+;  out BGR32,BGR24,BGR16 ;,BGR15
 
 videocodec wmsdmod
   info "Windows Media Screen Codec 2"
-- 
cgit v1.2.3