gnash-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Gnash-commit] /srv/bzr/gnash/rtmp r9596: Cast the type to the proper ty


From: rob
Subject: [Gnash-commit] /srv/bzr/gnash/rtmp r9596: Cast the type to the proper type to fix word alignment problem.
Date: Tue, 26 Aug 2008 16:49:14 -0600
User-agent: Bazaar (1.5)

------------------------------------------------------------
revno: 9596
committer: address@hidden
branch nick: rtmp
timestamp: Tue 2008-08-26 16:49:14 -0600
message:
  Cast the type to the proper type to fix word alignment problem.
modified:
  libnet/rtmp.cpp
=== modified file 'libnet/rtmp.cpp'
--- a/libnet/rtmp.cpp   2008-08-20 16:32:44 +0000
+++ b/libnet/rtmp.cpp   2008-08-26 22:49:14 +0000
@@ -377,7 +377,6 @@
     Network::byte_t *tooFar = ptr+buf->size();
     AMF amf;
     
-//    
address@hidden@\000\000\000\000\000\000\003\000\003app\002\000#software/gnash/tests/1153948634.flv\000\bflashVer\002\000\fLNX
 
6,0,82,0\000\006swfUrl\002\000\035file:///file|address@hidden://localhost/software/gnash/tests/1153948634
     amf_index = *buf->reference() & RTMP_INDEX_MASK;
     headersize = headerSize(*buf->reference());
     log_debug (_("The Header size is: %d"), headersize);
@@ -492,8 +491,7 @@
     memset(ping, 0, sizeof(rtmp_ping_t));
 
     // All the data fields in a ping message are 2 bytes long.
-    // FIXME: FIXME: FIXME: breaks on big endian, ppc
-    boost::uint16_t type = ntohs(*reinterpret_cast<rtmp_ping_e *>(ptr));
+    boost::uint16_t type = ntohs(*reinterpret_cast<boost::uint16_t *>(ptr));
     ping->type = static_cast<rtmp_ping_e>(type);
     ptr += sizeof(boost::uint16_t);
 
@@ -605,7 +603,7 @@
         if (el == 0) {
            break;
        }
-       el->dump();
+//     el->dump();
        msg->addObject(el);
        if (status) {
            msg->checkStatus(el);


reply via email to

[Prev in Thread] Current Thread [Next in Thread]