[MPlayer-cvslog] CVS: main/libmpdemux demux_nuv.c,1.15,1.16

[Reimar Döffinger CVS]

CVS change done by Reimar Döffinger CVS

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

Modified Files:
	demux_nuv.c 
Log Message:
big-endian fixes for "extended" (i.e. mythtv) files.


Index: demux_nuv.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_nuv.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- demux_nuv.c	5 Aug 2005 19:57:46 -0000	1.15
+++ demux_nuv.c	25 Oct 2005 20:01:09 -0000	1.16
@@ -237,6 +237,7 @@
     if (stream_read(demuxer->stream, (char*)&rtjpeg_frameheader,
               sizeof(rtjpeg_frameheader)) < sizeof(rtjpeg_frameheader))
       goto out;
+    le2me_rtframeheader(&rtjpeg_frameheader);
 
     if (rtjpeg_frameheader.frametype != 'X')
       stream_skip(demuxer->stream, rtjpeg_frameheader.packetlength);
@@ -250,10 +251,10 @@
            "NUV extended frame does not have expected length, ignoring\n");
     goto out;
   }
-  le2me_extendeddata(&ext);
 
   if (stream_read(demuxer->stream, (char*)&ext, sizeof(ext)) < sizeof(ext))
     goto out;
+  le2me_extendeddata(&ext);
 
   if (ext.version != 1) {
     mp_msg(MSGT_DEMUXER, MSGL_WARN,