Merge branch 'v0.16.x'

Conflicts:
	NEWS
	configure.ac
This commit is contained in:
Max Kellermann
2011-01-07 23:52:23 +01:00
15 changed files with 115 additions and 87 deletions

View File

@@ -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 */