oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

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

Browse Source
This commit is contained in:
Max Kellermann 2018-10-21 19:06:15 +02:00
parent 92541dedc0
commit 562ae44d38
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/decoder/plugins/MadDecoderPlugin.cxx
View File

@ -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)
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)
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)