xenia-project/FFmpeg
1
0
Fork 0
mirror of https://github.com/xenia-project/FFmpeg.git synced 2025-02-10 22:33:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

aacdec: Rename elem_type_prev to che_prev_type.

Browse Source 
It describes the type of the previous che element (SCE, CPE, CCE, or
LFE) and does not reflect non-che elements.
This commit is contained in:
Alex Converse 2016-12-08 11:49:43 -08:00
parent d379592687
commit 51a055b206
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/aacdec_template.c
View File

@ -2923,7 +2923,7 @@ static int aac_decode_frame_int(AVCodecContext *avctx, void *data,
{ {
AACContext *ac = avctx->priv_data; AACContext *ac = avctx->priv_data;
ChannelElement *che = NULL, *che_prev = NULL; 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 err, elem_id;
int samples = 0, multiplier, audio_found = 0, pce_found = 0; int samples = 0, multiplier, audio_found = 0, pce_found = 0;
int is_dmono, sce_count = 0; int is_dmono, sce_count = 0;
@ -3029,7 +3029,7 @@ static int aac_decode_frame_int(AVCodecContext *avctx, void *data,
goto fail; goto fail;
} }
while (elem_id > 0) 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 */ err = 0; /* FIXME */
break; break;
@ -3039,8 +3039,8 @@ static int aac_decode_frame_int(AVCodecContext *avctx, void *data,
} }
if (elem_type < TYPE_DSE) { if (elem_type < TYPE_DSE) {
che_prev = che; che_prev = che;
elem_type_prev = elem_type; che_prev_type = elem_type;
} }
if (err) if (err)