diff options
| author | Max Kellermann <max@duempel.org> | 2011-01-07 23:52:23 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2011-01-07 23:52:23 +0100 |
| commit | 1a2ea4c06cd9fd648bb0243a0dfd9e0b960a6788 (patch) | |
| tree | 8a13ed86728b59caebd86dc7a1287c234b4985f1 /src/decoder/mad_decoder_plugin.c | |
| parent | a800afcbf8845df0edc6aee3bb48036bba34e255 (diff) | |
| parent | 8c0afd8557b1823e2df94c9f4de90c29eafbf035 (diff) | |
| download | mpd-1a2ea4c06cd9fd648bb0243a0dfd9e0b960a6788.tar.gz mpd-1a2ea4c06cd9fd648bb0243a0dfd9e0b960a6788.tar.xz mpd-1a2ea4c06cd9fd648bb0243a0dfd9e0b960a6788.zip | |
Merge branch 'v0.16.x'
Conflicts:
NEWS
configure.ac
Diffstat (limited to 'src/decoder/mad_decoder_plugin.c')
| -rw-r--r-- | src/decoder/mad_decoder_plugin.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/decoder/mad_decoder_plugin.c b/src/decoder/mad_decoder_plugin.c index a11d1b020..2c2906c5c 100644 --- a/src/decoder/mad_decoder_plugin.c +++ b/src/decoder/mad_decoder_plugin.c @@ -547,14 +547,14 @@ enum { XING_SCALE = 0x00000008L }; -struct version { +struct lame_version { unsigned major; unsigned minor; }; struct lame { char encoder[10]; /* 9 byte encoder name/version ("LAME3.97b") */ - struct version version; /* struct containing just the version */ + struct lame_version version; /* struct containing just the version */ float peak; /* replaygain peak */ float track_gain; /* replaygain track gain */ float album_gain; /* replaygain album gain */ |