summaryrefslogtreecommitdiffstats
path: root/libavcodec/dca.c
diff options
context:
space:
mode:
authorReimar Döffinger <Reimar.Doeffinger@gmx.de>2007-08-23 20:28:28 +0000
committerReimar Döffinger <Reimar.Doeffinger@gmx.de>2007-08-23 20:28:28 +0000
commitb1ec601f7f4d7fd5ae4a17b6efb4471b67c7ee06 (patch)
tree6251796503a731bbdf7074e9b6a4edd05c4ffb5a /libavcodec/dca.c
parent0e6b14c2a79c193706a84624e83ba5fcc2308052 (diff)
downloadffmpeg-streaming-b1ec601f7f4d7fd5ae4a17b6efb4471b67c7ee06.zip
ffmpeg-streaming-b1ec601f7f4d7fd5ae4a17b6efb4471b67c7ee06.tar.gz
Add request_channels member to AVCodecContext so we now have a proper
way to tell the decoder how many output channels we would like. Originally committed as revision 10199 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/dca.c')
-rw-r--r--libavcodec/dca.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/dca.c b/libavcodec/dca.c
index d9bf03a..0426693 100644
--- a/libavcodec/dca.c
+++ b/libavcodec/dca.c
@@ -1158,6 +1158,7 @@ static int dca_decode_frame(AVCodecContext * avctx,
avctx->bit_rate = s->bit_rate;
channels = s->prim_channels + !!s->lfe;
+ avctx->channels = avctx->request_channels;
if(avctx->channels == 0) {
avctx->channels = channels;
} else if(channels < avctx->channels) {
OpenPOWER on IntegriCloud