[ros-diffs] [akhaldi] 70233: [LIBMPG123] Update to v1.22.4.

Author: akhaldi
Date: Wed Dec  2 11:13:12 2015
New Revision: 70233
URL: http://svn.reactos.org/svn/reactos?rev=70233&view=rev
Log:
[LIBMPG123] Update to v1.22.4.
Modified:
    trunk/reactos/lib/3rdparty/libmpg123/id3.c
    trunk/reactos/lib/3rdparty/libmpg123/parse.c
    trunk/reactos/media/doc/3rd Party Files.txt
Modified: trunk/reactos/lib/3rdparty/libmpg123/id3.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libmpg123/id3…
==============================================================================
--- trunk/reactos/lib/3rdparty/libmpg123/id3.c  [iso-8859-1] (original)
+++ trunk/reactos/lib/3rdparty/libmpg123/id3.c  [iso-8859-1] Wed Dec  2 11:13:12 2015
@@ -1051,10 +1051,10 @@
        for(i=0; i < n; i+=2)
        {
                unsigned long point = ((unsigned long) s[i+high]<<8) + s[i+low];
-               if((point & 0xd800) == 0xd800) /* lead surrogate */
+               if((point & 0xfc00) == 0xd800) /* lead surrogate */
                {
                        unsigned short second = (i+3 < l) ? (s[i+2+high]<<8) +
s[i+2+low] : 0;
-                       if((second & 0xdc00) == 0xdc00) /* good... */
+                       if((second & 0xfc00) == 0xdc00) /* good... */
                        {
                                point = FULLPOINT(point,second);
                                length += UTF8LEN(point); /* possibly 4 bytes */
@@ -1077,7 +1077,7 @@
        for(i=0; i < n; i+=2)
        {
                unsigned long codepoint = ((unsigned long) s[i+high]<<8) + s[i+low];
-               if((codepoint & 0xd800) == 0xd800) /* lead surrogate */
+               if((codepoint & 0xfc00) == 0xd800) /* lead surrogate */
                {
                        unsigned short second = (s[i+2+high]<<8) + s[i+2+low];
                        codepoint = FULLPOINT(codepoint,second);
Modified: trunk/reactos/lib/3rdparty/libmpg123/parse.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libmpg123/par…
==============================================================================
--- trunk/reactos/lib/3rdparty/libmpg123/parse.c        [iso-8859-1] (original)
+++ trunk/reactos/lib/3rdparty/libmpg123/parse.c        [iso-8859-1] Wed Dec  2 11:13:12
2015
@@ -694,7 +694,7 @@
  * <0: error codes, possibly from feeder buffer (NEED_MORE)
  *  PARSE_BAD: cannot get the framesize for some reason and shall silentry try the next
possible header (if this is no free format stream after all...)
  */
-static int guess_freeformat_framesize(mpg123_handle *fr)
+static int guess_freeformat_framesize(mpg123_handle *fr, unsigned long oldhead)
 {
        long i;
        int ret;
@@ -714,7 +714,7 @@
                if((ret=fr->rd->head_shift(fr,&head))<=0) return ret;
                /* No head_check needed, the mask contains all relevant bits. */
-               if((head & HDR_SAMEMASK) == (fr->oldhead & HDR_SAMEMASK))
+               if((head & HDR_SAMEMASK) == (oldhead & HDR_SAMEMASK))
                {
                        fr->rd->back_bytes(fr,i+1);
                        fr->framesize = i-3;
@@ -791,7 +791,7 @@
                                if(VERBOSE3) error("You fooled me too often. Refusing
to guess free format frame size _again_.");
                                return PARSE_BAD;
                        }
-                       ret = guess_freeformat_framesize(fr);
+                       ret = guess_freeformat_framesize(fr, newhead);
                        if(ret == PARSE_GOOD)
                        {
                                fr->freeformat_framesize = fr->framesize -
fr->padding;
Modified: trunk/reactos/media/doc/3rd Party Files.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/3rd%20Party%20Fi…
==============================================================================
--- trunk/reactos/media/doc/3rd Party Files.txt [iso-8859-1] (original)
+++ trunk/reactos/media/doc/3rd Party Files.txt [iso-8859-1] Wed Dec  2 11:13:12 2015
@@ -63,7 +63,7 @@
 Website: http://www.mega-nerd.com/SRC/download.html
 Title:  libmpg123 (used by winemp3.acm)
-Used Version: 1.22.1
+Used Version: 1.22.4
 Website: http://www.mpg123.de/
 Title:  STLport