Commit 1fc626f8 authored by Stefano Sabatini's avatar Stefano Sabatini

ffprobe: reindent after previous commit

parent a334b00c
...@@ -1907,52 +1907,51 @@ static int probe_file(WriterContext *wctx, const char *filename) ...@@ -1907,52 +1907,51 @@ static int probe_file(WriterContext *wctx, const char *filename)
if (ret < 0) if (ret < 0)
return ret; return ret;
/* todo: reindent */ nb_streams_frames = av_calloc(fmt_ctx->nb_streams, sizeof(*nb_streams_frames));
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));
nb_streams_packets = av_calloc(fmt_ctx->nb_streams, sizeof(*nb_streams_packets)); selected_streams = av_calloc(fmt_ctx->nb_streams, sizeof(*selected_streams));
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;
}
}
if (do_read_frames || do_read_packets) { for (i = 0; i < fmt_ctx->nb_streams; i++) {
if (do_show_frames && do_show_packets && if (stream_specifier) {
wctx->writer->flags & WRITER_FLAG_PUT_PACKETS_AND_FRAMES_IN_SAME_CHAPTER) ret = avformat_match_stream_specifier(fmt_ctx,
section_id = SECTION_ID_PACKETS_AND_FRAMES; fmt_ctx->streams[i],
else if (do_show_packets && !do_show_frames) stream_specifier);
section_id = SECTION_ID_PACKETS; if (ret < 0)
else // (!do_show_packets && do_show_frames) goto end;
section_id = SECTION_ID_FRAMES; else
if (do_show_frames || do_show_packets) selected_streams[i] = ret;
writer_print_section_header(wctx, section_id); ret = 0;
read_packets(wctx, fmt_ctx); } else {
if (do_show_frames || do_show_packets) selected_streams[i] = 1;
writer_print_section_footer(wctx);
} }
if (do_show_streams) }
show_streams(wctx, fmt_ctx);
if (do_show_chapters) if (do_read_frames || do_read_packets) {
show_chapters(wctx, fmt_ctx); if (do_show_frames && do_show_packets &&
if (do_show_format) wctx->writer->flags & WRITER_FLAG_PUT_PACKETS_AND_FRAMES_IN_SAME_CHAPTER)
show_format(wctx, fmt_ctx); section_id = SECTION_ID_PACKETS_AND_FRAMES;
else if (do_show_packets && !do_show_frames)
end: section_id = SECTION_ID_PACKETS;
close_input_file(&fmt_ctx); else // (!do_show_packets && do_show_frames)
av_freep(&nb_streams_frames); section_id = SECTION_ID_FRAMES;
av_freep(&nb_streams_packets); if (do_show_frames || do_show_packets)
av_freep(&selected_streams); 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; return ret;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment