[MPlayer-cvslog] r37883 - in trunk: Changelog codec-cfg.c etc/codecs.conf

[rtogni]

Author: rtogni
Date: Mon Aug  8 00:17:13 2016
New Revision: 37883

Log:
Add FFmpeg IFF decoders

Video:  ANIM
Image: ILBM, PBM, RGB8, RGBN

Modified:
   trunk/Changelog
   trunk/codec-cfg.c
   trunk/etc/codecs.conf

Modified: trunk/Changelog
==============================================================================
--- trunk/Changelog	Sun Aug  7 23:44:47 2016	(r37882)
+++ trunk/Changelog	Mon Aug  8 00:17:13 2016	(r37883)
@@ -13,6 +13,7 @@ MPlayer
     * FFmpeg audio decoders: g721, g732
     * FFmpeg video decoders: more Matrox mpeg2 formats (M702-3-4-5), Truemotion
       RT, Matrox Uncompressed SD/HD
+    * FFmpeg IFF video/image decoders: ANIM, ILBM, PBM, RGB8, RGBN
 
     Fixes:
     * fix more issues reported by Coverity

Modified: trunk/codec-cfg.c
==============================================================================
--- trunk/codec-cfg.c	Sun Aug  7 23:44:47 2016	(r37882)
+++ trunk/codec-cfg.c	Mon Aug  8 00:17:13 2016	(r37883)
@@ -231,6 +231,7 @@ static const struct {
     {"BGR4",        IMGFMT_BGR4},
     {"BGR8",        IMGFMT_BGR8},
     {"BGR15LE",     IMGFMT_BGR15LE},
+    {"BGR12",       IMGFMT_BGR12},
     {"BGR15",       IMGFMT_BGR15},
     {"BGR16",       IMGFMT_BGR16},
     {"BGR24",       IMGFMT_BGR24},

Modified: trunk/etc/codecs.conf
==============================================================================
--- trunk/etc/codecs.conf	Sun Aug  7 23:44:47 2016	(r37882)
+++ trunk/etc/codecs.conf	Mon Aug  8 00:17:13 2016	(r37883)
@@ -9,6 +9,17 @@ release 20111012
 ;                   VIDEO CODECS
 ;=============================================================================
 
+videocodec ffiff
+  info "FFmpeg IFF ANIM/ILBM/PBM/RGB8/RGBN"
+  status working
+  fourcc ANIM
+  fourcc ILBM,
+  fourcc "PBM "
+  fourcc RGB8,RGBN
+  driver ffmpeg
+  dll iff
+  out BGR8,BGR32,Y8,RGBA,BGR12
+
 videocodec ffanm
   info "FFmpeg Deluxe Paint Animation"
   status working