RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

indent 

Originally committed as revision 12901 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2008-04-19 10:48:50 +00:00
parent 12eef728bf
commit 7bc5f6e53e
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
libavcodec/aac_ac3_parser.c
View File

@ -67,20 +67,20 @@ get_next:
*poutbuf = buf; *poutbuf = buf;
*poutbuf_size = buf_size; *poutbuf_size = buf_size;
/* update codec info */ /* update codec info */
avctx->sample_rate = s->sample_rate; avctx->sample_rate = s->sample_rate;
/* allow downmixing to stereo (or mono for AC3) */ /* allow downmixing to stereo (or mono for AC3) */
if(avctx->request_channels > 0 && if(avctx->request_channels > 0 &&
avctx->request_channels < s->channels && avctx->request_channels < s->channels &&
(avctx->request_channels <= 2 || (avctx->request_channels <= 2 ||
(avctx->request_channels == 1 && (avctx->request_channels == 1 &&
avctx->codec_id == CODEC_ID_AC3))) { avctx->codec_id == CODEC_ID_AC3))) {
avctx->channels = avctx->request_channels; avctx->channels = avctx->request_channels;
} else { } else {
avctx->channels = s->channels; avctx->channels = s->channels;
} }
avctx->bit_rate = s->bit_rate; avctx->bit_rate = s->bit_rate;
avctx->frame_size = s->samples; avctx->frame_size = s->samples;
return i; return i;
} }