From 1fc626f8d072b67e8f6b63e38f51c1ca051c42ff Mon Sep 17 00:00:00 2001 From: Stefano Sabatini Date: Thu, 27 Jun 2013 00:11:21 +0200 Subject: ffprobe: reindent after previous commit --- ffprobe.c | 87 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 43 insertions(+), 44 deletions(-) (limited to 'ffprobe.c') diff --git a/ffprobe.c b/ffprobe.c index d8bc202dbf..735eb64b4c 100644 --- a/ffprobe.c +++ b/ffprobe.c @@ -1907,52 +1907,51 @@ static int probe_file(WriterContext *wctx, const char *filename) if (ret < 0) return ret; - /* todo: reindent */ - nb_streams_frames = av_calloc(fmt_ctx->nb_streams, sizeof(*nb_streams_frames)); - nb_streams_packets = av_calloc(fmt_ctx->nb_streams, sizeof(*nb_streams_packets)); - selected_streams = av_calloc(fmt_ctx->nb_streams, sizeof(*selected_streams)); - - for (i = 0; i < fmt_ctx->nb_streams; i++) { - if (stream_specifier) { - ret = avformat_match_stream_specifier(fmt_ctx, - fmt_ctx->streams[i], - stream_specifier); - if (ret < 0) - goto end; - else - selected_streams[i] = ret; - ret = 0; - } else { - selected_streams[i] = 1; - } - } + nb_streams_frames = av_calloc(fmt_ctx->nb_streams, sizeof(*nb_streams_frames)); + nb_streams_packets = av_calloc(fmt_ctx->nb_streams, sizeof(*nb_streams_packets)); + selected_streams = av_calloc(fmt_ctx->nb_streams, sizeof(*selected_streams)); - if (do_read_frames || do_read_packets) { - if (do_show_frames && do_show_packets && - wctx->writer->flags & WRITER_FLAG_PUT_PACKETS_AND_FRAMES_IN_SAME_CHAPTER) - section_id = SECTION_ID_PACKETS_AND_FRAMES; - else if (do_show_packets && !do_show_frames) - section_id = SECTION_ID_PACKETS; - else // (!do_show_packets && do_show_frames) - section_id = SECTION_ID_FRAMES; - if (do_show_frames || do_show_packets) - writer_print_section_header(wctx, section_id); - read_packets(wctx, fmt_ctx); - if (do_show_frames || do_show_packets) - writer_print_section_footer(wctx); + for (i = 0; i < fmt_ctx->nb_streams; i++) { + if (stream_specifier) { + ret = avformat_match_stream_specifier(fmt_ctx, + fmt_ctx->streams[i], + stream_specifier); + if (ret < 0) + goto end; + else + selected_streams[i] = ret; + ret = 0; + } else { + selected_streams[i] = 1; } - if (do_show_streams) - show_streams(wctx, fmt_ctx); - if (do_show_chapters) - show_chapters(wctx, fmt_ctx); - if (do_show_format) - show_format(wctx, fmt_ctx); - - end: - close_input_file(&fmt_ctx); - av_freep(&nb_streams_frames); - av_freep(&nb_streams_packets); - av_freep(&selected_streams); + } + + if (do_read_frames || do_read_packets) { + if (do_show_frames && do_show_packets && + wctx->writer->flags & WRITER_FLAG_PUT_PACKETS_AND_FRAMES_IN_SAME_CHAPTER) + section_id = SECTION_ID_PACKETS_AND_FRAMES; + else if (do_show_packets && !do_show_frames) + section_id = SECTION_ID_PACKETS; + else // (!do_show_packets && do_show_frames) + section_id = SECTION_ID_FRAMES; + if (do_show_frames || do_show_packets) + writer_print_section_header(wctx, section_id); + read_packets(wctx, fmt_ctx); + if (do_show_frames || do_show_packets) + writer_print_section_footer(wctx); + } + if (do_show_streams) + show_streams(wctx, fmt_ctx); + if (do_show_chapters) + show_chapters(wctx, fmt_ctx); + if (do_show_format) + show_format(wctx, fmt_ctx); + +end: + close_input_file(&fmt_ctx); + av_freep(&nb_streams_frames); + av_freep(&nb_streams_packets); + av_freep(&selected_streams); return ret; } -- cgit v1.2.3