aboutsummaryrefslogtreecommitdiffstats
path: root/ffprobe.c
diff options
context:
space:
mode:
authorNicolas George <nicolas.george@normalesup.org>2012-07-31 11:53:30 +0200
committerNicolas George <nicolas.george@normalesup.org>2012-07-31 15:06:57 +0200
commit89898cd3b6b2806bf823678a47d17f9ed745c69e (patch)
treea285675c7fc3c2599ea10f728b5750cf72ae29e5 /ffprobe.c
parent52bd9cb4d29bc086f45f239c56a6a3c63406a073 (diff)
downloadffmpeg-89898cd3b6b2806bf823678a47d17f9ed745c69e.tar.gz
ffprobe: fix validity error with tags and data.
Add "data" and "extradata" attributes to the schema. Add "tag" element in "streams". Print extradata before tags to avoid closing the element. Fix trac ticket #1588.
Diffstat (limited to 'ffprobe.c')
-rw-r--r--ffprobe.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ffprobe.c b/ffprobe.c
index f81bc3b788..9bedbeb431 100644
--- a/ffprobe.c
+++ b/ffprobe.c
@@ -1844,10 +1844,10 @@ static void show_stream(WriterContext *w, AVFormatContext *fmt_ctx, int stream_i
else print_str_opt("nb_read_frames", "N/A");
if (nb_streams_packets[stream_idx]) print_fmt ("nb_read_packets", "%"PRIu64, nb_streams_packets[stream_idx]);
else print_str_opt("nb_read_packets", "N/A");
- show_tags(stream->metadata);
if (do_show_data)
writer_print_data(w, "extradata", dec_ctx->extradata,
dec_ctx->extradata_size);
+ show_tags(stream->metadata);
print_section_footer("stream");
av_bprint_finalize(&pbuf, NULL);