diff options
author | Nils Wallménius <nils@rockbox.org> | 2010-12-06 17:35:36 +0000 |
---|---|---|
committer | Nils Wallménius <nils@rockbox.org> | 2010-12-06 17:35:36 +0000 |
commit | 23321dca5e1dc7adc5add85fa1e6451d17307cd1 (patch) | |
tree | c98cf08ef4b40bbbc45447d7b43532c5e35f4ddc /apps/codecs/libtremor | |
parent | 2aa76d7a1882d268dc01597df03529dd77488888 (diff) | |
download | rockbox-23321dca5e1dc7adc5add85fa1e6451d17307cd1.tar.gz 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/codecs/libtremor')
-rw-r--r-- | apps/codecs/libtremor/block.c | 8 |
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){ | |||
158 | codec_setup_info *ci=(codec_setup_info *)vi->codec_setup; | 158 | codec_setup_info *ci=(codec_setup_info *)vi->codec_setup; |
159 | private_state *b=NULL; | 159 | private_state *b=NULL; |
160 | 160 | ||
161 | if(ci==NULL) return 1; | ||
162 | |||
161 | memset(v,0,sizeof(*v)); | 163 | memset(v,0,sizeof(*v)); |
162 | v->reset_pcmb=true; | 164 | v->reset_pcmb=true; |
163 | b=(private_state *)(v->backend_state=_ogg_calloc(1,sizeof(*b))); | 165 | b=(private_state *)(v->backend_state=_ogg_calloc(1,sizeof(*b))); |
@@ -277,10 +279,10 @@ int vorbis_synthesis_restart(vorbis_dsp_state *v){ | |||
277 | } | 279 | } |
278 | 280 | ||
279 | int vorbis_synthesis_init(vorbis_dsp_state *v,vorbis_info *vi){ | 281 | int vorbis_synthesis_init(vorbis_dsp_state *v,vorbis_info *vi){ |
280 | _vds_init(v,vi); | 282 | if(_vds_init(v,vi))return 1; |
281 | vorbis_synthesis_restart(v); | 283 | vorbis_synthesis_restart(v); |
282 | 284 | ||
283 | return(0); | 285 | return 0; |
284 | } | 286 | } |
285 | 287 | ||
286 | void vorbis_dsp_clear(vorbis_dsp_state *v){ | 288 | void vorbis_dsp_clear(vorbis_dsp_state *v){ |
@@ -515,7 +517,7 @@ int vorbis_synthesis_pcmout(vorbis_dsp_state *v,ogg_int32_t ***pcm){ | |||
515 | } | 517 | } |
516 | return(v->pcm_current-v->pcm_returned); | 518 | return(v->pcm_current-v->pcm_returned); |
517 | } | 519 | } |
518 | return(0); | 520 | return 0; |
519 | } | 521 | } |
520 | 522 | ||
521 | int vorbis_synthesis_read(vorbis_dsp_state *v,int bytes){ | 523 | int vorbis_synthesis_read(vorbis_dsp_state *v,int bytes){ |