On Tue, Nov 22, 2011 at 12:14:19PM -0800, Alex Converse wrote:
> Fixes File1.aac and Bug 80.
> ---
> libavcodec/aacdec.c | 3 ++-
> 1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c
> index 203ecd3..1015030 100644
> --- a/libavcodec/aacdec.c
> +++ b/libavcodec/aacdec.c
> @@ -2085,7 +2085,8 @@ static int parse_adts_frame_header(AACContext *ac,
> GetBitContext *gb)
> ac->m4ac.chan_config = hdr_info.chan_config;
> if (set_default_channel_config(ac->avctx, new_che_pos,
> hdr_info.chan_config))
> return -7;
> - if (output_configure(ac, ac->che_pos, new_che_pos,
> hdr_info.chan_config, OC_TRIAL_FRAME))
> + if (output_configure(ac, ac->che_pos, new_che_pos,
> hdr_info.chan_config,
> + FFMAX(ac->output_configured,
> OC_TRIAL_FRAME)))
> return -7;
> } else if (ac->output_configured != OC_LOCKED) {
> ac->m4ac.chan_config = 0;
ok, my sample which needs the output reconfiguration still works
Janne
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
