[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[104] mplayerxp

[<nic...@us...>]

Revision: 104
          http://mplayerxp.svn.sourceforge.net/mplayerxp/?rev=104&view=rev
Author:   nickols_k
Date:     2010-01-16 16:16:00 +0000 (Sat, 16 Jan 2010)

Log Message:
-----------
fixes

Modified Paths:
--------------
    mplayerxp/cpudetect.c
    mplayerxp/libmpcodecs/ad_mp3.c

Modified: mplayerxp/cpudetect.c
===================================================================
--- mplayerxp/cpudetect.c	2010-01-16 15:33:05 UTC (rev 103)
+++ mplayerxp/cpudetect.c	2010-01-16 16:16:00 UTC (rev 104)
@@ -37,33 +37,29 @@
 // return TRUE if cpuid supported
 static int has_cpuid()
 {
-	int a, c;
-
 #ifdef ARCH_X86_64
 	return 1;
 #else
+	int a, c;
 // code from libavcodec:
     __asm__ __volatile__ (
-                          /* See if CPUID instruction is supported ... */
-                          /* ... Get copies of EFLAGS into eax and ecx */
-                          "pushf\n\t"
-                          "pop %0\n\t"
-                          "mov %0, %1\n\t"
-                          
-                          /* ... Toggle the ID bit in one copy and store */
-                          /*     to the EFLAGS reg */
-                          "xor $0x200000, %0\n\t"
-                          "push %0\n\t"
-                          "popf\n\t"
-                          
-                          /* ... Get the (hopefully modified) EFLAGS */
-                          "pushf\n\t"
-                          "pop %0\n\t"
-                          : "=a" (a), "=c" (c)
-                          :
-                          : "cc" 
-                          );
-
+	/* See if CPUID instruction is supported ... */
+	/* ... Get copies of EFLAGS into eax and ecx */
+	"pushf\n\t"
+	"pop %0\n\t"
+	"mov %0, %1\n\t"
+	/* ... Toggle the ID bit in one copy and store */
+	/*     to the EFLAGS reg */
+	"xor $0x200000, %0\n\t"
+	"push %0\n\t"
+	"popf\n\t"
+	/* ... Get the (hopefully modified) EFLAGS */
+	"pushf\n\t"
+	"pop %0\n\t"
+	: "=a" (a), "=c" (c)
+	:
+	: "cc"
+    );
 	return (a!=c);
 #endif
 }

Modified: mplayerxp/libmpcodecs/ad_mp3.c
===================================================================
--- mplayerxp/libmpcodecs/ad_mp3.c	2010-01-16 15:33:05 UTC (rev 103)
+++ mplayerxp/libmpcodecs/ad_mp3.c	2010-01-16 16:16:00 UTC (rev 104)
@@ -339,8 +339,9 @@
     size_t len=0,done;
     while(len<(size_t)minlen) {
 	indata_size=ds_get_packet_r(sh->ds,&indata,len>0?&apts:pts);
-	if(!indata_size) break;
+	if(indata_size<0) break;
 	err=mpg123_decode(sh->context,indata,indata_size,buf,maxlen,&done);
+	MSG_DBG2("mp3_decode: %i->%i [%i...%i]\n",indata_size,done,minlen,maxlen);
 	if(!((err==MPG123_OK)||(err==MPG123_NEED_MORE))) {
 	    MSG_ERR("mpg123_read = %s done = %u minlen = %u\n",mpg123_plain_strerror(err),done,minlen);
 	    break;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.