[MPlayer-cvslog] r32863 - trunk/libmpcodecs/ad_qtaudio.c

[faust3]

Author: faust3
Date: Sun Feb  6 14:09:09 2011
New Revision: 32863

Log:
fix ad_qtaudio for the case when the libavformat mov demuxer is used

Modified:
   trunk/libmpcodecs/ad_qtaudio.c

Modified: trunk/libmpcodecs/ad_qtaudio.c
==============================================================================
--- trunk/libmpcodecs/ad_qtaudio.c	Sun Feb  6 12:45:17 2011	(r32862)
+++ trunk/libmpcodecs/ad_qtaudio.c	Sun Feb  6 14:09:09 2011	(r32863)
@@ -186,7 +186,11 @@ static int preinit(sh_audio_t *sh){
     unsigned long InputBufferSize=0; //size of the input buffer
     unsigned long OutputBufferSize=0; //size of the output buffer
     unsigned long WantedBufferSize=0; //the size you want your buffers to be
+    void* codecdata = sh->codecdata;
 
+    if (!sh->codecdata_len && sh->wf && sh->wf->cbSize){
+        codecdata = sh->wf + 1;
+    }
 
 #ifdef CONFIG_QUICKTIME
     EnterMovies();
@@ -217,8 +221,8 @@ static int preinit(sh_audio_t *sh){
     mp_msg(MSGT_DECAUDIO,MSGL_DBG2,"SoundConverterOpen:%i\n",error);
     if(error) return 0;
 
-    if(sh->codecdata){
-	error = SoundConverterSetInfo(myConverter,siDecompressionParams,sh->codecdata);
+    if(codecdata){
+	error = SoundConverterSetInfo(myConverter,siDecompressionParams,codecdata);
 	mp_msg(MSGT_DECAUDIO,MSGL_DBG2,"SoundConverterSetInfo:%i\n",error);
 //	if(error) return 0;
     }