summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfaust3 <faust3@b3059339-0415-0410-9bf9-f77b7e298cf2>2011-02-06 13:09:09 +0000
committerUoti Urpala <uau@glyph.nonexistent.invalid>2011-02-15 19:23:52 +0200
commit676d5401f3eb115c89ed66c6758442437efdeef5 (patch)
treecebdff85f4ecfda1d31d83277f39c0b4fd811dca
parentf04d70ace18d5782efb811ba8c2f57bbbdccd7b3 (diff)
downloadmpv-676d5401f3eb115c89ed66c6758442437efdeef5.tar.bz2
mpv-676d5401f3eb115c89ed66c6758442437efdeef5.tar.xz
ad_qtaudio: fix use with the libavformat mov demuxer
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32863 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--libmpcodecs/ad_qtaudio.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/libmpcodecs/ad_qtaudio.c b/libmpcodecs/ad_qtaudio.c
index d171c1620c..fd1ad2151a 100644
--- a/libmpcodecs/ad_qtaudio.c
+++ b/libmpcodecs/ad_qtaudio.c
@@ -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;
}