# HG changeset patch # User reimar # Date 1211909420 0 # Node ID c73c138aad885a55b868bb3e562aef259c9eaef2 # Parent a90971b955af6bdee331b379414c48ddc5476ba1 Cosmetics: simplify diff -r a90971b955af -r c73c138aad88 libmpdemux/demuxer.c --- a/libmpdemux/demuxer.c Tue May 27 17:27:06 2008 +0000 +++ b/libmpdemux/demuxer.c Tue May 27 17:30:20 2008 +0000 @@ -265,10 +265,9 @@ if(demuxer->a_streams[id]){ mp_msg(MSGT_DEMUXER,MSGL_WARN,MSGTR_AudioStreamRedefined,id); } else { - sh_audio_t *sh; + sh_audio_t *sh = calloc(1, sizeof(sh_audio_t)); mp_msg(MSGT_DEMUXER,MSGL_V,MSGTR_FoundAudioStream,id); - demuxer->a_streams[id]=calloc(1, sizeof(sh_audio_t)); - sh = demuxer->a_streams[id]; + demuxer->a_streams[id] = sh; // set some defaults sh->samplesize=2; sh->sample_format=AF_FORMAT_S16_NE;