[MPlayer-cvslog] CVS: main/libmpdemux ebml.c, 1.5, 1.6 nuppelvideo.h, 1.3, 1.4

Reimar Döffinger CVS syncmail at mplayerhq.hu
Wed Jul 13 19:24:44 CEST 2005


CVS change done by Reimar Döffinger CVS

Update of /cvsroot/mplayer/main/libmpdemux
In directory mail:/var2/tmp/cvs-serv22384/libmpdemux

Modified Files:
	ebml.c nuppelvideo.h 
Log Message:
(hopefully) fixing remaining float endianness problems


Index: ebml.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/ebml.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ebml.c	10 Jul 2005 18:31:13 -0000	1.5
+++ ebml.c	13 Jul 2005 17:24:42 -0000	1.6
@@ -12,6 +12,7 @@
 
 #include "stream.h"
 #include "ebml.h"
+#include "bswap.h"
 
 
 /*
@@ -194,7 +195,7 @@
         union {uint8_t data[10]; long double ld;} u;
         if (stream_read (s, u.data, 10) != 10)
           return EBML_FLOAT_INVALID;
-        value = u.ld;
+        value = be2me_ldbl(u.ld);
         break;
       }
 

Index: nuppelvideo.h
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/nuppelvideo.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nuppelvideo.h	25 May 2005 11:48:58 -0000	1.3
+++ nuppelvideo.h	13 Jul 2005 17:24:42 -0000	1.4
@@ -92,12 +92,13 @@
     unsigned char *buffer_offset;
 } audbuffertyp;
 
-#ifdef WORDS_BIGENDIAN
 #define le2me_rtfileheader(h) {					\
     (h)->width = le2me_32((h)->width);				\
     (h)->height = le2me_32((h)->height);			\
     (h)->desiredwidth = le2me_32((h)->desiredwidth);		\
     (h)->desiredheight = le2me_32((h)->desiredheight);		\
+    (h)->aspect = le2me_dbl((h)->aspect);			\
+    (h)->fps = le2me_dbl((h)->fps);				\
     (h)->videoblocks = le2me_32((h)->videoblocks);		\
     (h)->audioblocks = le2me_32((h)->audioblocks);		\
     (h)->textsblocks = le2me_32((h)->textsblocks);		\
@@ -107,8 +108,4 @@
     (h)->timecode = le2me_32((h)->timecode);			\
     (h)->packetlength = le2me_32((h)->packetlength);		\
   }
-#else
-#define le2me_rtfileheader(h) /**/
-#define le2me_rtframeheader(h) /**/
-#endif
 




More information about the MPlayer-cvslog mailing list