[MPlayer-cvslog] CVS: main/libmpdemux demuxer.c,1.203,1.204

[Reimar Döffinger CVS]

CVS change done by Reimar Döffinger CVS

Update of /cvsroot/mplayer/main/libmpdemux
In directory mail:/var2/tmp/cvs-serv2493

Modified Files:
	demuxer.c 
Log Message:
execute the check function even when a demuxer is forced, to avoid crashes.


Index: demuxer.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demuxer.c,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -r1.203 -r1.204
--- demuxer.c	6 Sep 2005 19:46:48 -0000	1.203
+++ demuxer.c	6 Sep 2005 19:50:21 -0000	1.204
@@ -597,8 +597,11 @@
 if (file_format) {
   if ((demuxer_desc = get_demuxer_desc_from_type(file_format))) {
     demuxer = new_demuxer(stream,demuxer_desc->type,audio_id,video_id,dvdsub_id,filename);
-    if (!force && demuxer_desc->check_file) {
-      if ((fformat = demuxer_desc->check_file(demuxer)) != 0) {
+    if (demuxer_desc->check_file) {
+      fformat = demuxer_desc->check_file(demuxer);
+      if (force)
+        fformat = demuxer_desc->type;
+      if (fformat != 0) {
         if (fformat == demuxer_desc->type) {
           // Move messages to demuxer detection code?
           mp_msg(MSGT_DEMUXER, MSGL_INFO, MSGTR_Detected_XXX_FileFormat, demuxer_desc->shortdesc);