diff options
| author | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-11-25 16:33:39 +0000 |
|---|---|---|
| committer | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-11-25 16:33:39 +0000 |
| commit | 2ea47dbd6ffb7711d53f3f956f42eea71a59d73d (patch) | |
| tree | ce8b2bb248f8e10bbb9b4a20217a80cd311e5c6e /libmpdemux/demux_viv.c | |
| parent | e1b78f5708bbbe7c1ad634758bcd947d02337513 (diff) | |
| download | mpv-2ea47dbd6ffb7711d53f3f956f42eea71a59d73d.tar.bz2 mpv-2ea47dbd6ffb7711d53f3f956f42eea71a59d73d.tar.xz | |
changed to generate fourcc's like: viv<version> -> viv1,viv2
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3114 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demux_viv.c')
| -rw-r--r-- | libmpdemux/demux_viv.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/libmpdemux/demux_viv.c b/libmpdemux/demux_viv.c index 96fb7951c1..38038d64b4 100644 --- a/libmpdemux/demux_viv.c +++ b/libmpdemux/demux_viv.c @@ -18,6 +18,7 @@ typedef struct { /* generic */ + char version; int supported; /* info */ char *title; @@ -82,8 +83,12 @@ static void vivo_parse_text_header(demuxer_t *demux, int header_len) { mp_msg(MSGT_DEMUX, MSGL_DBG2, "Version: %s\n", param); if (!strncmp(param, "Vivo/1", 6) || !strncmp(param, "Vivo/2", 6)) + { // if (atoi(param) == 1 || atoi(param) == 2) priv->supported = 1; + /* safe version for fourcc */ + priv->version = param[5]; + } } /* video specific */ @@ -469,8 +474,10 @@ void demux_open_vivo(demuxer_t* demuxer){ { sh_video_t* sh=new_sh_video(demuxer,0); - - sh->format=0x6f766976; // "vivo" + + /* viv1, viv2 (for better codecs.conf) */ + sh->format = mmioFOURCC('v', 'i', 'v', priv->version); +// sh->format=0x6f766976; // "vivo" if(!sh->fps) { if (priv->fps) |