[MPlayer-cvslog] r36254 - trunk/libmpdemux/demuxer.c

[reimar]

Author: reimar
Date: Thu May  9 09:24:34 2013
New Revision: 36254

Log:
Make parser allocation work if a codec was forced.

Modified:
   trunk/libmpdemux/demuxer.c

Modified: trunk/libmpdemux/demuxer.c
==============================================================================
--- trunk/libmpdemux/demuxer.c	Thu May  9 09:18:48 2013	(r36253)
+++ trunk/libmpdemux/demuxer.c	Thu May  9 09:24:34 2013	(r36254)
@@ -32,6 +32,7 @@
 #include "help_mp.h"
 #include "m_config.h"
 #include "mpcommon.h"
+#include "codec-cfg.h"
 
 #include "libvo/fastmemcpy.h"
 
@@ -561,6 +562,8 @@ static void get_parser(sh_common_t *sh, 
         return;
 
     allocate_parser(avctx, parser, sh->format);
+    if (!*parser && sh->codec) // fallback to support forcing a codec
+        allocate_parser(avctx, parser, sh->codec->fourcc[0]);
     sh->avctx  = *avctx;
     sh->parser = *parser;
 }