From 2b13b3a6c811785fe61ac0d32ce0e35adac61792 Mon Sep 17 00:00:00 2001 From: reimar Date: Fri, 20 Oct 2006 19:36:59 +0000 Subject: Cosmetics: indentation fix indentation broken by last two demuxer.c commits git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20325 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/demuxer.c | 50 +++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) (limited to 'libmpdemux/demuxer.c') diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c index 76f08384a1..e9c90112ce 100644 --- a/libmpdemux/demuxer.c +++ b/libmpdemux/demuxer.c @@ -664,28 +664,28 @@ if (file_format) { 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; } - } - // Check failed for forced demuxer, quit + } else { + // Format changed after check, recurse free_demuxer(demuxer); - return NULL; + 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; } } @@ -713,8 +713,8 @@ for (i = 0; (demuxer_desc = demuxer_list[i]); i++) { file_format = DEMUXER_TYPE_UNKNOWN; } } - free_demuxer(demuxer); - demuxer = NULL; + free_demuxer(demuxer); + demuxer = NULL; } } @@ -758,12 +758,12 @@ for (i = 0; (demuxer_desc = demuxer_list[i]); i++) { 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: -- cgit v1.2.3