Commit c0b88f19 authored by Peter Ross's avatar Peter Ross
Browse files

Moves the display of metadata to dump_format()

Originally committed as revision 19632 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 5f71844e
......@@ -1860,13 +1860,6 @@ static void stream_component_close(VideoState *is, int stream_index)
}
}
static void dump_stream_info(const AVFormatContext *s)
{
AVMetadataTag *tag = NULL;
while ((tag=av_metadata_get(s->metadata,"",tag,AV_METADATA_IGNORE_SUFFIX)))
fprintf(stderr, "%s: %s\n", tag->key, tag->value);
}
/* since we have only one decoding thread, we can use a global
variable instead of a thread local variable */
static VideoState *global_video_state;
......@@ -1960,7 +1953,6 @@ static int decode_thread(void *arg)
}
if (show_status) {
dump_format(ic, 0, is->filename, 0);
dump_stream_info(ic);
}
/* open the streams */
......
......@@ -2916,6 +2916,14 @@ void dump_format(AVFormatContext *ic,
} else
for(i=0;i<ic->nb_streams;i++)
dump_stream_format(ic, i, index, is_output);
if (ic->metadata) {
AVMetadataTag *tag=NULL;
av_log(NULL, AV_LOG_INFO, " Metadata\n");
while((tag=av_metadata_get(ic->metadata, "", tag, AV_METADATA_IGNORE_SUFFIX))) {
av_log(NULL, AV_LOG_INFO, " %-16s: %s\n", tag->key, tag->value);
}
}
}
#if LIBAVFORMAT_VERSION_MAJOR < 53
......
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