virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Moves the display of metadata to dump_format()

Browse Source 
Originally committed as revision 19632 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Peter Ross 2009-08-12 13:17:39 +00:00
parent 5f71844e78
commit c0b88f1920
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ffplay.c
View File

@ -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 /* since we have only one decoding thread, we can use a global
variable instead of a thread local variable */ variable instead of a thread local variable */
static VideoState *global_video_state; static VideoState *global_video_state;
@ -1960,7 +1953,6 @@ static int decode_thread(void *arg)
} }
if (show_status) { if (show_status) {
dump_format(ic, 0, is->filename, 0); dump_format(ic, 0, is->filename, 0);
dump_stream_info(ic);
} }
/* open the streams */ /* open the streams */

8
libavformat/utils.c
View File

@ -2916,6 +2916,14 @@ void dump_format(AVFormatContext *ic,
} else } else
for(i=0;i<ic->nb_streams;i++) for(i=0;i<ic->nb_streams;i++)
dump_stream_format(ic, i, index, is_output); 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 #if LIBAVFORMAT_VERSION_MAJOR < 53