RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-11 17:55:21 +00:00
Code Issues Projects Releases Wiki Activity

do not set channels before checking request_channels

Browse Source 
Originally committed as revision 11414 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Justin Ruggles 2008-01-05 15:18:15 +00:00
parent 296cbe5728
commit 6cd325c106
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/aac_ac3_parser.c
View File

@ -60,13 +60,14 @@ int ff_aac_ac3_parse(AVCodecParserContext *s1,
s->frame_size = len; s->frame_size = len;
/* update codec info */ /* update codec info */
avctx->sample_rate = sample_rate; avctx->sample_rate = sample_rate;
avctx->channels = channels;
/* allow downmixing to mono or stereo for AC3 */ /* allow downmixing to mono or stereo for AC3 */
if(avctx->request_channels > 0 && if(avctx->request_channels > 0 &&
avctx->request_channels < channels && avctx->request_channels < channels &&
avctx->request_channels <= 2 && avctx->request_channels <= 2 &&
avctx->codec_id == CODEC_ID_AC3) { avctx->codec_id == CODEC_ID_AC3) {
avctx->channels = avctx->request_channels; avctx->channels = avctx->request_channels;
} else {
avctx->channels = channels;
} }
avctx->bit_rate = bit_rate; avctx->bit_rate = bit_rate;
avctx->frame_size = samples; avctx->frame_size = samples;