Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mpd
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Иван Мажукин
mpd
Commits
562ae44d
Commit
562ae44d
authored
Oct 21, 2018
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
decoder/mad: remove unused attribute from `xing::magic`
parent
92541ded
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
11 deletions
+1
-11
MadDecoderPlugin.cxx
src/decoder/plugins/MadDecoderPlugin.cxx
+1
-11
No files found.
src/decoder/plugins/MadDecoderPlugin.cxx
View file @
562ae44d
...
...
@@ -456,18 +456,12 @@ static constexpr unsigned NG_MAGIC = (('n' << 8) | 'g');
static
constexpr
unsigned
IN_MAGIC
=
((
'I'
<<
8
)
|
'n'
);
static
constexpr
unsigned
FO_MAGIC
=
((
'f'
<<
8
)
|
'o'
);
enum
xing_magic
{
XING_MAGIC_XING
,
/* VBR */
XING_MAGIC_INFO
/* CBR */
};
struct
xing
{
long
flags
;
/* valid fields (see below) */
unsigned
long
frames
;
/* total number of frames */
unsigned
long
bytes
;
/* total number of bytes */
unsigned
char
toc
[
100
];
/* 100-point seek table */
long
scale
;
/* VBR quality */
enum
xing_magic
magic
;
/* header magic */
};
static
constexpr
unsigned
XING_FRAMES
=
1
;
...
...
@@ -510,7 +504,6 @@ parse_xing(struct xing *xing, struct mad_bitptr *ptr, int *oldbitlen)
return
false
;
bitlen
-=
16
;
xing
->
magic
=
XING_MAGIC_XING
;
}
else
if
(
bits
==
IN_MAGIC
)
{
if
(
bitlen
<
16
)
return
false
;
...
...
@@ -519,11 +512,8 @@ parse_xing(struct xing *xing, struct mad_bitptr *ptr, int *oldbitlen)
return
false
;
bitlen
-=
16
;
xing
->
magic
=
XING_MAGIC_INFO
;
}
else
if
(
bits
==
NG_MAGIC
)
xing
->
magic
=
XING_MAGIC_XING
;
else
if
(
bits
==
FO_MAGIC
)
xing
->
magic
=
XING_MAGIC_INFO
;
else
else
if
(
bits
!=
NG_MAGIC
&&
bits
!=
FO_MAGIC
)
return
false
;
if
(
bitlen
<
32
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment