From f6b86b62f785a67a356c87f5ea483a1cbe338191 Mon Sep 17 00:00:00 2001 From: foo86 Date: Mon, 10 Jul 2017 17:11:31 +0300 Subject: avcodec/dca: move some enumeration typedefs into headers These values will be used by the parser. Prefix them with DCA_ appropriately. Signed-off-by: James Almer --- libavcodec/dca_lbr.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'libavcodec/dca_lbr.c') diff --git a/libavcodec/dca_lbr.c b/libavcodec/dca_lbr.c index 56c5f40982..3b50a99cf6 100644 --- a/libavcodec/dca_lbr.c +++ b/libavcodec/dca_lbr.c @@ -30,11 +30,6 @@ #define AMP_MAX 56 -enum LBRHeader { - LBR_HEADER_SYNC_ONLY = 1, - LBR_HEADER_DECODER_INIT = 2 -}; - enum LBRFlags { LBR_FLAG_24_BIT = 0x01, LBR_FLAG_LFE_PRESENT = 0x02, @@ -1171,13 +1166,13 @@ int ff_dca_lbr_parse(DCALbrDecoder *s, uint8_t *data, DCAExssAsset *asset) // LBR header type switch (bytestream2_get_byte(&gb)) { - case LBR_HEADER_SYNC_ONLY: + case DCA_LBR_HEADER_SYNC_ONLY: if (!s->sample_rate) { av_log(s->avctx, AV_LOG_ERROR, "LBR decoder not initialized\n"); return AVERROR_INVALIDDATA; } break; - case LBR_HEADER_DECODER_INIT: + case DCA_LBR_HEADER_DECODER_INIT: if ((ret = parse_decoder_init(s, &gb)) < 0) { s->sample_rate = 0; return ret; -- cgit v1.2.1