diff options
| author | Roman Bogorodskiy <novel@FreeBSD.org> | 2005-03-10 16:08:02 +0000 |
|---|---|---|
| committer | Roman Bogorodskiy <novel@FreeBSD.org> | 2005-03-10 16:08:02 +0000 |
| commit | ef47d1dfcc02370f1369e8d6b2342460daae8a48 (patch) | |
| tree | 479283caa7c72af9e75b1b1005d52b63fcb53ec0 /audio | |
| parent | Update to 0.7 (diff) | |
Fix wrong handling of mp3 files with id3 tag "genre" = 148
Approved by: krion (mentor)
Notes
Notes:
svn path=/head/; revision=130811
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/mpg123/files/patch-CAN-2004-0991 | 19 | ||||
| -rw-r--r-- | audio/mpg123/files/patch-common.c | 31 |
2 files changed, 28 insertions, 22 deletions
diff --git a/audio/mpg123/files/patch-CAN-2004-0991 b/audio/mpg123/files/patch-CAN-2004-0991 index 4269a17466a0..8cb494117f5f 100644 --- a/audio/mpg123/files/patch-CAN-2004-0991 +++ b/audio/mpg123/files/patch-CAN-2004-0991 @@ -1,22 +1,3 @@ ---- common.c.orig 2003/01/29 19:22:48 1.4 -+++ common.c 2005/01/01 19:21:47 1.5 -@@ -343,9 +343,12 @@ - fr->mpeg25 = 1; - } - -- if (!param.tryresync || !oldhead) { -- /* If "tryresync" is true, assume that certain -- parameters do not change within the stream! */ -+ if (!param.tryresync || !oldhead || -+ (((oldhead>>19)&0x3) ^ ((newhead>>19)&0x3))) { -+ /* If "tryresync" is false, assume that certain -+ parameters do not change within the stream! -+ Force an update if lsf or mpeg25 settings -+ have changed. */ - fr->lay = 4-((newhead>>17)&3); - if( ((newhead>>10)&0x3) == 0x3) { - fprintf(stderr,"Stream error\n"); -Index: debian/mpg123/layer2.c --- layer2.c.orig Tue Sep 7 14:32:13 2004 +++ layer2.c Sat Jan 1 20:21:47 2005 @@ -240,7 +240,7 @@ diff --git a/audio/mpg123/files/patch-common.c b/audio/mpg123/files/patch-common.c index 3272a2a2f107..4b1f6a0e1e4d 100644 --- a/audio/mpg123/files/patch-common.c +++ b/audio/mpg123/files/patch-common.c @@ -1,6 +1,6 @@ ---- common.c.orig Thu Jul 17 19:20:43 2003 -+++ common.c Thu Jul 17 19:22:04 2003 -@@ -123,7 +123,7 @@ int head_check(unsigned long head) +--- common.c.orig Thu Mar 10 15:33:55 2005 ++++ common.c Thu Mar 10 15:34:53 2005 +@@ -137,7 +137,7 @@ return FALSE; if(!((head>>17)&3)) return FALSE; @@ -9,3 +9,28 @@ return FALSE; if( ((head>>10)&0x3) == 0x3 ) return FALSE; +@@ -356,9 +356,12 @@ + fr->mpeg25 = 1; + } + +- if (!param.tryresync || !oldhead) { +- /* If "tryresync" is true, assume that certain +- parameters do not change within the stream! */ ++ if (!param.tryresync || !oldhead || ++ (((oldhead>>19)&0x3) ^ ((newhead>>19)&0x3))) { ++ /* If "tryresync" is false, assume that certain ++ parameters do not change within the stream! ++ Force an update if lsf or mpeg25 settings ++ have changed. */ + fr->lay = 4-((newhead>>17)&3); + if( ((newhead>>10)&0x3) == 0x3) { + fprintf(stderr,"Stream error\n"); +@@ -525,7 +528,7 @@ + decodestr(comment,tag->comment,30); + decodestr(year,tag->year,4); + +- if ( tag->genre <= sizeof(genre_table)/sizeof(*genre_table) ) { ++ if ( tag->genre < sizeof(genre_table)/sizeof(*genre_table) ) { + strncpy(genre, genre_table[tag->genre], 30); + } else { + strncpy(genre,"Unknown",30); |