diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-11-10 15:38:36 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-11-10 15:38:36 +0200 |
| commit | 523a48d8a9f5168f266b271353c658d253798013 (patch) | |
| tree | 0afdd90cc04dbc2f4bce41393a3af9233ef0808e /libmpdemux/demuxer.c | |
| parent | 2dca4577bb81a845a992a4ad4764835d0868a068 (diff) | |
| download | mpv-523a48d8a9f5168f266b271353c658d253798013.tar.bz2 mpv-523a48d8a9f5168f266b271353c658d253798013.tar.xz | |
demux: change "%s file format detected" message
"libavformat file format detected" wasn't a very useful message due to
the many file formats supported to libavformat. Change the message so
that for demux_lavf it says something like
"Detected file format: QuickTime/MPEG-4/Motion JPEG 2000 format (libavformat)"
(using long name from FFmpeg), and for non-lavf something like
"Detected file format: Matroska".
Diffstat (limited to 'libmpdemux/demuxer.c')
| -rw-r--r-- | libmpdemux/demuxer.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c index dd356f176b..f301e4f59e 100644 --- a/libmpdemux/demuxer.c +++ b/libmpdemux/demuxer.c @@ -941,8 +941,12 @@ static struct demuxer *open_given_type(struct MPOpts *opts, if (fformat == 0) goto fail; if (fformat == desc->type) { - mp_tmsg(MSGT_DEMUXER, MSGL_INFO, "%s file format detected.\n", - desc->shortdesc); + if (demuxer->filetype) + mp_tmsg(MSGT_DEMUXER, MSGL_INFO, "Detected file format: %s (%s)\n", + demuxer->filetype, desc->shortdesc); + else + mp_tmsg(MSGT_DEMUXER, MSGL_INFO, "Detected file format: %s\n", + desc->shortdesc); if (demuxer->desc->open) { struct demuxer *demux2 = demuxer->desc->open(demuxer); if (!demux2) { |