[xiph-commits] r17518 - trunk/Tremor

[tterribe at svn.xiph.org]

Author: tterribe
Date: 2010-10-13 16:28:48 -0700 (Wed, 13 Oct 2010)
New Revision: 17518

Modified:
   trunk/Tremor/block.c
Log:
Forward port the rest of r5278.

The vorbisfile part of this got merged in r16259, but the corresponding changes
 to voris_synthesis_init() to actually return a failure code did not.


Modified: trunk/Tremor/block.c
===================================================================
--- trunk/Tremor/block.c	2010-10-13 23:18:23 UTC (rev 17517)
+++ trunk/Tremor/block.c	2010-10-13 23:28:48 UTC (rev 17518)
@@ -148,6 +148,8 @@
   codec_setup_info *ci=(codec_setup_info *)vi->codec_setup;
   private_state *b=NULL;
 
+  if(ci==NULL) return 1;
+
   memset(v,0,sizeof(*v));
   b=(private_state *)(v->backend_state=_ogg_calloc(1,sizeof(*b)));
 
@@ -188,7 +190,7 @@
     b->mode[i]=_mapping_P[maptype]->look(v,ci->mode_param[i],
 					 ci->map_param[mapnum]);
   }
-  return(0);
+  return 0;
 }
 
 int vorbis_synthesis_restart(vorbis_dsp_state *v){
@@ -212,10 +214,10 @@
 }
 
 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){