[MPlayer-cvslog] r32208 - trunk/libmpdemux/demux_nemesi.c

reimar subversion at mplayerhq.hu
Sun Sep 12 18:10:18 CEST 2010


Author: reimar
Date: Sun Sep 12 18:10:18 2010
New Revision: 32208

Log:
Remove a pointless if.

Modified:
   trunk/libmpdemux/demux_nemesi.c

Modified: trunk/libmpdemux/demux_nemesi.c
==============================================================================
--- trunk/libmpdemux/demux_nemesi.c	Sun Sep 12 18:08:57 2010	(r32207)
+++ trunk/libmpdemux/demux_nemesi.c	Sun Sep 12 18:10:18 2010	(r32208)
@@ -232,13 +232,9 @@ static demuxer_t* demux_open_rtp(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));
-                }
 
                 sh_audio->wf = wf;
                 d_audio->sh = sh_audio;
@@ -268,14 +264,9 @@ static demuxer_t* demux_open_rtp(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);
-                }
 
                 sh_video = new_sh_video(demuxer,0);
                 sh_video->bih = bih;


More information about the MPlayer-cvslog mailing list