summaryrefslogtreecommitdiff
path: root/libavcodec/faad.c
diff options
context:
space:
mode:
authorLuca Abeni <lucabe72@email.it>2004-06-05 22:36:43 +0000
committerMichael Niedermayer <michaelni@gmx.at>2004-06-05 22:36:43 +0000
commit940aed50ed1b1920d5363fa63f7e2c5d6e823817 (patch)
tree63e9d69fa540a5bfdb0d06373b62dfd3b64d9d2b /libavcodec/faad.c
parentf4bd8cf0b128f24d89beb1c38f19ba1b4befc8d3 (diff)
sample_rate and channels in aac audio patch by (Luca Abeni <lucabe72 at email dot it>)
Originally committed as revision 3198 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/faad.c')
-rw-r--r--libavcodec/faad.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/faad.c b/libavcodec/faad.c
index 05f6a2be75..b2903819a4 100644
--- a/libavcodec/faad.c
+++ b/libavcodec/faad.c
@@ -116,6 +116,9 @@ static int faac_init_mp4(AVCodecContext *avctx)
if (r < 0)
av_log(avctx, AV_LOG_ERROR, "faacDecInit2 failed r:%d sr:%ld ch:%ld s:%d\n",
r, samplerate, (long)channels, avctx->extradata_size);
+ avctx->sample_rate = samplerate;
+ avctx->channels = channels;
+
return r;
}