summaryrefslogtreecommitdiff
path: root/fftools/ffprobe.c
diff options
context:
space:
mode:
authorStefano Sabatini <stefasab@gmail.com>2022-08-07 21:24:32 +0200
committerStefano Sabatini <stefasab@gmail.com>2023-01-24 23:58:00 +0100
commit843a4467131fd677aacb46b8bbdea898e4fe12d5 (patch)
tree4437b8436cbd73dc755cf9c117c99041459e91d2 /fftools/ffprobe.c
parentb6219c91144e665c98ceda9189e5f2bf75232fa8 (diff)
downloadffmpeg-843a4467131fd677aacb46b8bbdea898e4fe12d5.tar.gz
ffprobe: fix data hash rendering
Print data hash before side data list, fix wrong nesting level of data hash element. In particular, fix trac issue: http://trac.ffmpeg.org/ticket/7217
Diffstat (limited to 'fftools/ffprobe.c')
-rw-r--r--fftools/ffprobe.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c
index 619ea9a602..dfa7ff1b24 100644
--- a/fftools/ffprobe.c
+++ b/fftools/ffprobe.c
@@ -2515,6 +2515,9 @@ static void show_packet(WriterContext *w, InputFile *ifile, AVPacket *pkt, int p
else print_str_opt("pos", "N/A");
print_fmt("flags", "%c%c", pkt->flags & AV_PKT_FLAG_KEY ? 'K' : '_',
pkt->flags & AV_PKT_FLAG_DISCARD ? 'D' : '_');
+ if (do_show_data)
+ writer_print_data(w, "data", pkt->data, pkt->size);
+ writer_print_data_hash(w, "data_hash", pkt->data, pkt->size);
if (pkt->side_data_elems) {
size_t size;
@@ -2533,9 +2536,6 @@ static void show_packet(WriterContext *w, InputFile *ifile, AVPacket *pkt, int p
SECTION_ID_PACKET_SIDE_DATA);
}
- if (do_show_data)
- writer_print_data(w, "data", pkt->data, pkt->size);
- writer_print_data_hash(w, "data_hash", pkt->data, pkt->size);
writer_print_section_footer(w);
av_bprint_finalize(&pbuf, NULL);