On Thu, Jan 22, 2015 at 11:04 AM, Alex Converse <[email protected]> wrote:
> ---
> libavcodec/aacdec.c | 9 +++++----
> 1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c
> index 549e5e5..bca785c 100644
> --- a/libavcodec/aacdec.c
> +++ b/libavcodec/aacdec.c
> @@ -2703,11 +2703,12 @@ static int aac_decode_er_frame(AVCodecContext *avctx,
> void *data,
> int *got_frame_ptr, GetBitContext *gb)
My commit message references the wrong function, oops
> {
> AACContext *ac = avctx->priv_data;
> + MPEG4AudioConfig *m4ac = &ac->oc[1].m4ac;
> ChannelElement *che;
> int err, i;
> int samples = 1024;
> - int chan_config = ac->oc[1].m4ac.chan_config;
> - int aot = ac->oc[1].m4ac.object_type;
> + int chan_config = m4ac->chan_config;
> + int aot = m4ac->object_type;
>
> if (aot == AOT_ER_AAC_LD || aot == AOT_ER_AAC_ELD)
> samples >>= 1;
> @@ -2719,13 +2720,13 @@ static int aac_decode_er_frame(AVCodecContext *avctx,
> void *data,
>
> // The FF_PROFILE_AAC_* defines are all object_type - 1
> // This may lead to an undefined profile being signaled
> - ac->avctx->profile = ac->oc[1].m4ac.object_type - 1;
> + ac->avctx->profile = m4ac->object_type - 1;
>
> ac->tags_mapped = 0;
>
> if (chan_config < 0 || chan_config >= 8) {
> avpriv_request_sample(avctx, "Unknown ER channel configuration %d",
> - ac->oc[1].m4ac.chan_config);
> + chan_config);
> return AVERROR_INVALIDDATA;
> }
> for (i = 0; i < tags_per_config[chan_config]; i++) {
> --
> 2.2.0.rc0.207.ga3a616c
>
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
