[MPlayer-cvslog] r32684 - in trunk/libmpdemux: asfheader.c demux_asf.c

[reimar]

Author: reimar
Date: Sat Dec 11 16:43:24 2010
New Revision: 32684

Log:
Move setup of sh_audio->format to a more appropriate place (in asfheader.c).

Modified:
   trunk/libmpdemux/asfheader.c
   trunk/libmpdemux/demux_asf.c

Modified: trunk/libmpdemux/asfheader.c
==============================================================================
--- trunk/libmpdemux/asfheader.c	Sat Dec 11 16:30:28 2010	(r32683)
+++ trunk/libmpdemux/asfheader.c	Sat Dec 11 16:43:24 2010	(r32684)
@@ -348,6 +348,7 @@ static int asf_init_audio_stream(demuxer
   sh_audio->wf=calloc((streamh->type_size<sizeof(*sh_audio->wf))?sizeof(*sh_audio->wf):streamh->type_size,1);
   memcpy(sh_audio->wf,buffer,streamh->type_size);
   le2me_WAVEFORMATEX(sh_audio->wf);
+  sh_audio->format=sh_audio->wf->wFormatTag;
   if( mp_msg_test(MSGT_HEADER,MSGL_V) ) print_wave_header(sh_audio->wf,MSGL_V);
   if(ASF_LOAD_GUID_PREFIX(streamh->concealment)==ASF_GUID_PREFIX_audio_conceal_interleave){
     buffer = &hdr[pos];

Modified: trunk/libmpdemux/demux_asf.c
==============================================================================
--- trunk/libmpdemux/demux_asf.c	Sat Dec 11 16:30:28 2010	(r32683)
+++ trunk/libmpdemux/demux_asf.c	Sat Dec 11 16:43:24 2010	(r32684)
@@ -657,7 +657,6 @@ static demuxer_t* demux_open_asf(demuxer
             demuxer->audio->sh=NULL;
         } else {
             sh_audio=demuxer->audio->sh;sh_audio->ds=demuxer->audio;
-            sh_audio->format=sh_audio->wf->wFormatTag;
         }
     }
     if(!demuxer->stream->seek)