Revert "avformat/dump: print only the actual streams in a tile grid group"

Indexes in tile_grid->offsets were fixed in the previous commit, but just in case,
make sure to not overread the streams array.

Signed-off-by: James Almer <jamrial@gmail.com>
pull/391/head
James Almer 2 months ago
parent bf0786d9bd
commit 2919767750
  1. 12
      libavformat/dump.c

@ -788,10 +788,14 @@ static void dump_stream_group(const AVFormatContext *ic, uint8_t *printed,
dump_sidedata(NULL, tile_grid->coded_side_data, tile_grid->nb_coded_side_data, dump_sidedata(NULL, tile_grid->coded_side_data, tile_grid->nb_coded_side_data,
tile_grid->width, tile_grid->height, (AVRational) {0,1}, tile_grid->width, tile_grid->height, (AVRational) {0,1},
" ", AV_LOG_INFO); " ", AV_LOG_INFO);
for (int i = 0; i < stg->nb_streams; i++) { for (int i = 0; i < tile_grid->nb_tiles; i++) {
const AVStream *st = stg->streams[i]; const AVStream *st = NULL;
dump_stream_format(ic, st->index, i, index, is_output, AV_LOG_VERBOSE); if (tile_grid->offsets[i].idx < stg->nb_streams)
printed[st->index] = 1; st = stg->streams[tile_grid->offsets[i].idx];
if (st && !printed[st->index]) {
dump_stream_format(ic, st->index, i, index, is_output, AV_LOG_VERBOSE);
printed[st->index] = 1;
}
} }
for (int i = 0; i < stg->nb_streams; i++) { for (int i = 0; i < stg->nb_streams; i++) {
const AVStream *st = stg->streams[i]; const AVStream *st = stg->streams[i];

Loading…
Cancel
Save