Mercurial > mplayer.hg
changeset 12896:e60cf1255df2
Fix -nosound and -novideo (bug #28)
Move audio fourcc assignement inside audio if()
Remove bogus VLB warning (codec missing, no demuxer problem)
| author | rtognimp |
|---|---|
| date | Sun, 25 Jul 2004 15:38:08 +0000 |
| parents | 3cd9add91f97 |
| children | 9cceec65e536 |
| files | libmpdemux/demux_nsv.c |
| diffstat | 1 files changed, 3 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/libmpdemux/demux_nsv.c Sun Jul 25 12:49:01 2004 +0000 +++ b/libmpdemux/demux_nsv.c Sun Jul 25 15:38:08 2004 +0000 @@ -210,25 +210,18 @@ // bytes 8-11 audio codec fourcc // PCM fourcc needs extra parsing for every audio chunk, yet to implement - if( strncmp(hdr+8,"NONE", 4)){//&&strncmp(hdr+8,"VLB ", 4)){ + if((demuxer->audio->id != -2) && strncmp(hdr+8,"NONE", 4)){//&&strncmp(hdr+8,"VLB ", 4)){ sh_audio = new_sh_audio ( demuxer, 0 ); demuxer->audio->sh = sh_audio; sh_audio->format=mmioFOURCC(hdr[8],hdr[9],hdr[10],hdr[11]); sh_audio->ds = demuxer->audio; + priv->a_format=mmioFOURCC(hdr[8],hdr[9],hdr[10],hdr[11]); } - priv->a_format=mmioFOURCC(hdr[8],hdr[9],hdr[10],hdr[11]); - // !!!!!!!!!!!!!!!!!!!! - // RemoveMe!!! This is just to avoid lot of bugreports! - // !!!!!!!!!!!!!!!!!!!! - if(priv->a_format==mmioFOURCC('V','L','B',' ')) - mp_msg(MSGT_DEMUX,MSGL_WARN,"demux_nsv: VLB audio does not work yet. Expect problems.\n"); - - // store hdr fps priv->fps=hdr[16]; - if (strncmp(hdr+4,"NONE", 4)) { + if ((demuxer->video->id != -2) && strncmp(hdr+4,"NONE", 4)) { /* Create a new video stream header */ sh_video = new_sh_video ( demuxer, 0 );