RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

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
This commit is contained in:
reimar 2010-09-12 16:10:18 +00:00 committed by Uoti Urpala
parent fe6c4fcae2
commit 5896036cb3
1 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libmpdemux/demux_nemesi.c
View File

@ -232,13 +232,9 @@ static demuxer_t* demux_open_rtp(demuxer_t* demuxer)
link_session_and_fetch_conf(ndsd, NEMESI_SESSION_AUDIO, link_session_and_fetch_conf(ndsd, NEMESI_SESSION_AUDIO,
sess, &buff, NULL); sess, &buff, NULL);
if (buff.len) {
wf = calloc(1,sizeof(*wf)+buff.len); wf = calloc(1,sizeof(*wf)+buff.len);
wf->cbSize = buff.len; wf->cbSize = buff.len;
memcpy(wf+1, buff.data, buff.len); memcpy(wf+1, buff.data, buff.len);
} else {
wf = calloc(1,sizeof(*wf));
}
sh_audio->wf = wf; sh_audio->wf = wf;
d_audio->sh = sh_audio; 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, link_session_and_fetch_conf(ndsd, NEMESI_SESSION_VIDEO,
sess, &buff, &fps); sess, &buff, &fps);
if (buff.len) {
bih = calloc(1,sizeof(*bih)+buff.len); bih = calloc(1,sizeof(*bih)+buff.len);
bih->biSize = sizeof(*bih)+buff.len; bih->biSize = sizeof(*bih)+buff.len;
memcpy(bih+1, buff.data, 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 = new_sh_video(demuxer,0);
sh_video->bih = bih; sh_video->bih = bih;