diff options
| author | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2003-04-12 14:58:46 +0000 |
|---|---|---|
| committer | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2003-04-12 14:58:46 +0000 |
| commit | c40876878a3e1743738f4ce813330812d8bf49f0 (patch) | |
| tree | 98a2b74bd2cb014b25a395e186a579687ce59447 /src/libfaad/pns.c | |
| parent | 7be172b50ab8d2c90ac818bfe721e70c274d9880 (diff) | |
| download | xine-lib-c40876878a3e1743738f4ce813330812d8bf49f0.tar.gz xine-lib-c40876878a3e1743738f4ce813330812d8bf49f0.tar.bz2 | |
sync to faad2 cvs, remove some warnings.
CVS patchset: 4592
CVS date: 2003/04/12 14:58:46
Diffstat (limited to 'src/libfaad/pns.c')
| -rw-r--r-- | src/libfaad/pns.c | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/src/libfaad/pns.c b/src/libfaad/pns.c index b14aba5d7..e7a0168e4 100644 --- a/src/libfaad/pns.c +++ b/src/libfaad/pns.c @@ -16,7 +16,7 @@ ** along with this program; if not, write to the Free Software ** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ** -** $Id: pns.c,v 1.2 2002/12/16 19:00:53 miguelfreitas Exp $ +** $Id: pns.c,v 1.3 2003/04/12 14:58:47 miguelfreitas Exp $ **/ #include "common.h" @@ -193,22 +193,10 @@ void pns_decode(ic_stream *ics_left, ic_stream *ics_right, { if (is_noise(ics_right, g, sfb)) { - if (ics_left->ms_mask_present == 1) + if (((ics_left->ms_mask_present == 1) && + (ics_left->ms_used[g][sfb])) || + (ics_left->ms_mask_present == 2)) { - if (ics_left->ms_used[g][sfb]) - { - uint16_t c; - - offs = ics_right->swb_offset[sfb]; - size = ics_right->swb_offset[sfb+1] - offs; - - for (c = 0; c < size; c++) - { - spec_right[(group*nshort) + offs + c] = - spec_left[(group*nshort) + offs + c]; - } - } - } else if (ics_left->ms_mask_present == 2) { uint16_t c; offs = ics_right->swb_offset[sfb]; |