flacdec: cosmetics: move 2 statements to immediately after frame

decoding.

Originally committed as revision 17819 to svn://svn.ffmpeg.org/ffmpeg/trunk
release/0.6
Justin Ruggles 16 years ago
parent fd6fd470ce
commit bf1d7e285c
  1. 5
      libavcodec/flacdec.c

@ -683,6 +683,8 @@ static int flac_decode_frame(AVCodecContext *avctx,
s->bitstream_index=0; s->bitstream_index=0;
return -1; return -1;
} }
*data_size = s->blocksize * s->channels * (s->is32 ? 4 : 2);
bytes_read = (get_bits_count(&s->gb)+7)/8;
#define DECORRELATE(left, right)\ #define DECORRELATE(left, right)\
assert(s->channels == 2);\ assert(s->channels == 2);\
@ -718,9 +720,6 @@ static int flac_decode_frame(AVCodecContext *avctx,
DECORRELATE( (a-=b>>1) + b, a) DECORRELATE( (a-=b>>1) + b, a)
} }
*data_size = s->blocksize * s->channels * (s->is32 ? 4 : 2);
bytes_read = (get_bits_count(&s->gb)+7)/8;
end: end:
if (bytes_read > buf_size) { if (bytes_read > buf_size) {
av_log(s->avctx, AV_LOG_ERROR, "overread: %d\n", bytes_read - buf_size); av_log(s->avctx, AV_LOG_ERROR, "overread: %d\n", bytes_read - buf_size);

Loading…
Cancel
Save