From 523a48d8a9f5168f266b271353c658d253798013 Mon Sep 17 00:00:00 2001 From: Uoti Urpala Date: Wed, 10 Nov 2010 15:38:36 +0200 Subject: 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". --- libmpdemux/demux_lavf.c | 4 ++++ libmpdemux/demuxer.c | 8 ++++++-- libmpdemux/demuxer.h | 1 + 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/libmpdemux/demux_lavf.c b/libmpdemux/demux_lavf.c index 7f50e2de4a..381b6a17db 100644 --- a/libmpdemux/demux_lavf.c +++ b/libmpdemux/demux_lavf.c @@ -207,6 +207,10 @@ static int lavf_check_file(demuxer_t *demuxer){ }else mp_msg(MSGT_HEADER,MSGL_V,"LAVF_check: %s\n", priv->avif->long_name); + demuxer->filetype = priv->avif->long_name; + if (!demuxer->filetype) + demuxer->filetype = priv->avif->name; + return DEMUXER_TYPE_LAVF; } 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) { diff --git a/libmpdemux/demuxer.h b/libmpdemux/demuxer.h index 63a34f30f6..cf77514aa0 100644 --- a/libmpdemux/demuxer.h +++ b/libmpdemux/demuxer.h @@ -234,6 +234,7 @@ typedef struct demux_attachment typedef struct demuxer { const demuxer_desc_t *desc; ///< Demuxer description structure + char *filetype; // format name when not identified by demuxer (libavformat) off_t filepos; // input stream current pos. off_t movi_start; off_t movi_end; -- cgit v1.2.3