Re: [FFmpeg-devel] [PATCH] aacdec: When ignoring a PCE restore the previous config

[Alex Converse]

On Thu, Feb 16, 2017 at 3:21 PM, Carl Eugen Hoyos  wrote:
> 2017-02-16 22:13 GMT+01:00 Alex Converse :
>> This is related to, but doesn't solve ticker 6152.
>> ---
>>  libavcodec/aacdec_template.c | 1 +
>>  1 file changed, 1 insertion(+)
>>
>> diff --git a/libavcodec/aacdec_template.c b/libavcodec/aacdec_template.c
>> index 4e0a9529e1..4367e74cf7 100644
>> --- a/libavcodec/aacdec_template.c
>> +++ b/libavcodec/aacdec_template.c
>> @@ -3036,6 +3036,7 @@ static int aac_decode_frame_int(AVCodecContext *avctx, 
>> void *data,
>>  if (pce_found) {
>>  av_log(avctx, AV_LOG_ERROR,
>> "Not evaluating a further program_config_element as 
>> this construct is dubious at best.\n");
>> +pop_output_configuration(ac);
>>  } else {
>>  err = output_configure(ac, layout_map, tags, OC_TRIAL_PCE, 
>> 1);
>>  if (!err)
>
> I thought ticket #6152 was related to the else tree...
>
> Anyway: Since this is your code, please wait a day or two
> and push.
>

Pushed
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

Re: [FFmpeg-devel] [PATCH] aacdec: When ignoring a PCE restore the previous config

[Carl Eugen Hoyos]

2017-02-16 22:13 GMT+01:00 Alex Converse :
> This is related to, but doesn't solve ticker 6152.
> ---
>  libavcodec/aacdec_template.c | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/libavcodec/aacdec_template.c b/libavcodec/aacdec_template.c
> index 4e0a9529e1..4367e74cf7 100644
> --- a/libavcodec/aacdec_template.c
> +++ b/libavcodec/aacdec_template.c
> @@ -3036,6 +3036,7 @@ static int aac_decode_frame_int(AVCodecContext *avctx, 
> void *data,
>  if (pce_found) {
>  av_log(avctx, AV_LOG_ERROR,
> "Not evaluating a further program_config_element as 
> this construct is dubious at best.\n");
> +pop_output_configuration(ac);
>  } else {
>  err = output_configure(ac, layout_map, tags, OC_TRIAL_PCE, 
> 1);
>  if (!err)

I thought ticket #6152 was related to the else tree...

Anyway: Since this is your code, please wait a day or two
and push.

Thank you, Carl Eugen
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel