diff options
| author | Alex Converse <alex.converse@gmail.com> | 2016-12-08 11:49:43 -0800 |
|---|---|---|
| committer | Alex Converse <alex.converse@gmail.com> | 2016-12-08 13:31:50 -0800 |
| commit | 51a055b20656aec7d6aa610a373c5a09839a8f92 (patch) | |
| tree | f2f180e04dcddb5aea95d7927098ca60ef3d7481 | |
| parent | d3795926876bae7c0421585708f9ade573a1f54a (diff) | |
| download | ffmpeg-51a055b20656aec7d6aa610a373c5a09839a8f92.tar.gz | |
aacdec: Rename elem_type_prev to che_prev_type.
It describes the type of the previous che element (SCE, CPE, CCE, or
LFE) and does not reflect non-che elements.
| -rw-r--r-- | libavcodec/aacdec_template.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/aacdec_template.c b/libavcodec/aacdec_template.c index 64d46e394e..83e9fb55ba 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) |