Index: libmpdemux/nuppelvideo.h
===================================================================
--- libmpdemux/nuppelvideo.h    (revision 21356)
+++ libmpdemux/nuppelvideo.h    (working copy)
@@ -125,8 +125,8 @@
     (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)->aspect = av_int2dbl(le2me_64(*(uint64_t *)&(h)->aspect));\
+    (h)->fps = av_int2dbl(le2me_64(*(uint64_t *)&(h)->fps));   \
     (h)->videoblocks = le2me_32((h)->videoblocks);             \
     (h)->audioblocks = le2me_32((h)->audioblocks);             \
     (h)->textsblocks = le2me_32((h)->textsblocks);             \
Index: libmpdemux/demux_nuv.c
===================================================================
--- libmpdemux/demux_nuv.c      (revision 21356)
+++ libmpdemux/demux_nuv.c      (working copy)
@@ -17,6 +17,7 @@
 #include "demuxer.h"
 #include "stheader.h"
 #include "nuppelvideo.h" 
+#include "libavutil/intfloat_readwrite.h"
 
 
 struct nuv_signature