summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demuxer.c
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-05-27 17:30:20 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-05-27 17:30:20 +0000
commitfba4b13c9b4e3090290820c04a0635d561530d3a (patch)
tree3cb5d3ee528503740b63f979cea06c7002eca793 /libmpdemux/demuxer.c
parent158b5133ff48b28d78556e002c2008b821a6f8c5 (diff)
downloadmpv-fba4b13c9b4e3090290820c04a0635d561530d3a.tar.bz2
mpv-fba4b13c9b4e3090290820c04a0635d561530d3a.tar.xz
Cosmetics: simplify
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26906 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demuxer.c')
-rw-r--r--libmpdemux/demuxer.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c
index 2b8a4dac73..463693a0bb 100644
--- a/libmpdemux/demuxer.c
+++ b/libmpdemux/demuxer.c
@@ -265,10 +265,9 @@ sh_audio_t* new_sh_audio_aid(demuxer_t *demuxer,int id,int aid){
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;