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:
90350d7
)
Cosmetics after last commit
author
Alex Converse
<alex.converse@gmail.com>
Wed, 13 May 2009 17:59:46 +0000
(17:59 +0000)
committer
Alex Converse
<alex.converse@gmail.com>
Wed, 13 May 2009 17:59:46 +0000
(17:59 +0000)
Originally committed as revision 18816 to svn://svn.ffmpeg.org/ffmpeg/trunk
libavcodec/aac_ac3_parser.c
patch
|
blob
|
history
diff --git
a/libavcodec/aac_ac3_parser.c
b/libavcodec/aac_ac3_parser.c
index
90cbb95
..
85993c0
100644
(file)
--- a/
libavcodec/aac_ac3_parser.c
+++ b/
libavcodec/aac_ac3_parser.c
@@
-83,11
+83,9
@@
get_next:
(avctx->codec_id == CODEC_ID_AC3 ||
avctx->codec_id == CODEC_ID_EAC3)))) {
avctx->channels = avctx->request_channels;
- } else {
- if (avctx->codec_id != CODEC_ID_AAC || s->channels) {
+ } else if (avctx->codec_id != CODEC_ID_AAC || s->channels) {
avctx->channels = s->channels;
avctx->channel_layout = s->channel_layout;
- }
}
avctx->bit_rate = s->bit_rate;
avctx->frame_size = s->samples;