# HG changeset patch # User reimar # Date 1161373019 0 # Node ID 03e64a7a6d5e81e754efd91c72188a136ee664fa # Parent d8d2bc7544130f2058c7bc69e73e3be7f7dbfc9e Cosmetics: indentation fix indentation broken by last two demuxer.c commits diff -r d8d2bc754413 -r 03e64a7a6d5e libmpdemux/demuxer.c --- 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: