projects
/
libav.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
fd6fd47
)
flacdec: cosmetics: move 2 statements to immediately after frame
author
Justin Ruggles
<justin.ruggles@gmail.com>
Thu, 5 Mar 2009 01:23:53 +0000
(
01:23
+0000)
committer
Justin Ruggles
<justin.ruggles@gmail.com>
Thu, 5 Mar 2009 01:23:53 +0000
(
01:23
+0000)
decoding.
Originally committed as revision 17819 to svn://svn.ffmpeg.org/ffmpeg/trunk
libavcodec/flacdec.c
patch
|
blob
|
blame
|
history
diff --git
a/libavcodec/flacdec.c
b/libavcodec/flacdec.c
index
893eab5
..
5d8b834
100644
(file)
--- 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);