Skip to content

M
mpd
Commit 562ae44d authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

decoder/mad: remove unused attribute from `xing::magic`

parent 92541ded
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 11 deletions
src/decoder/plugins/MadDecoderPlugin.cxx
View file @ 562ae44d
...@@ -456,18 +456,12 @@ static constexpr unsigned NG_MAGIC = (('n' << 8) | 'g'); ...@@ -456,18 +456,12 @@ static constexpr unsigned NG_MAGIC = (('n' << 8) | 'g');
static constexpr unsigned IN_MAGIC = (('I' << 8) | 'n'); static constexpr unsigned IN_MAGIC = (('I' << 8) | 'n');
static constexpr unsigned FO_MAGIC = (('f' << 8) | 'o'); static constexpr unsigned FO_MAGIC = (('f' << 8) | 'o');
enum xing_magic {
XING_MAGIC_XING, /* VBR */
XING_MAGIC_INFO /* CBR */
};
struct xing { struct xing {
long flags; /* valid fields (see below) */ long flags; /* valid fields (see below) */
unsigned long frames; /* total number of frames */ unsigned long frames; /* total number of frames */
unsigned long bytes; /* total number of bytes */ unsigned long bytes; /* total number of bytes */
unsigned char toc[100]; /* 100-point seek table */ unsigned char toc[100]; /* 100-point seek table */
long scale; /* VBR quality */ long scale; /* VBR quality */
enum xing_magic magic; /* header magic */
}; };
static constexpr unsigned XING_FRAMES = 1; static constexpr unsigned XING_FRAMES = 1;
...@@ -510,7 +504,6 @@ parse_xing(struct xing *xing, struct mad_bitptr *ptr, int *oldbitlen) ...@@ -510,7 +504,6 @@ parse_xing(struct xing *xing, struct mad_bitptr *ptr, int *oldbitlen)
return false; return false;
bitlen -= 16; bitlen -= 16;
xing->magic = XING_MAGIC_XING;
} else if (bits == IN_MAGIC) { } else if (bits == IN_MAGIC) {
if (bitlen < 16) if (bitlen < 16)
return false; return false;
...@@ -519,11 +512,8 @@ parse_xing(struct xing *xing, struct mad_bitptr *ptr, int *oldbitlen) ...@@ -519,11 +512,8 @@ parse_xing(struct xing *xing, struct mad_bitptr *ptr, int *oldbitlen)
return false; return false;
bitlen -= 16; bitlen -= 16;
xing->magic = XING_MAGIC_INFO;
} }
else if (bits == NG_MAGIC) xing->magic = XING_MAGIC_XING; else if (bits != NG_MAGIC && bits != FO_MAGIC)
else if (bits == FO_MAGIC) xing->magic = XING_MAGIC_INFO;
else
return false; return false;
if (bitlen < 32) if (bitlen < 32)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment