Mercurial > mplayer.hg

changeset 20319:03e64a7a6d5e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cosmetics: indentation fix indentation broken by last two demuxer.c commits
author reimar
date Fri, 20 Oct 2006 19:36:59 +0000
parents d8d2bc754413
children 33f0529d29e3
files libmpdemux/demuxer.c
diffstat 1 files changed, 25 insertions(+), 25 deletions(-) [+]
line wrap: on
line diff
--- a/libmpdemux/demuxer.c	Fri Oct 20 19:31:52 2006 +0000
+++ b/libmpdemux/demuxer.c	Fri Oct 20 19:36:59 2006 +0000
@@ -664,28 +664,28 @@
     demuxer = new_demuxer(stream,demuxer_desc->type,audio_id,video_id,dvdsub_id,filename);
     if (demuxer_desc->check_file)
       fformat = demuxer_desc->check_file(demuxer);
-      if (force || !demuxer_desc->check_file)
-        fformat = demuxer_desc->type;
-      if (fformat != 0) {
-        if (fformat == demuxer_desc->type) {
-          demuxer_t *demux2 = demuxer;
-          // Move messages to demuxer detection code?
-          mp_msg(MSGT_DEMUXER, MSGL_INFO, MSGTR_Detected_XXX_FileFormat, demuxer_desc->shortdesc);
-          file_format = demuxer_desc->type = fformat;
-          if (!demuxer->desc->open || (demux2 = demuxer->desc->open(demuxer))) {
-            demuxer = demux2;
-            goto dmx_open;
-          }
-        } else {
-          // Format changed after check, recurse
-          free_demuxer(demuxer);
-          return demux_open_stream(stream, fformat, force,
-                   audio_id, video_id, dvdsub_id, filename);
+    if (force || !demuxer_desc->check_file)
+      fformat = demuxer_desc->type;
+    if (fformat != 0) {
+      if (fformat == demuxer_desc->type) {
+        demuxer_t *demux2 = demuxer;
+        // Move messages to demuxer detection code?
+        mp_msg(MSGT_DEMUXER, MSGL_INFO, MSGTR_Detected_XXX_FileFormat, demuxer_desc->shortdesc);
+        file_format = demuxer_desc->type = fformat;
+        if (!demuxer->desc->open || (demux2 = demuxer->desc->open(demuxer))) {
+          demuxer = demux2;
+          goto dmx_open;
         }
+      } else {
+        // Format changed after check, recurse
+        free_demuxer(demuxer);
+        return demux_open_stream(stream, fformat, force,
+                 audio_id, video_id, dvdsub_id, filename);
       }
-        // Check failed for forced demuxer, quit
-        free_demuxer(demuxer);
-        return NULL;
+    }
+    // Check failed for forced demuxer, quit
+    free_demuxer(demuxer);
+    return NULL;
   }
 }
 
@@ -713,8 +713,8 @@
         file_format = DEMUXER_TYPE_UNKNOWN;
       }
     }
-      free_demuxer(demuxer);
-      demuxer = NULL;
+    free_demuxer(demuxer);
+    demuxer = NULL;
   }
 }
 
@@ -758,12 +758,12 @@
         file_format = DEMUXER_TYPE_UNKNOWN;
       }
     }
-      free_demuxer(demuxer);
-      demuxer = NULL;
+    free_demuxer(demuxer);
+    demuxer = NULL;
   }
 }
 
-  return NULL;
+return NULL;
 //====== File format recognized, set up these for compatibility: =========
 dmx_open: