RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

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".
This commit is contained in:
Uoti Urpala 2010-11-10 15:38:36 +02:00
parent 2dca4577bb
commit 523a48d8a9
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libmpdemux/demux_lavf.c
View File

@ -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;
}

8
libmpdemux/demuxer.c
View File

@ -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) {

1
libmpdemux/demuxer.h
View File

@ -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;