wrapper/FFmpeg
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cosmetics after last commit

Browse source 
Originally committed as revision 18816 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Alex Converse 2009-05-13 17:59:46 +00:00
parent 90350d73f8
commit f2e5c8b96a
1 changed files with 1 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libavcodec/aac_ac3_parser.c
View file

@ -83,11 +83,9 @@ get_next:
(avctx->codec_id == CODEC_ID_AC3 || (avctx->codec_id == CODEC_ID_AC3 ||
avctx->codec_id == CODEC_ID_EAC3)))) { avctx->codec_id == CODEC_ID_EAC3)))) {
avctx->channels = avctx->request_channels; avctx->channels = avctx->request_channels;
} else { } else if (avctx->codec_id != CODEC_ID_AAC || s->channels) {
if (avctx->codec_id != CODEC_ID_AAC || s->channels) {
avctx->channels = s->channels; avctx->channels = s->channels;
avctx->channel_layout = s->channel_layout; avctx->channel_layout = s->channel_layout;
}
} }
avctx->bit_rate = s->bit_rate; avctx->bit_rate = s->bit_rate;
avctx->frame_size = s->samples; avctx->frame_size = s->samples;