diff options
| author | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-11-22 15:43:24 +0000 |
|---|---|---|
| committer | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-11-22 15:43:24 +0000 |
| commit | 01af02aaa3d5d0e541aca63f371e8ae43e542d81 (patch) | |
| tree | 5fdcb931e5612a6f7375bcc04b44b225bfa23d29 /libmpdemux/demuxer.c | |
| parent | 56a7e74663b323c379321020bd787d47007f5c37 (diff) | |
| download | mpv-01af02aaa3d5d0e541aca63f371e8ae43e542d81.tar.bz2 mpv-01af02aaa3d5d0e541aca63f371e8ae43e542d81.tar.xz | |
added demux_info
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3072 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demuxer.c')
| -rw-r--r-- | libmpdemux/demuxer.c | 26 |
1 files changed, 20 insertions, 6 deletions
diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c index c60a40f7fd..bc72a890d2 100644 --- a/libmpdemux/demuxer.c +++ b/libmpdemux/demuxer.c @@ -652,7 +652,7 @@ int demux_info_add(demuxer_t *demuxer, char *opt, char *param) return(1); } - if (!strcasecmp(opt, "encoder")) + if (!strcasecmp(opt, "encoder") || !strcasecmp(opt, "software")) { if (info->encoder) { @@ -664,7 +664,7 @@ int demux_info_add(demuxer_t *demuxer, char *opt, char *param) return(1); } - if (!strcasecmp(opt, "comments")) + if (!strcasecmp(opt, "comment") || !strcasecmp(opt, "comments")) { if (info->comments) { @@ -676,7 +676,19 @@ int demux_info_add(demuxer_t *demuxer, char *opt, char *param) return(1); } - mp_msg(MSGT_DEMUX, MSGL_WARN, "Unknown demuxer info->%s (=%s)!\n", + if (!strcasecmp(opt, "copyright")) + { + if (info->copyright) + { + mp_msg(MSGT_DEMUX, MSGL_WARN, "Demuxer info->copyright already present\n!"); + return(0); + } + info->copyright = malloc(strlen(param)); + strcpy(info->copyright, param); + return(1); + } + + mp_msg(MSGT_DEMUX, MSGL_DBG2, "Unknown demuxer info->%s (=%s)!\n", opt, param); return(1); } @@ -685,16 +697,18 @@ int demux_info_print(demuxer_t *demuxer) { demuxer_info_t *info = &demuxer->info; - if (info->name || info->author || info->encoder || info->comments) + if (info->name || info->author || info->encoder || info->comments || info->copyright) { mp_msg(MSGT_DEMUX, MSGL_INFO, "Clip info: \n"); if (info->name) mp_msg(MSGT_DEMUX, MSGL_INFO, " Name: %s\n", info->name); if (info->author) mp_msg(MSGT_DEMUX, MSGL_INFO, " Author: %s\n", info->author); - if (info->encoder) - mp_msg(MSGT_DEMUX, MSGL_INFO, " Encoder: %s\n", info->encoder); + if (info->comments) + mp_msg(MSGT_DEMUX, MSGL_INFO, " Copyright: %s\n", info->comments); if (info->comments) mp_msg(MSGT_DEMUX, MSGL_INFO, " Comments: %s\n", info->comments); + if (info->encoder) + mp_msg(MSGT_DEMUX, MSGL_INFO, " Encoder: %s\n", info->encoder); } } |