[MPlayer-cvslog] r35398 - in trunk: etc/codecs.conf libmpcodecs/dec_audio.c libmpcodecs/dec_video.c

[al]

Author: al
Date: Sat Nov 10 14:29:36 2012
New Revision: 35398

Log:
libmpcodecs: Only choose dummy codecs if forced

Allows dummy codecs to have status working while still not
being selected in cases where the user does not use -vc/-ac
to force particular codecs.

Additionally switch dummy codecs null and black to working now.

Modified:
   trunk/etc/codecs.conf
   trunk/libmpcodecs/dec_audio.c
   trunk/libmpcodecs/dec_video.c

Modified: trunk/etc/codecs.conf
==============================================================================
--- trunk/etc/codecs.conf	Sat Nov 10 14:29:26 2012	(r35397)
+++ trunk/etc/codecs.conf	Sat Nov 10 14:29:36 2012	(r35398)
@@ -4216,7 +4216,7 @@ videocodec ffrawy800
 
 videocodec null
   info "NULL codec (no decoding!)"
-  status crashing
+  status working
   comment "for unknown/unsupported codecs or testing"
   driver null
   flags dummy
@@ -4229,7 +4229,7 @@ videocodec null
 
 videocodec black
   info "black codec (no decoding just output black frames!)"
-  status crashing
+  status working
   comment "for unknown/unsupported codecs or testing"
   driver black
   flags dummy

Modified: trunk/libmpcodecs/dec_audio.c
==============================================================================
--- trunk/libmpcodecs/dec_audio.c	Sat Nov 10 14:29:26 2012	(r35397)
+++ trunk/libmpcodecs/dec_audio.c	Sat Nov 10 14:29:36 2012	(r35398)
@@ -221,6 +221,11 @@ static int init_audio(sh_audio_t *sh_aud
 		   sh_audio->codec->name, sh_audio->codec->drv);
 	    continue;
 	}
+	/* only allow dummy codecs if specified via -ac */
+	if (sh_audio->codec->flags & CODECS_FLAG_DUMMY && !codecname) {
+	    continue;
+	}
+
 	// it's available, let's try to init!
 	// init()
 	mp_msg(MSGT_DECAUDIO, MSGL_INFO, MSGTR_OpeningAudioDecoder,

Modified: trunk/libmpcodecs/dec_video.c
==============================================================================
--- trunk/libmpcodecs/dec_video.c	Sat Nov 10 14:29:26 2012	(r35397)
+++ trunk/libmpcodecs/dec_video.c	Sat Nov 10 14:29:36 2012	(r35398)
@@ -283,6 +283,11 @@ static int init_video(sh_video_t *sh_vid
                    sh_video->codec->name, sh_video->codec->drv);
             continue;
         }
+        /* only allow dummy codecs if specified via -vc */
+        if (sh_video->codec->flags & CODECS_FLAG_DUMMY && !codecname) {
+            continue;
+        }
+
         orig_w = sh_video->bih ? sh_video->bih->biWidth  : sh_video->disp_w;
         orig_h = sh_video->bih ? sh_video->bih->biHeight : sh_video->disp_h;
         sh_video->disp_w = orig_w;