diff options
| author | foo86 <foobaz86@gmail.com> | 2017-07-10 17:11:31 +0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-07-18 21:04:55 -0300 |
| commit | f6b86b62f785a67a356c87f5ea483a1cbe338191 (patch) | |
| tree | b7c319a425f3fa8cfb089df32d712f17ea427e87 /libavcodec/dca_lbr.c | |
| parent | 5c7e7ac6d4504364b2f08a05cc983ced76bb5c51 (diff) | |
| download | ffmpeg-f6b86b62f785a67a356c87f5ea483a1cbe338191.tar.gz | |
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 <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/dca_lbr.c')
| -rw-r--r-- | libavcodec/dca_lbr.c | 9 |
1 files changed, 2 insertions, 7 deletions
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; |