[FFmpeg-soc] [soc]: r5336 - wmapro/wmaprodec.c
faust3
subversion at mplayerhq.hu
Sat Aug 29 16:58:33 CEST 2009
Author: faust3
Date: Sat Aug 29 16:58:33 2009
New Revision: 5336
Log:
get rid of missing_samples
Modified:
wmapro/wmaprodec.c
Modified: wmapro/wmaprodec.c
==============================================================================
--- wmapro/wmaprodec.c Sat Aug 29 16:51:37 2009 (r5335)
+++ wmapro/wmaprodec.c Sat Aug 29 16:58:33 2009 (r5336)
@@ -527,7 +527,6 @@ static int decode_tilehdr(WMA3DecodeCont
}
} else { /** different channels have different subframe layouts */
uint16_t num_samples[WMAPRO_MAX_CHANNELS];
- int missing_samples = s->num_channels * s->samples_per_frame;
int channels_for_cur_subframe = s->num_channels;
int min_channel_len = 0;
@@ -569,10 +568,8 @@ static int decode_tilehdr(WMA3DecodeCont
}
chan->subframe_len[chan->num_subframes] = subframe_len;
num_samples[c] += subframe_len;
- missing_samples -= subframe_len;
++chan->num_subframes;
- if (missing_samples < 0
- || num_samples[c] > s->samples_per_frame) {
+ if (num_samples[c] > s->samples_per_frame) {
av_log(s->avctx, AV_LOG_ERROR,"broken frame: "
"channel len > samples_per_frame\n");
return AVERROR_INVALIDDATA;
More information about the FFmpeg-soc
mailing list