Commit 4f831ea5 authored by vaclav's avatar vaclav
Browse files

fix merge issue

parent 80f1cbf4

lib_dec/ivas_jbm_dec.c

+4 −0
Original line number Diff line number Diff line
@@ -863,7 +863,11 @@ void ivas_jbm_dec_feed_tc_to_renderer( 
        }



#ifdef FIX_NCHAN_BUFFERS

#ifdef JBM_MEMORY_OPT

        ch = max( hTcBuffer->nchan_transport_jbm, hTcBuffer->nchan_buffer_full );

#else

        ch = ivas_get_nchan_buffers_dec( st_ivas, st_ivas->sba_analysis_order, st_ivas->hDecoderConfig->ivas_total_brate );

#endif

        for ( n = 0; n < ch; n++ )

#else

        for ( n = 0; n < ivas_get_nchan_buffers_dec( st_ivas, st_ivas->sba_analysis_order, st_ivas->hDecoderConfig->ivas_total_brate ); n++ )