[FFmpeg-cvslog] r11412 - trunk/libavcodec/aac_ac3_parser.c

[jbr]

Author: jbr
Date: Sat Jan  5 06:36:00 2008
New Revision: 11412

Log:
adjust output channels based on AVCodecContext.request_channels in AC3 parser

Modified:
   trunk/libavcodec/aac_ac3_parser.c

Modified: trunk/libavcodec/aac_ac3_parser.c
==============================================================================
--- trunk/libavcodec/aac_ac3_parser.c	(original)
+++ trunk/libavcodec/aac_ac3_parser.c	Sat Jan  5 06:36:00 2008
@@ -61,6 +61,13 @@ int ff_aac_ac3_parse(AVCodecParserContex
                     /* update codec info */
                     avctx->sample_rate = sample_rate;
                     avctx->channels = channels;
+                    /* allow downmixing to mono or stereo for AC3 */
+                    if(avctx->request_channels > 0 &&
+                            avctx->request_channels < channels &&
+                            avctx->request_channels <= 2 &&
+                            avctx->codec_id == CODEC_ID_AC3) {
+                        avctx->channels = avctx->request_channels;
+                    }
                     avctx->bit_rate = bit_rate;
                     avctx->frame_size = samples;
                 }