Mercurial > mplayer.hg
changeset 32124:93c6a603f4d3
Remove a pointless if.
author | reimar |
---|---|
date | Sun, 12 Sep 2010 16:10:18 +0000 |
parents | a86413775fbe |
children | 5e5a5c52e264 |
files | libmpdemux/demux_nemesi.c |
diffstat | 1 files changed, 0 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/libmpdemux/demux_nemesi.c Sun Sep 12 16:08:57 2010 +0000 +++ b/libmpdemux/demux_nemesi.c Sun Sep 12 16:10:18 2010 +0000 @@ -232,13 +232,9 @@ link_session_and_fetch_conf(ndsd, NEMESI_SESSION_AUDIO, sess, &buff, NULL); - if (buff.len) { wf = calloc(1,sizeof(*wf)+buff.len); wf->cbSize = buff.len; memcpy(wf+1, buff.data, buff.len); - } else { - wf = calloc(1,sizeof(*wf)); - } sh_audio->wf = wf; d_audio->sh = sh_audio; @@ -268,14 +264,9 @@ link_session_and_fetch_conf(ndsd, NEMESI_SESSION_VIDEO, sess, &buff, &fps); - if (buff.len) { bih = calloc(1,sizeof(*bih)+buff.len); bih->biSize = sizeof(*bih)+buff.len; memcpy(bih+1, buff.data, buff.len); - } else { - bih = calloc(1,sizeof(*bih)); - bih->biSize = sizeof(*bih); - } sh_video = new_sh_video(demuxer,0); sh_video->bih = bih;