OSDN Git Service
(root)
/
coroid
/
libav_saccubus.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9b57545
)
cosmetics: add a comment, remove a comment
author
Justin Ruggles
<justin.ruggles@gmail.com>
Sat, 31 May 2008 22:12:49 +0000
(22:12 +0000)
committer
Justin Ruggles
<justin.ruggles@gmail.com>
Sat, 31 May 2008 22:12:49 +0000
(22:12 +0000)
Originally committed as revision 13590 to svn://svn.ffmpeg.org/ffmpeg/trunk
libavcodec/ac3dec.c
patch
|
blob
|
history
diff --git
a/libavcodec/ac3dec.c
b/libavcodec/ac3dec.c
index
7052fab
..
d3e1bc1
100644
(file)
--- a/
libavcodec/ac3dec.c
+++ b/
libavcodec/ac3dec.c
@@
-1154,7
+1154,6
@@
static int ac3_decode_frame(AVCodecContext * avctx, void *data, int *data_size,
}
}
- /* parse the syncinfo */
if(err && err != AC3_PARSE_ERROR_CRC) {
switch(err) {
case AC3_PARSE_ERROR_SYNC:
@@
-1211,6
+1210,8
@@
static int ac3_decode_frame(AVCodecContext * avctx, void *data, int *data_size,
if (!err && ac3_parse_audio_block(s, blk)) {
av_log(avctx, AV_LOG_ERROR, "error parsing the audio block\n");
}
+
+ /* interleave output samples */
for (i = 0; i < 256; i++)
for (ch = 0; ch < s->out_channels; ch++)
*(out_samples++) = s->int_output[ch][i];