diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-09-12 16:10:18 +0000 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-11-02 04:16:46 +0200 |
| commit | 5896036cb381bef1730b0140e90160618a557a74 (patch) | |
| tree | d226b34ddf7decbf7053b2f50a2b2f709eba444d /libmpdemux | |
| parent | fe6c4fcae203e6f95ae654acf80f912185c853da (diff) | |
| download | mpv-5896036cb381bef1730b0140e90160618a557a74.tar.bz2 mpv-5896036cb381bef1730b0140e90160618a557a74.tar.xz | |
demux_nemesi: Remove a pointless if
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32208 b3059339-0415-0410-9bf9-f77b7e298cf2
Reindent.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32209 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/demux_nemesi.c | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/libmpdemux/demux_nemesi.c b/libmpdemux/demux_nemesi.c index 2b2f6d2438..b5c9cd4ad2 100644 --- a/libmpdemux/demux_nemesi.c +++ b/libmpdemux/demux_nemesi.c @@ -232,13 +232,9 @@ static demuxer_t* demux_open_rtp(demuxer_t* demuxer) 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)); - } + wf = calloc(1,sizeof(*wf)+buff.len); + wf->cbSize = buff.len; + memcpy(wf+1, buff.data, buff.len); sh_audio->wf = wf; d_audio->sh = sh_audio; @@ -268,14 +264,9 @@ static demuxer_t* demux_open_rtp(demuxer_t* demuxer) 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); - } + bih = calloc(1,sizeof(*bih)+buff.len); + bih->biSize = sizeof(*bih)+buff.len; + memcpy(bih+1, buff.data, buff.len); sh_video = new_sh_video(demuxer,0); sh_video->bih = bih; |