| Message ID | 1481226904-27465-1-git-send-email-alex.converse@gmail.com |
|---|---|
| State | Accepted |
| Commit | 51a055b20656aec7d6aa610a373c5a09839a8f92 |
| Headers | show |
On 8 December 2016 at 19:55, Alex Converse <alex.converse@gmail.com> wrote: > It describes the type of the previous che element (SCE, CPE, CCE, or > LFE) and does not reflect non-che elements. > --- > libavcodec/aacdec_template.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/libavcodec/aacdec_template.c b/libavcodec/aacdec_template.c > index 64d46e3..83e9fb5 100644 > --- a/libavcodec/aacdec_template.c > +++ b/libavcodec/aacdec_template.c > @@ -2923,7 +2923,7 @@ static int aac_decode_frame_int(AVCodecContext > *avctx, void *data, > { > AACContext *ac = avctx->priv_data; > ChannelElement *che = NULL, *che_prev = NULL; > - enum RawDataBlockType elem_type, elem_type_prev = TYPE_END; > + enum RawDataBlockType elem_type, che_prev_type = TYPE_END; > int err, elem_id; > int samples = 0, multiplier, audio_found = 0, pce_found = 0; > int is_dmono, sce_count = 0; > @@ -3029,7 +3029,7 @@ static int aac_decode_frame_int(AVCodecContext > *avctx, void *data, > goto fail; > } > while (elem_id > 0) > - elem_id -= decode_extension_payload(ac, gb, elem_id, > che_prev, elem_type_prev); > + elem_id -= decode_extension_payload(ac, gb, elem_id, > che_prev, che_prev_type); > err = 0; /* FIXME */ > break; > > @@ -3039,8 +3039,8 @@ static int aac_decode_frame_int(AVCodecContext > *avctx, void *data, > } > > if (elem_type < TYPE_DSE) { > - che_prev = che; > - elem_type_prev = elem_type; > + che_prev = che; > + che_prev_type = elem_type; > } > > if (err) > LGTM, thanks.
On Thu, Dec 8, 2016 at 12:56 PM, Rostislav Pehlivanov <atomnuker@gmail.com> wrote: > On 8 December 2016 at 19:55, Alex Converse <alex.converse@gmail.com> wrote: > >> It describes the type of the previous che element (SCE, CPE, CCE, or >> LFE) and does not reflect non-che elements. >> --- >> libavcodec/aacdec_template.c | 8 ++++---- >> 1 file changed, 4 insertions(+), 4 deletions(-) >> [...] > > LGTM, thanks. Pushed
diff --git a/libavcodec/aacdec_template.c b/libavcodec/aacdec_template.c index 64d46e3..83e9fb5 100644 --- a/libavcodec/aacdec_template.c +++ b/libavcodec/aacdec_template.c @@ -2923,7 +2923,7 @@ static int aac_decode_frame_int(AVCodecContext *avctx, void *data, { AACContext *ac = avctx->priv_data; ChannelElement *che = NULL, *che_prev = NULL; - enum RawDataBlockType elem_type, elem_type_prev = TYPE_END; + enum RawDataBlockType elem_type, che_prev_type = TYPE_END; int err, elem_id; int samples = 0, multiplier, audio_found = 0, pce_found = 0; int is_dmono, sce_count = 0; @@ -3029,7 +3029,7 @@ static int aac_decode_frame_int(AVCodecContext *avctx, void *data, goto fail; } while (elem_id > 0) - elem_id -= decode_extension_payload(ac, gb, elem_id, che_prev, elem_type_prev); + elem_id -= decode_extension_payload(ac, gb, elem_id, che_prev, che_prev_type); err = 0; /* FIXME */ break; @@ -3039,8 +3039,8 @@ static int aac_decode_frame_int(AVCodecContext *avctx, void *data, } if (elem_type < TYPE_DSE) { - che_prev = che; - elem_type_prev = elem_type; + che_prev = che; + che_prev_type = elem_type; } if (err)