summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorNils Wallménius <nils@rockbox.org>2010-12-06 17:35:36 +0000
committerNils Wallménius <nils@rockbox.org>2010-12-06 17:35:36 +0000
commit23321dca5e1dc7adc5add85fa1e6451d17307cd1 (patch)
treec98cf08ef4b40bbbc45447d7b43532c5e35f4ddc /apps
parent2aa76d7a1882d268dc01597df03529dd77488888 (diff)
downloadrockbox-23321dca5e1dc7adc5add85fa1e6451d17307cd1.tar.gz
rockbox-23321dca5e1dc7adc5add85fa1e6451d17307cd1.tar.bz2
rockbox-23321dca5e1dc7adc5add85fa1e6451d17307cd1.zip
libtremor: merge upstream revision 17518 actually returning failure code from vorbis_synthesis_init
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28750 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r--apps/codecs/libtremor/block.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/apps/codecs/libtremor/block.c b/apps/codecs/libtremor/block.c
index abf216611a..a86668a521 100644
--- a/apps/codecs/libtremor/block.c
+++ b/apps/codecs/libtremor/block.c
@@ -158,6 +158,8 @@ static int _vds_init(vorbis_dsp_state *v,vorbis_info *vi){
codec_setup_info *ci=(codec_setup_info *)vi->codec_setup;
private_state *b=NULL;
+ if(ci==NULL) return 1;
+
memset(v,0,sizeof(*v));
v->reset_pcmb=true;
b=(private_state *)(v->backend_state=_ogg_calloc(1,sizeof(*b)));
@@ -277,10 +279,10 @@ int vorbis_synthesis_restart(vorbis_dsp_state *v){
}
int vorbis_synthesis_init(vorbis_dsp_state *v,vorbis_info *vi){
- _vds_init(v,vi);
+ if(_vds_init(v,vi))return 1;
vorbis_synthesis_restart(v);
- return(0);
+ return 0;
}
void vorbis_dsp_clear(vorbis_dsp_state *v){
@@ -515,7 +517,7 @@ int vorbis_synthesis_pcmout(vorbis_dsp_state *v,ogg_int32_t ***pcm){
}
return(v->pcm_current-v->pcm_returned);
}
- return(0);
+ return 0;
}
int vorbis_synthesis_read(vorbis_dsp_state *v,int bytes){