Merge commit '0c0b87f12d48d4e7f0d3d13f9345e828a3a5ea32'

[ffmpeg] / libavcodec / dca_lbr.c

diff --git a/libavcodec/dca_lbr.c b/libavcodec/dca_lbr.c
index 56c5f40982bd9c0a848756ffdc94d33d5ba2e558..3b50a99cf6de19c3e8e8820302232ff7be28b8e6 100644 (file)
--- 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;