From bf1d7e285c2859dbea59ebbe30fa8f5b4f5c0b74 Mon Sep 17 00:00:00 2001
From: Justin Ruggles <justin.ruggles@gmail.com>
Date: Thu, 5 Mar 2009 01:23:53 +0000
Subject: [PATCH] flacdec: cosmetics: move 2 statements to immediately after
frame decoding.
Originally committed as revision 17819 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavcodec/flacdec.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/libavcodec/flacdec.c b/libavcodec/flacdec.c
index 893eab57052..5d8b834efca 100644
--- a/libavcodec/flacdec.c
+++ b/libavcodec/flacdec.c
@@ -683,6 +683,8 @@ static int flac_decode_frame(AVCodecContext *avctx,
s->bitstream_index=0;
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)\
assert(s->channels == 2);\
@@ -718,9 +720,6 @@ static int flac_decode_frame(AVCodecContext *avctx,
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:
if (bytes_read > buf_size) {
av_log(s->avctx, AV_LOG_ERROR, "overread: %d\n", bytes_read - buf_size);
--
GitLab