<html><head><meta name="color-scheme" content="light dark"></head><body><pre style="word-wrap: break-word; white-space: pre-wrap;">From 5b06d1cad5f6711667038169b7ed759d749334da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Bub=C3=ADk?= &lt;jan.bubik@technodat.cz&gt;
Date: Wed, 13 May 2020 19:57:47 +0200
Subject: [PATCH 1/3] arut's e0e278bc7fedd6f7465648d1d20df1a8422d60bf [removed
 endian-dependent code]

---
 ngx_rtmp.c            |   4 ++
 ngx_rtmp.h            |  12 +++--
 ngx_rtmp_amf.c        |   6 +--
 ngx_rtmp_flv_module.c |   2 +-
 ngx_rtmp_handler.c    | 108 +++++++++++++++++++++---------------------
 5 files changed, 68 insertions(+), 64 deletions(-)

--- a/nginx-mod-rtmp/ngx_rtmp.c
+++ b/nginx-mod-rtmp/ngx_rtmp.c
@@ -825,22 +825,6 @@ ngx_rtmp_fire_event(ngx_rtmp_session_t *
 }
 
 
-void *
-ngx_rtmp_rmemcpy(void *dst, const void* src, size_t n)
-{
-    u_char     *d, *s;
-
-    d = dst;
-    s = (u_char*)src + n - 1;
-
-    while(s &gt;= (u_char*)src) {
-        *d++ = *s--;
-    }
-
-    return dst;
-}
-
-
 static ngx_int_t
 ngx_rtmp_init_process(ngx_cycle_t *cycle)
 {
--- a/nginx-mod-rtmp/ngx_rtmp.h
+++ b/nginx-mod-rtmp/ngx_rtmp.h
@@ -417,34 +417,33 @@ ngx_int_t ngx_rtmp_fire_event(ngx_rtmp_s
 ngx_int_t ngx_rtmp_set_chunk_size(ngx_rtmp_session_t *s, ngx_uint_t size);
 
 
-/* Bit reverse: we need big-endians in many places  */
-void * ngx_rtmp_rmemcpy(void *dst, const void* src, size_t n);
-
-#define ngx_rtmp_rcpymem(dst, src, n) \
-    (((u_char*)ngx_rtmp_rmemcpy(dst, src, n)) + (n))
-
-
-static ngx_inline uint16_t
-ngx_rtmp_r16(uint16_t n)
+/* Bit agnosticism: we need network to host byte-order conversion in many places  */
+static ngx_inline uint64_t
+ntohll(uint64_t n)
 {
-    return (n &lt;&lt; 8) | (n &gt;&gt; 8);
+#if (NGX_HAVE_LITTLE_ENDIAN)
+    return (uint64_t) ntohl((uint32_t) n) &lt;&lt; 32 |
+                      ntohl((uint32_t) (n &gt;&gt; 32));
+#else
+    return n;
+#endif
 }
 
-
 static ngx_inline uint32_t
-ngx_rtmp_r32(uint32_t n)
+n3toh4(u_char* src)
 {
-    return (n &lt;&lt; 24) | ((n &lt;&lt; 8) &amp; 0xff0000) | ((n &gt;&gt; 8) &amp; 0xff00) | (n &gt;&gt; 24);
+    return ((uint32_t)src[0]&lt;&lt;16)|((uint32_t)src[1]&lt;&lt;8)|src[2];
 }
 
-
-static ngx_inline uint64_t
-ngx_rtmp_r64(uint64_t n)
+static ngx_inline u_char*
+h4ton3(u_char* dst, uint32_t src)
 {
-    return (uint64_t) ngx_rtmp_r32((uint32_t) n) &lt;&lt; 32 |
-                      ngx_rtmp_r32((uint32_t) (n &gt;&gt; 32));
-}
+    dst[0]=(u_char)(src&gt;&gt;16);
+    dst[1]=(u_char)(src&gt;&gt;8);
+    dst[2]=(u_char)src;
 
+    return dst+3;
+}
 
 /* Receiving messages */
 ngx_int_t ngx_rtmp_receive_message(ngx_rtmp_session_t *s,
--- a/nginx-mod-rtmp/ngx_rtmp_amf.c
+++ b/nginx-mod-rtmp/ngx_rtmp_amf.c
@@ -10,23 +10,6 @@
 #include "ngx_rtmp.h"
 #include &lt;string.h&gt;
 
-
-static ngx_inline void*
-ngx_rtmp_amf_reverse_copy(void *dst, void* src, size_t len)
-{
-    size_t  k;
-
-    if (dst == NULL || src == NULL) {
-        return NULL;
-    }
-
-    for(k = 0; k &lt; len; ++k) {
-        ((u_char*)dst)[k] = ((u_char*)src)[len - 1 - k];
-    }
-
-    return dst;
-}
-
 #define NGX_RTMP_AMF_DEBUG_SIZE 72
 
 #ifdef NGX_DEBUG
@@ -207,7 +190,7 @@ ngx_rtmp_amf_read_object(ngx_rtmp_amf_ct
             return NGX_ERROR;
         }
 
-        ngx_rtmp_amf_reverse_copy(&amp;len, buf, 2);
+        len=ntohs(*(uint16_t*)&amp;buf[0]);
 
         if (!len)
             break;
@@ -258,7 +241,7 @@ ngx_rtmp_amf_read_array(ngx_rtmp_amf_ctx
     if (ngx_rtmp_amf_get(ctx, buf, 4) != NGX_OK)
         return NGX_ERROR;
 
-    ngx_rtmp_amf_reverse_copy(&amp;len, buf, 4);
+    len=ntohl(*(uint32_t*)&amp;buf[0]);
 
     for (n = 0; n &lt; len; ++n) {
         if (ngx_rtmp_amf_read(ctx, n &lt; nelts ? &amp;elts[n] : NULL, 1) != NGX_OK)
@@ -352,10 +335,9 @@ ngx_rtmp_amf_read(ngx_rtmp_amf_ctx_t *ct
 
         switch (type) {
             case NGX_RTMP_AMF_NUMBER:
-                if (ngx_rtmp_amf_get(ctx, buf, 8) != NGX_OK) {
+                if (ngx_rtmp_amf_get(ctx, data, 8) != NGX_OK) {
                     return NGX_ERROR;
                 }
-                ngx_rtmp_amf_reverse_copy(data, buf, 8);
                 break;
 
             case NGX_RTMP_AMF_BOOLEAN:
@@ -368,7 +350,7 @@ ngx_rtmp_amf_read(ngx_rtmp_amf_ctx_t *ct
                 if (ngx_rtmp_amf_get(ctx, buf, 2) != NGX_OK) {
                     return NGX_ERROR;
                 }
-                ngx_rtmp_amf_reverse_copy(&amp;len, buf, 2);
+                len=ntohs(*(uint16_t*)buf);
 
                 if (data == NULL) {
                     rc = ngx_rtmp_amf_get(ctx, data, len);
@@ -438,14 +420,14 @@ ngx_rtmp_amf_read(ngx_rtmp_amf_ctx_t *ct
                 if (ngx_rtmp_amf_get(ctx, buf, 2) != NGX_OK) {
                     return NGX_ERROR;
                 }
-                ngx_rtmp_amf_reverse_copy(data, buf, 2);
+                *(uint16_t*)data=ntohs(*(uint16_t*)buf);
                 break;
 
             case NGX_RTMP_AMF_INT32:
                 if (ngx_rtmp_amf_get(ctx, buf, 4) != NGX_OK) {
                     return NGX_ERROR;
                 }
-                ngx_rtmp_amf_reverse_copy(data, buf, 4);
+                *(uint32_t*)data=ntohs(*(uint32_t*)buf);
                 break;
 
             case NGX_RTMP_AMF_END:
@@ -476,9 +458,8 @@ ngx_rtmp_amf_write_object(ngx_rtmp_amf_c
 
         len = (uint16_t) elts[n].name.len;
 
-        if (ngx_rtmp_amf_put(ctx,
-                    ngx_rtmp_amf_reverse_copy(buf,
-                        &amp;len, 2), 2) != NGX_OK)
+        *(uint16_t*)buf = htons(len);
+        if (ngx_rtmp_amf_put(ctx, buf, 2) != NGX_OK)
         {
             return NGX_ERROR;
         }
@@ -509,9 +490,8 @@ ngx_rtmp_amf_write_array(ngx_rtmp_amf_ct
     u_char                  buf[4];
 
     len = nelts;
-    if (ngx_rtmp_amf_put(ctx,
-                ngx_rtmp_amf_reverse_copy(buf,
-                    &amp;len, 4), 4) != NGX_OK)
+    *(uint32_t*)buf = htonl(len);
+        if (ngx_rtmp_amf_put(ctx, buf, 4) != NGX_OK)
     {
         return NGX_ERROR;
     }
@@ -554,9 +534,7 @@ ngx_rtmp_amf_write(ngx_rtmp_amf_ctx_t *c
 
         switch(type) {
             case NGX_RTMP_AMF_NUMBER:
-                if (ngx_rtmp_amf_put(ctx,
-                            ngx_rtmp_amf_reverse_copy(buf,
-                                data, 8), 8) != NGX_OK)
+                if (ngx_rtmp_amf_put(ctx, data, 8) != NGX_OK)
                 {
                     return NGX_ERROR;
                 }
@@ -573,9 +551,8 @@ ngx_rtmp_amf_write(ngx_rtmp_amf_ctx_t *c
                     len = (uint16_t) ngx_strlen((u_char*) data);
                 }
 
-                if (ngx_rtmp_amf_put(ctx,
-                            ngx_rtmp_amf_reverse_copy(buf,
-                                &amp;len, 2), 2) != NGX_OK)
+                *(uint16_t*)buf = htons(len);
+                if (ngx_rtmp_amf_put(ctx, buf, 2) != NGX_OK)
                 {
                     return NGX_ERROR;
                 }
@@ -621,18 +598,16 @@ ngx_rtmp_amf_write(ngx_rtmp_amf_ctx_t *c
                 break;
 
             case NGX_RTMP_AMF_INT16:
-                if (ngx_rtmp_amf_put(ctx,
-                            ngx_rtmp_amf_reverse_copy(buf,
-                                data, 2), 2) != NGX_OK)
+                *(uint16_t*)buf = htons(*(uint16_t*)data);
+                if (ngx_rtmp_amf_put(ctx, buf, 2) != NGX_OK)
                 {
                     return NGX_ERROR;
                 }
                 break;
 
             case NGX_RTMP_AMF_INT32:
-                if (ngx_rtmp_amf_put(ctx,
-                            ngx_rtmp_amf_reverse_copy(buf,
-                                data, 4), 4) != NGX_OK)
+                *(uint32_t*)buf = htonl(*(uint32_t*)data);
+                if (ngx_rtmp_amf_put(ctx, buf, 4) != NGX_OK)
                 {
                     return NGX_ERROR;
                 }
--- a/nginx-mod-rtmp/ngx_rtmp_flv_module.c
+++ b/nginx-mod-rtmp/ngx_rtmp_flv_module.c
@@ -102,7 +102,7 @@ ngx_rtmp_flv_fill_index(ngx_rtmp_amf_ctx
         return NGX_ERROR;
     }
 
-    ngx_rtmp_rmemcpy(&amp;nelts, b-&gt;pos + ctx-&gt;offset, 4);
+    nelts=htonl(*(uint32_t*)(b-&gt;pos + ctx-&gt;offset));
 
     idx-&gt;nelts = nelts;
     idx-&gt;offset = ctx-&gt;offset + 4;
@@ -201,11 +201,7 @@ ngx_rtmp_flv_init_index(ngx_rtmp_session
 static double
 ngx_rtmp_flv_index_value(void *src)
 {
-    double      v;
-
-    ngx_rtmp_rmemcpy(&amp;v, src, 8);
-
-    return v;
+    return *(double*)src;
 }
 
 
@@ -352,8 +348,7 @@ ngx_rtmp_flv_read_meta(ngx_rtmp_session_
     h.msid = NGX_RTMP_MSID;
     h.csid = NGX_RTMP_CSID_AMF;
 
-    size = 0;
-    ngx_rtmp_rmemcpy(&amp;size, ngx_rtmp_flv_header + 1, 3);
+    size = n3toh4(ngx_rtmp_flv_header + 1);
 
     ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s-&gt;connection-&gt;log, 0,
                   "flv: metadata size=%D", size);
@@ -440,12 +435,9 @@ ngx_rtmp_flv_send(ngx_rtmp_session_t *s,
     h.msid = NGX_RTMP_MSID;
     h.type = ngx_rtmp_flv_header[0];
 
-    size = 0;
-
-    ngx_rtmp_rmemcpy(&amp;size, ngx_rtmp_flv_header + 1, 3);
-    ngx_rtmp_rmemcpy(&amp;h.timestamp, ngx_rtmp_flv_header + 4, 3);
-
-    ((u_char *) &amp;h.timestamp)[3] = ngx_rtmp_flv_header[7];
+    size = n3toh4(ngx_rtmp_flv_header + 1);
+    h.timestamp = n3toh4(ngx_rtmp_flv_header + 4);
+    h.timestamp |= ((uint32_t) ngx_rtmp_flv_header[7] &lt;&lt; 24);
 
     ctx-&gt;offset += (sizeof(ngx_rtmp_flv_header) + size + 4);
 
--- a/nginx-mod-rtmp/ngx_rtmp_handler.c
+++ b/nginx-mod-rtmp/ngx_rtmp_handler.c
@@ -200,7 +200,7 @@ ngx_rtmp_recv(ngx_event_t *rev)
     ngx_rtmp_stream_t          *st, *st0;
     ngx_chain_t                *in, *head;
     ngx_buf_t                  *b;
-    u_char                     *p, *pp, *old_pos;
+    u_char                     *p, *old_pos;
     size_t                      size, fsize, old_size;
     uint8_t                     fmt, ext;
     uint32_t                    csid, timestamp;
@@ -308,14 +308,14 @@ ngx_rtmp_recv(ngx_event_t *rev)
                 if (b-&gt;last - p &lt; 1)
                     continue;
                 csid = 64;
-                csid += *(uint8_t*)p++;
+                csid += *p++;
 
             } else if (csid == 1) {
                 if (b-&gt;last - p &lt; 2)
                     continue;
                 csid = 64;
-                csid += *(uint8_t*)p++;
-                csid += (uint32_t)256 * (*(uint8_t*)p++);
+                csid += *p++;
+                csid += ((uint32_t) *p++ &lt;&lt; 8);
             }
 
             ngx_log_debug2(NGX_LOG_DEBUG_RTMP, c-&gt;log, 0,
@@ -355,40 +355,37 @@ ngx_rtmp_recv(ngx_event_t *rev)
             if (fmt &lt;= 2 ) {
                 if (b-&gt;last - p &lt; 3)
                     continue;
-                /* timestamp:
-                 *  big-endian 3b -&gt; little-endian 4b */
-                pp = (u_char*)&amp;timestamp;
-                pp[2] = *p++;
-                pp[1] = *p++;
-                pp[0] = *p++;
-                pp[3] = 0;
+
+                /* timestamp: big-endian 3 bytes */
+
+                timestamp = ((uint32_t) *p++ &lt;&lt; 16);
+                timestamp |= ((uint32_t) *p++ &lt;&lt; 8);
+                timestamp |= *p++;
 
                 ext = (timestamp == 0x00ffffff);
 
                 if (fmt &lt;= 1) {
                     if (b-&gt;last - p &lt; 4)
                         continue;
-                    /* size:
-                     *  big-endian 3b -&gt; little-endian 4b
-                     * type:
-                     *  1b -&gt; 1b*/
-                    pp = (u_char*)&amp;h-&gt;mlen;
-                    pp[2] = *p++;
-                    pp[1] = *p++;
-                    pp[0] = *p++;
-                    pp[3] = 0;
-                    h-&gt;type = *(uint8_t*)p++;
+
+                    /* size: big-endian 3 bytes */
+
+                    h-&gt;mlen = ((uint32_t) *p++ &lt;&lt; 16);
+                    h-&gt;mlen |= ((uint32_t) *p++ &lt;&lt; 8);
+                    h-&gt;mlen |= *p++;
+
+                    h-&gt;type = *p++;
 
                     if (fmt == 0) {
                         if (b-&gt;last - p &lt; 4)
                             continue;
-                        /* stream:
-                         *  little-endian 4b -&gt; little-endian 4b */
-                        pp = (u_char*)&amp;h-&gt;msid;
-                        pp[0] = *p++;
-                        pp[1] = *p++;
-                        pp[2] = *p++;
-                        pp[3] = *p++;
+
+                        /* stream: little-endian 4 bytes */
+
+                        h-&gt;msid = *p++;
+                        h-&gt;msid |= ((uint32_t) *p++ &lt;&lt; 8);
+                        h-&gt;msid |= ((uint32_t) *p++ &lt;&lt; 16);
+                        h-&gt;msid |= ((uint32_t) *p++ &lt;&lt; 24);
                     }
                 }
             }
@@ -397,13 +394,13 @@ ngx_rtmp_recv(ngx_event_t *rev)
             if (ext) {
                 if (b-&gt;last - p &lt; 4)
                     continue;
-                pp = (u_char*)&amp;timestamp;
-               /* extented time stamp:
-                *  big-endian 4b -&gt; little-endian 4b */
-                pp[3] = *p++;
-                pp[2] = *p++;
-                pp[1] = *p++;
-                pp[0] = *p++;
+
+                /* timestamp: big-endian 4 bytes */
+
+                timestamp = ((uint32_t) *p++ &lt;&lt; 24);
+                timestamp |= ((uint32_t) *p++ &lt;&lt; 16);
+                timestamp |= ((uint32_t) *p++ &lt;&lt; 8);
+                timestamp |= *p++;
                 ngx_log_debug1(NGX_LOG_DEBUG_RTMP, c-&gt;log, 0, "RTMP extended timestamp %uD", (uint32_t)timestamp);
             }
 
@@ -584,7 +581,7 @@ ngx_rtmp_prepare_message(ngx_rtmp_sessio
         ngx_rtmp_header_t *lh, ngx_chain_t *out)
 {
     ngx_chain_t                *l;
-    u_char                     *p, *pp;
+    u_char                     *p;
     ngx_int_t                   hsize, thsize, nbufs;
     uint32_t                    mlen, timestamp, ext_timestamp;
     static uint8_t              hdrsize[] = { 12, 8, 4, 1 };
@@ -677,33 +674,36 @@ ngx_rtmp_prepare_message(ngx_rtmp_sessio
 
     /* message header */
     if (fmt &lt;= 2) {
-        pp = (u_char*)&amp;timestamp;
-        *p++ = pp[2];
-        *p++ = pp[1];
-        *p++ = pp[0];
+
+        *p++ = (u_char) (timestamp &gt;&gt; 16);
+        *p++ = (u_char) (timestamp &gt;&gt; 8);
+        *p++ = (u_char) timestamp;
+        
         if (fmt &lt;= 1) {
-            pp = (u_char*)&amp;mlen;
-            *p++ = pp[2];
-            *p++ = pp[1];
-            *p++ = pp[0];
+
+            *p++ = (u_char) (mlen &gt;&gt; 16);
+            *p++ = (u_char) (mlen &gt;&gt; 8);
+            *p++ = (u_char) mlen;
+
             *p++ = h-&gt;type;
+
             if (fmt == 0) {
-                pp = (u_char*)&amp;h-&gt;msid;
-                *p++ = pp[0];
-                *p++ = pp[1];
-                *p++ = pp[2];
-                *p++ = pp[3];
+
+                *p++ = (u_char) h-&gt;msid;
+                *p++ = (u_char) (h-&gt;msid &gt;&gt; 8);
+                *p++ = (u_char) (h-&gt;msid &gt;&gt; 16);
+                *p++ = (u_char) (h-&gt;msid &gt;&gt; 24);
             }
         }
     }
 
     /* extended header */
     if (ext_timestamp) {
-        pp = (u_char*)&amp;ext_timestamp;
-        *p++ = pp[3];
-        *p++ = pp[2];
-        *p++ = pp[1];
-        *p++ = pp[0];
+        
+        *p++ = (u_char) (ext_timestamp &gt;&gt; 24);
+        *p++ = (u_char) (ext_timestamp &gt;&gt; 16);
+        *p++ = (u_char) (ext_timestamp &gt;&gt; 8);
+        *p++ = (u_char) ext_timestamp;
 
         /* This CONTRADICTS the standard
          * but that's the way flash client
--- a/nginx-mod-rtmp/ngx_rtmp_send.c
+++ b/nginx-mod-rtmp/ngx_rtmp_send.c
@@ -33,13 +33,13 @@
     *(__b-&gt;last++) = (u_char)(utype);
 
 #define NGX_RTMP_USER_OUT1(v)                                               \
-    *(__b-&gt;last++) = ((u_char*)&amp;v)[0];
+    *(__b-&gt;last++) = (u_char) v;
 
 #define NGX_RTMP_USER_OUT4(v)                                               \
-    *(__b-&gt;last++) = ((u_char*)&amp;v)[3];                                      \
-    *(__b-&gt;last++) = ((u_char*)&amp;v)[2];                                      \
-    *(__b-&gt;last++) = ((u_char*)&amp;v)[1];                                      \
-    *(__b-&gt;last++) = ((u_char*)&amp;v)[0];
+    *(__b-&gt;last++) = (u_char) (v &gt;&gt; 24);                                    \
+    *(__b-&gt;last++) = (u_char) (v &gt;&gt; 16);                                    \
+    *(__b-&gt;last++) = (u_char) (v &gt;&gt; 8);                                     \
+    *(__b-&gt;last++) = (u_char) v;
 
 #define NGX_RTMP_USER_END(s)                                                \
     ngx_rtmp_prepare_message(s, &amp;__h, NULL, __l);                           \
--- a/nginx-mod-rtmp/hls/ngx_rtmp_hls_module.c
+++ b/nginx-mod-rtmp/hls/ngx_rtmp_hls_module.c
@@ -296,7 +296,7 @@ static ngx_command_t ngx_rtmp_hls_comman
       ngx_conf_set_enum_slot,
       NGX_RTMP_APP_CONF_OFFSET,
       offsetof(ngx_rtmp_hls_app_conf_t, allow_client_cache),
-      &amp;ngx_rtmp_hls_cache },       
+      &amp;ngx_rtmp_hls_cache },
 
     { ngx_string("hls_variant"),
       NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_1MORE,
@@ -816,7 +816,7 @@ ngx_rtmp_hls_append_sps_pps(ngx_rtmp_ses
                 return NGX_ERROR;
             }
 
-            ngx_rtmp_rmemcpy(&amp;len, &amp;rlen, 2);
+            len=ntohs(rlen);
 
             ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s-&gt;connection-&gt;log, 0,
                            "hls: header NAL length: %uz", (size_t) len);
@@ -2072,7 +2072,21 @@ ngx_rtmp_hls_video(ngx_rtmp_session_t *s
         }
 
         len = 0;
-        ngx_rtmp_rmemcpy(&amp;len, &amp;rlen, nal_bytes);
+
+        switch (nal_bytes) {
+            case 1:
+                len=*(uint8_t*)&amp;rlen;
+                break;
+            case 2:
+                len=ntohs(*(uint16_t*)&amp;rlen);
+                break;
+            case 3:
+                len=n3toh4((u_char*)&amp;rlen);
+                break;
+            case 4:
+                len=ntohl(rlen);
+                 break;
+        };
 
         if (len == 0) {
             continue;
--- a/nginx-mod-rtmp/ngx_rtmp_bitop.h
+++ b/nginx-mod-rtmp/ngx_rtmp_bitop.h
@@ -40,7 +40,7 @@ uint64_t ngx_rtmp_bit_read_golomb(ngx_rt
     ((uint32_t) ngx_rtmp_bit_read(br, 32))
 
 #define ngx_rtmp_bit_read_64(br)                                              \
-    ((uint64_t) ngx_rtmp_read(br, 64))
+    ((uint64_t) ngx_rtmp_bit_read(br, 64))
 
 
 #endif /* _NGX_RTMP_BITOP_H_INCLUDED_ */
--- a/nginx-mod-rtmp/ngx_rtmp_eval.c
+++ b/nginx-mod-rtmp/ngx_rtmp_eval.c
@@ -166,7 +166,7 @@ ngx_rtmp_eval(void *ctx, ngx_str_t *in,
                         state = ESCAPE;
                         continue;
                 }
-
+                /* fall through */
             case ESCAPE:
                 ngx_rtmp_eval_append(&amp;b, &amp;c, 1, log);
                 state = NORMAL;
--- a/nginx-mod-rtmp/ngx_rtmp_handshake.c
+++ b/nginx-mod-rtmp/ngx_rtmp_handshake.c
@@ -264,7 +264,8 @@ ngx_rtmp_handshake_create_challenge(ngx_
     b = s-&gt;hs_buf;
     b-&gt;last = b-&gt;pos = b-&gt;start;
     *b-&gt;last++ = '\x03';
-    b-&gt;last = ngx_rtmp_rcpymem(b-&gt;last, &amp;s-&gt;epoch, 4);
+    *(uint32_t*)b-&gt;last=htonl(s-&gt;epoch);
+    b-&gt;last +=4;
     b-&gt;last = ngx_cpymem(b-&gt;last, version, 4);
     ngx_rtmp_fill_random_buffer(b);
     ++b-&gt;pos;
@@ -292,8 +293,7 @@ ngx_rtmp_handshake_parse_challenge(ngx_r
         return NGX_ERROR;
     }
     ++b-&gt;pos;
-    s-&gt;peer_epoch = 0;
-    ngx_rtmp_rmemcpy(&amp;s-&gt;peer_epoch, b-&gt;pos, 4);
+    s-&gt;peer_epoch = ntohl(*(uint32_t*)b-&gt;pos);
 
     p = b-&gt;pos + 4;
     ngx_log_debug5(NGX_LOG_DEBUG_RTMP, s-&gt;connection-&gt;log, 0,
--- a/nginx-mod-rtmp/ngx_rtmp_mp4_module.c
+++ b/nginx-mod-rtmp/ngx_rtmp_mp4_module.c
@@ -528,9 +528,9 @@ ngx_rtmp_mp4_parse_mdhd(ngx_rtmp_session
             }
 
             pos += 12;
-            t-&gt;time_scale = ngx_rtmp_r32(*(uint32_t *) pos);
+            t-&gt;time_scale = ntohl(*(uint32_t *) pos);
             pos += 4;
-            t-&gt;duration = ngx_rtmp_r32(*(uint32_t *) pos);
+            t-&gt;duration = ntohl(*(uint32_t *) pos);
             break;
 
         case 1:
@@ -539,9 +539,9 @@ ngx_rtmp_mp4_parse_mdhd(ngx_rtmp_session
             }
 
             pos += 20;
-            t-&gt;time_scale = ngx_rtmp_r32(*(uint32_t *) pos);
+            t-&gt;time_scale = ntohl(*(uint32_t *) pos);
             pos += 4;
-            t-&gt;duration = ngx_rtmp_r64(*(uint64_t *) pos);
+            t-&gt;duration = ntohll(*(uint64_t *) pos);
             break;
 
         default:
@@ -616,11 +616,11 @@ ngx_rtmp_mp4_parse_video(ngx_rtmp_sessio
 
     pos += 24;
 
-    ctx-&gt;width = ngx_rtmp_r16(*(uint16_t *) pos);
+    ctx-&gt;width = ntohs(*(uint16_t *) pos);
 
     pos += 2;
 
-    ctx-&gt;height = ngx_rtmp_r16(*(uint16_t *) pos);
+    ctx-&gt;height = ntohs(*(uint16_t *) pos);
 
     pos += 52;
 
@@ -660,19 +660,19 @@ ngx_rtmp_mp4_parse_audio(ngx_rtmp_sessio
 
     pos += 8;
 
-    version = ngx_rtmp_r16(*(uint16_t *) pos);
+    version = ntohs(*(uint16_t *) pos);
 
     pos += 8;
 
-    ctx-&gt;nchannels = ngx_rtmp_r16(*(uint16_t *) pos);
+    ctx-&gt;nchannels = ntohs(*(uint16_t *) pos);
 
     pos += 2;
 
-    ctx-&gt;sample_size = ngx_rtmp_r16(*(uint16_t *) pos);
+    ctx-&gt;sample_size = ntohs(*(uint16_t *) pos);
 
     pos += 6;
 
-    ctx-&gt;sample_rate = ngx_rtmp_r16(*(uint16_t *) pos);
+    ctx-&gt;sample_rate = ntohs(*(uint16_t *) pos);
 
     pos += 4;
 
@@ -862,7 +862,7 @@ ngx_rtmp_mp4_parse_es(ngx_rtmp_session_t
         return NGX_ERROR;
     }
 
-    id = ngx_rtmp_r16(*(uint16_t *) pos);
+    id = ntohs(*(uint16_t *) pos);
     pos += 2;
 
     flags = *(uint8_t *) pos;
@@ -1018,13 +1018,13 @@ ngx_rtmp_mp4_parse_stsc(ngx_rtmp_session
 
     t-&gt;chunks = (ngx_rtmp_mp4_chunks_t *) pos;
 
-    if (pos + sizeof(*t-&gt;chunks) + ngx_rtmp_r32(t-&gt;chunks-&gt;entry_count) *
+    if (pos + sizeof(*t-&gt;chunks) + ntohl(t-&gt;chunks-&gt;entry_count) *
                                    sizeof(t-&gt;chunks-&gt;entries[0])
         &lt;= last)
     {
         ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s-&gt;connection-&gt;log, 0,
                        "mp4: chunks entries=%uD",
-                       ngx_rtmp_r32(t-&gt;chunks-&gt;entry_count));
+                       ntohl(t-&gt;chunks-&gt;entry_count));
         return NGX_OK;
     }
 
@@ -1049,13 +1049,13 @@ ngx_rtmp_mp4_parse_stts(ngx_rtmp_session
 
     t-&gt;times = (ngx_rtmp_mp4_times_t *) pos;
 
-    if (pos + sizeof(*t-&gt;times) + ngx_rtmp_r32(t-&gt;times-&gt;entry_count) *
+    if (pos + sizeof(*t-&gt;times) + ntohl(t-&gt;times-&gt;entry_count) *
                                   sizeof(t-&gt;times-&gt;entries[0])
         &lt;= last)
     {
         ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s-&gt;connection-&gt;log, 0,
                        "mp4: times entries=%uD",
-                       ngx_rtmp_r32(t-&gt;times-&gt;entry_count));
+                       ntohl(t-&gt;times-&gt;entry_count));
         return NGX_OK;
     }
 
@@ -1080,13 +1080,13 @@ ngx_rtmp_mp4_parse_ctts(ngx_rtmp_session
 
     t-&gt;delays = (ngx_rtmp_mp4_delays_t *) pos;
 
-    if (pos + sizeof(*t-&gt;delays) + ngx_rtmp_r32(t-&gt;delays-&gt;entry_count) *
+    if (pos + sizeof(*t-&gt;delays) + ntohl(t-&gt;delays-&gt;entry_count) *
                                    sizeof(t-&gt;delays-&gt;entries[0])
         &lt;= last)
     {
         ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s-&gt;connection-&gt;log, 0,
                        "mp4: delays entries=%uD",
-                       ngx_rtmp_r32(t-&gt;delays-&gt;entry_count));
+                       ntohl(t-&gt;delays-&gt;entry_count));
         return NGX_OK;
     }
 
@@ -1111,13 +1111,13 @@ ngx_rtmp_mp4_parse_stss(ngx_rtmp_session
 
     t-&gt;keys = (ngx_rtmp_mp4_keys_t *) pos;
 
-    if (pos + sizeof(*t-&gt;keys) + ngx_rtmp_r32(t-&gt;keys-&gt;entry_count) *
+    if (pos + sizeof(*t-&gt;keys) + ntohl(t-&gt;keys-&gt;entry_count) *
                                   sizeof(t-&gt;keys-&gt;entries[0])
         &lt;= last)
     {
         ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s-&gt;connection-&gt;log, 0,
                        "mp4: keys entries=%uD",
-                       ngx_rtmp_r32(t-&gt;keys-&gt;entry_count));
+                       ntohl(t-&gt;keys-&gt;entry_count));
         return NGX_OK;
     }
 
@@ -1145,18 +1145,18 @@ ngx_rtmp_mp4_parse_stsz(ngx_rtmp_session
     if (pos + sizeof(*t-&gt;sizes) &lt;= last &amp;&amp; t-&gt;sizes-&gt;sample_size) {
         ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s-&gt;connection-&gt;log, 0,
                        "mp4: sizes size=%uD",
-                       ngx_rtmp_r32(t-&gt;sizes-&gt;sample_size));
+                       ntohl(t-&gt;sizes-&gt;sample_size));
         return NGX_OK;
     }
 
-    if (pos + sizeof(*t-&gt;sizes) + ngx_rtmp_r32(t-&gt;sizes-&gt;sample_count) *
+    if (pos + sizeof(*t-&gt;sizes) + ntohl(t-&gt;sizes-&gt;sample_count) *
                                   sizeof(t-&gt;sizes-&gt;entries[0])
         &lt;= last)
 
     {
         ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s-&gt;connection-&gt;log, 0,
                        "mp4: sizes entries=%uD",
-                       ngx_rtmp_r32(t-&gt;sizes-&gt;sample_count));
+                       ntohl(t-&gt;sizes-&gt;sample_count));
         return NGX_OK;
     }
 
@@ -1181,14 +1181,14 @@ ngx_rtmp_mp4_parse_stz2(ngx_rtmp_session
 
     t-&gt;sizes2 = (ngx_rtmp_mp4_sizes2_t *) pos;
 
-    if (pos + sizeof(*t-&gt;sizes) + ngx_rtmp_r32(t-&gt;sizes2-&gt;sample_count) *
-                                  ngx_rtmp_r32(t-&gt;sizes2-&gt;field_size) / 8
+    if (pos + sizeof(*t-&gt;sizes) + ntohl(t-&gt;sizes2-&gt;sample_count) *
+                                  ntohl(t-&gt;sizes2-&gt;field_size) / 8
         &lt;= last)
     {
         ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s-&gt;connection-&gt;log, 0,
                        "mp4: sizes2 field_size=%uD entries=%uD",
-                       ngx_rtmp_r32(t-&gt;sizes2-&gt;field_size),
-                       ngx_rtmp_r32(t-&gt;sizes2-&gt;sample_count));
+                       ntohl(t-&gt;sizes2-&gt;field_size),
+                       ntohl(t-&gt;sizes2-&gt;sample_count));
         return NGX_OK;
     }
 
@@ -1213,13 +1213,13 @@ ngx_rtmp_mp4_parse_stco(ngx_rtmp_session
 
     t-&gt;offsets = (ngx_rtmp_mp4_offsets_t *) pos;
 
-    if (pos + sizeof(*t-&gt;offsets) + ngx_rtmp_r32(t-&gt;offsets-&gt;entry_count) *
+    if (pos + sizeof(*t-&gt;offsets) + ntohl(t-&gt;offsets-&gt;entry_count) *
                                     sizeof(t-&gt;offsets-&gt;entries[0])
         &lt;= last)
     {
         ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s-&gt;connection-&gt;log, 0,
                        "mp4: offsets entries=%uD",
-                       ngx_rtmp_r32(t-&gt;offsets-&gt;entry_count));
+                       ntohl(t-&gt;offsets-&gt;entry_count));
         return NGX_OK;
     }
 
@@ -1244,13 +1244,13 @@ ngx_rtmp_mp4_parse_co64(ngx_rtmp_session
 
     t-&gt;offsets64 = (ngx_rtmp_mp4_offsets64_t *) pos;
 
-    if (pos + sizeof(*t-&gt;offsets64) + ngx_rtmp_r32(t-&gt;offsets64-&gt;entry_count) *
+    if (pos + sizeof(*t-&gt;offsets64) + ntohl(t-&gt;offsets64-&gt;entry_count) *
                                       sizeof(t-&gt;offsets64-&gt;entries[0])
         &lt;= last)
     {
         ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s-&gt;connection-&gt;log, 0,
                        "mp4: offsets64 entries=%uD",
-                       ngx_rtmp_r32(t-&gt;offsets64-&gt;entry_count));
+                       ntohl(t-&gt;offsets64-&gt;entry_count));
         return NGX_OK;
     }
 
@@ -1275,7 +1275,7 @@ ngx_rtmp_mp4_parse(ngx_rtmp_session_t *s
         }
 
         hdr = (uint32_t *) pos;
-        size = ngx_rtmp_r32(hdr[0]);
+        size = ntohl(hdr[0]);
         tag  = hdr[1];
 
         if (pos + size &gt; last) {
@@ -1318,11 +1318,11 @@ ngx_rtmp_mp4_next_time(ngx_rtmp_session_
 
     cr = &amp;t-&gt;cursor;
 
-    if (cr-&gt;time_pos &gt;= ngx_rtmp_r32(t-&gt;times-&gt;entry_count)) {
+    if (cr-&gt;time_pos &gt;= ntohl(t-&gt;times-&gt;entry_count)) {
         ngx_log_debug3(NGX_LOG_DEBUG_RTMP, s-&gt;connection-&gt;log, 0,
                        "mp4: track#%ui time[%ui/%uD] overflow",
                        t-&gt;id, cr-&gt;time_pos,
-                       ngx_rtmp_r32(t-&gt;times-&gt;entry_count));
+                       ntohl(t-&gt;times-&gt;entry_count));
 
         return NGX_ERROR;
     }
@@ -1330,22 +1330,22 @@ ngx_rtmp_mp4_next_time(ngx_rtmp_session_
     te = &amp;t-&gt;times-&gt;entries[cr-&gt;time_pos];
 
     cr-&gt;last_timestamp = cr-&gt;timestamp;
-    cr-&gt;timestamp += ngx_rtmp_r32(te-&gt;sample_delta);
+    cr-&gt;timestamp += ntohl(te-&gt;sample_delta);
 
     cr-&gt;not_first = 1;
 
     ngx_log_debug8(NGX_LOG_DEBUG_RTMP, s-&gt;connection-&gt;log, 0,
                    "mp4: track#%ui time[%ui] [%ui/%uD][%ui/%uD]=%uD t=%uD",
                    t-&gt;id, cr-&gt;pos, cr-&gt;time_pos,
-                   ngx_rtmp_r32(t-&gt;times-&gt;entry_count),
-                   cr-&gt;time_count, ngx_rtmp_r32(te-&gt;sample_count),
-                   ngx_rtmp_r32(te-&gt;sample_delta),
+                   ntohl(t-&gt;times-&gt;entry_count),
+                   cr-&gt;time_count, ntohl(te-&gt;sample_count),
+                   ntohl(te-&gt;sample_delta),
                    cr-&gt;timestamp);
 
     cr-&gt;time_count++;
     cr-&gt;pos++;
 
-    if (cr-&gt;time_count &gt;= ngx_rtmp_r32(te-&gt;sample_count)) {
+    if (cr-&gt;time_count &gt;= ntohl(te-&gt;sample_count)) {
         cr-&gt;time_pos++;
         cr-&gt;time_count = 0;
     }
@@ -1370,8 +1370,8 @@ ngx_rtmp_mp4_seek_time(ngx_rtmp_session_
 
     te = t-&gt;times-&gt;entries;
 
-    while (cr-&gt;time_pos &lt; ngx_rtmp_r32(t-&gt;times-&gt;entry_count)) {
-        dt = ngx_rtmp_r32(te-&gt;sample_delta) * ngx_rtmp_r32(te-&gt;sample_count);
+    while (cr-&gt;time_pos &lt; ntohl(t-&gt;times-&gt;entry_count)) {
+        dt = ntohl(te-&gt;sample_delta) * ntohl(te-&gt;sample_count);
 
         if (cr-&gt;timestamp + dt &gt;= timestamp) {
             if (te-&gt;sample_delta == 0) {
@@ -1379,24 +1379,24 @@ ngx_rtmp_mp4_seek_time(ngx_rtmp_session_
             }
 
             cr-&gt;time_count = (timestamp - cr-&gt;timestamp) /
-                             ngx_rtmp_r32(te-&gt;sample_delta);
-            cr-&gt;timestamp += ngx_rtmp_r32(te-&gt;sample_delta) * cr-&gt;time_count;
+                             ntohl(te-&gt;sample_delta);
+            cr-&gt;timestamp += ntohl(te-&gt;sample_delta) * cr-&gt;time_count;
             cr-&gt;pos += cr-&gt;time_count;
 
             break;
         }
 
         cr-&gt;timestamp += dt;
-        cr-&gt;pos += ngx_rtmp_r32(te-&gt;sample_count);
+        cr-&gt;pos += ntohl(te-&gt;sample_count);
         cr-&gt;time_pos++;
         te++;
     }
 
-    if (cr-&gt;time_pos &gt;= ngx_rtmp_r32(t-&gt;times-&gt;entry_count)) {
+    if (cr-&gt;time_pos &gt;= ntohl(t-&gt;times-&gt;entry_count)) {
         ngx_log_debug3(NGX_LOG_DEBUG_RTMP, s-&gt;connection-&gt;log, 0,
                        "mp4: track#%ui seek time[%ui/%uD] overflow",
                        t-&gt;id, cr-&gt;time_pos,
-                       ngx_rtmp_r32(t-&gt;times-&gt;entry_count));
+                       ntohl(t-&gt;times-&gt;entry_count));
 
         return  NGX_ERROR;
     }
@@ -1405,10 +1405,10 @@ ngx_rtmp_mp4_seek_time(ngx_rtmp_session_
                    "mp4: track#%ui seek time[%ui] [%ui/%uD][%ui/%uD]=%uD "
                    "t=%uD",
                    t-&gt;id, cr-&gt;pos, cr-&gt;time_pos,
-                   ngx_rtmp_r32(t-&gt;times-&gt;entry_count),
+                   ntohl(t-&gt;times-&gt;entry_count),
                    cr-&gt;time_count,
-                   ngx_rtmp_r32(te-&gt;sample_count),
-                   ngx_rtmp_r32(te-&gt;sample_delta),
+                   ntohl(te-&gt;sample_count),
+                   ntohl(te-&gt;sample_delta),
                    cr-&gt;timestamp);
 
     return NGX_OK;
@@ -1433,44 +1433,44 @@ ngx_rtmp_mp4_update_offset(ngx_rtmp_sess
     chunk = cr-&gt;chunk - 1;
 
     if (t-&gt;offsets) {
-        if (chunk &gt;= ngx_rtmp_r32(t-&gt;offsets-&gt;entry_count)) {
+        if (chunk &gt;= ntohl(t-&gt;offsets-&gt;entry_count)) {
             ngx_log_debug3(NGX_LOG_DEBUG_RTMP, s-&gt;connection-&gt;log, 0,
                            "mp4: track#%ui offset[%ui/%uD] overflow",
                            t-&gt;id, cr-&gt;chunk,
-                           ngx_rtmp_r32(t-&gt;offsets-&gt;entry_count));
+                           ntohl(t-&gt;offsets-&gt;entry_count));
 
             return NGX_ERROR;
         }
 
-        cr-&gt;offset = (off_t) ngx_rtmp_r32(t-&gt;offsets-&gt;entries[chunk]);
+        cr-&gt;offset = (off_t) ntohl(t-&gt;offsets-&gt;entries[chunk]);
         cr-&gt;size = 0;
 
         ngx_log_debug4(NGX_LOG_DEBUG_RTMP, s-&gt;connection-&gt;log, 0,
                        "mp4: track#%ui offset[%ui/%uD]=%O",
                        t-&gt;id, cr-&gt;chunk,
-                       ngx_rtmp_r32(t-&gt;offsets-&gt;entry_count),
+                       ntohl(t-&gt;offsets-&gt;entry_count),
                        cr-&gt;offset);
 
         return NGX_OK;
     }
 
     if (t-&gt;offsets64) {
-        if (chunk &gt;= ngx_rtmp_r32(t-&gt;offsets64-&gt;entry_count)) {
+        if (chunk &gt;= ntohl(t-&gt;offsets64-&gt;entry_count)) {
             ngx_log_debug3(NGX_LOG_DEBUG_RTMP, s-&gt;connection-&gt;log, 0,
                            "mp4: track#%ui offset64[%ui/%uD] overflow",
                            t-&gt;id, cr-&gt;chunk,
-                           ngx_rtmp_r32(t-&gt;offsets-&gt;entry_count));
+                           ntohl(t-&gt;offsets-&gt;entry_count));
 
             return NGX_ERROR;
         }
 
-        cr-&gt;offset = (off_t) ngx_rtmp_r64(t-&gt;offsets64-&gt;entries[chunk]);
+        cr-&gt;offset = (off_t) ntohll(t-&gt;offsets64-&gt;entries[chunk]);
         cr-&gt;size = 0;
 
         ngx_log_debug4(NGX_LOG_DEBUG_RTMP, s-&gt;connection-&gt;log, 0,
                        "mp4: track#%ui offset64[%ui/%uD]=%O",
                        t-&gt;id, cr-&gt;chunk,
-                       ngx_rtmp_r32(t-&gt;offsets-&gt;entry_count),
+                       ntohl(t-&gt;offsets-&gt;entry_count),
                        cr-&gt;offset);
 
         return NGX_OK;
@@ -1493,11 +1493,11 @@ ngx_rtmp_mp4_next_chunk(ngx_rtmp_session
 
     cr = &amp;t-&gt;cursor;
 
-    if (cr-&gt;chunk_pos &gt;= ngx_rtmp_r32(t-&gt;chunks-&gt;entry_count)) {
+    if (cr-&gt;chunk_pos &gt;= ntohl(t-&gt;chunks-&gt;entry_count)) {
         ngx_log_debug3(NGX_LOG_DEBUG_RTMP, s-&gt;connection-&gt;log, 0,
                        "mp4: track#%ui chunk[%ui/%uD] overflow",
                        t-&gt;id, cr-&gt;chunk_pos,
-                       ngx_rtmp_r32(t-&gt;chunks-&gt;entry_count));
+                       ntohl(t-&gt;chunks-&gt;entry_count));
 
         return NGX_ERROR;
     }
@@ -1506,13 +1506,13 @@ ngx_rtmp_mp4_next_chunk(ngx_rtmp_session
 
     cr-&gt;chunk_count++;
 
-    if (cr-&gt;chunk_count &gt;= ngx_rtmp_r32(ce-&gt;samples_per_chunk)) {
+    if (cr-&gt;chunk_count &gt;= ntohl(ce-&gt;samples_per_chunk)) {
         cr-&gt;chunk_count = 0;
         cr-&gt;chunk++;
 
-        if (cr-&gt;chunk_pos + 1 &lt; ngx_rtmp_r32(t-&gt;chunks-&gt;entry_count)) {
+        if (cr-&gt;chunk_pos + 1 &lt; ntohl(t-&gt;chunks-&gt;entry_count)) {
             nce = ce + 1;
-            if (cr-&gt;chunk &gt;= ngx_rtmp_r32(nce-&gt;first_chunk)) {
+            if (cr-&gt;chunk &gt;= ntohl(nce-&gt;first_chunk)) {
                 cr-&gt;chunk_pos++;
                 ce = nce;
             }
@@ -1527,10 +1527,10 @@ ngx_rtmp_mp4_next_chunk(ngx_rtmp_session
     ngx_log_debug7(NGX_LOG_DEBUG_RTMP, s-&gt;connection-&gt;log, 0,
                    "mp4: track#%ui chunk[%ui/%uD][%uD..%ui][%ui/%uD]",
                    t-&gt;id, cr-&gt;chunk_pos,
-                   ngx_rtmp_r32(t-&gt;chunks-&gt;entry_count),
-                   ngx_rtmp_r32(ce-&gt;first_chunk),
+                   ntohl(t-&gt;chunks-&gt;entry_count),
+                   ntohl(ce-&gt;first_chunk),
                    cr-&gt;chunk, cr-&gt;chunk_count,
-                   ngx_rtmp_r32(ce-&gt;samples_per_chunk));
+                   ntohl(ce-&gt;samples_per_chunk));
 
 
     if (new_chunk) {
@@ -1558,12 +1558,12 @@ ngx_rtmp_mp4_seek_chunk(ngx_rtmp_session
     ce = t-&gt;chunks-&gt;entries;
     pos = 0;
 
-    while (cr-&gt;chunk_pos + 1 &lt; ngx_rtmp_r32(t-&gt;chunks-&gt;entry_count)) {
+    while (cr-&gt;chunk_pos + 1 &lt; ntohl(t-&gt;chunks-&gt;entry_count)) {
         nce = ce + 1;
 
-        dpos = (ngx_rtmp_r32(nce-&gt;first_chunk) -
-                ngx_rtmp_r32(ce-&gt;first_chunk)) *
-                ngx_rtmp_r32(ce-&gt;samples_per_chunk);
+        dpos = (ntohl(nce-&gt;first_chunk) -
+                ntohl(ce-&gt;first_chunk)) *
+                ntohl(ce-&gt;samples_per_chunk);
 
         if (pos + dpos &gt; cr-&gt;pos) {
             break;
@@ -1578,20 +1578,20 @@ ngx_rtmp_mp4_seek_chunk(ngx_rtmp_session
         return NGX_ERROR;
     }
 
-    dchunk = (cr-&gt;pos - pos) / ngx_rtmp_r32(ce-&gt;samples_per_chunk);
+    dchunk = (cr-&gt;pos - pos) / ntohl(ce-&gt;samples_per_chunk);
 
-    cr-&gt;chunk = ngx_rtmp_r32(ce-&gt;first_chunk) + dchunk;
+    cr-&gt;chunk = ntohl(ce-&gt;first_chunk) + dchunk;
     cr-&gt;chunk_pos = (ngx_uint_t) (ce - t-&gt;chunks-&gt;entries);
     cr-&gt;chunk_count = (ngx_uint_t) (cr-&gt;pos - pos - dchunk *
-                                    ngx_rtmp_r32(ce-&gt;samples_per_chunk));
+                                    ntohl(ce-&gt;samples_per_chunk));
 
     ngx_log_debug7(NGX_LOG_DEBUG_RTMP, s-&gt;connection-&gt;log, 0,
                    "mp4: track#%ui seek chunk[%ui/%uD][%uD..%ui][%ui/%uD]",
                    t-&gt;id, cr-&gt;chunk_pos,
-                   ngx_rtmp_r32(t-&gt;chunks-&gt;entry_count),
-                   ngx_rtmp_r32(ce-&gt;first_chunk),
+                   ntohl(t-&gt;chunks-&gt;entry_count),
+                   ntohl(ce-&gt;first_chunk),
                    cr-&gt;chunk, cr-&gt;chunk_count,
-                   ngx_rtmp_r32(ce-&gt;samples_per_chunk));
+                   ntohl(ce-&gt;samples_per_chunk));
 
     return ngx_rtmp_mp4_update_offset(s, t);
 }
@@ -1608,7 +1608,7 @@ ngx_rtmp_mp4_next_size(ngx_rtmp_session_
 
     if (t-&gt;sizes) {
         if (t-&gt;sizes-&gt;sample_size) {
-            cr-&gt;size = ngx_rtmp_r32(t-&gt;sizes-&gt;sample_size);
+            cr-&gt;size = ntohl(t-&gt;sizes-&gt;sample_size);
 
             ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s-&gt;connection-&gt;log, 0,
                            "mp4: track#%ui size fix=%uz",
@@ -1619,32 +1619,32 @@ ngx_rtmp_mp4_next_size(ngx_rtmp_session_
 
         cr-&gt;size_pos++;
 
-        if (cr-&gt;size_pos &gt;= ngx_rtmp_r32(t-&gt;sizes-&gt;sample_count)) {
+        if (cr-&gt;size_pos &gt;= ntohl(t-&gt;sizes-&gt;sample_count)) {
             ngx_log_debug3(NGX_LOG_DEBUG_RTMP, s-&gt;connection-&gt;log, 0,
                            "mp4: track#%ui size[%ui/%uD] overflow",
                            t-&gt;id, cr-&gt;size_pos,
-                           ngx_rtmp_r32(t-&gt;sizes-&gt;sample_count));
+                           ntohl(t-&gt;sizes-&gt;sample_count));
 
             return NGX_ERROR;
         }
 
-        cr-&gt;size = ngx_rtmp_r32(t-&gt;sizes-&gt;entries[cr-&gt;size_pos]);
+        cr-&gt;size = ntohl(t-&gt;sizes-&gt;entries[cr-&gt;size_pos]);
 
         ngx_log_debug4(NGX_LOG_DEBUG_RTMP, s-&gt;connection-&gt;log, 0,
                        "mp4: track#%ui size[%ui/%uD]=%uz",
                        t-&gt;id, cr-&gt;size_pos,
-                       ngx_rtmp_r32(t-&gt;sizes-&gt;sample_count),
+                       ntohl(t-&gt;sizes-&gt;sample_count),
                        cr-&gt;size);
 
         return NGX_OK;
     }
 
     if (t-&gt;sizes2) {
-        if (cr-&gt;size_pos &gt;= ngx_rtmp_r32(t-&gt;sizes2-&gt;sample_count)) {
+        if (cr-&gt;size_pos &gt;= ntohl(t-&gt;sizes2-&gt;sample_count)) {
             ngx_log_debug3(NGX_LOG_DEBUG_RTMP, s-&gt;connection-&gt;log, 0,
                            "mp4: track#%ui size[%ui/%uD] overflow",
                            t-&gt;id, cr-&gt;size_pos,
-                           ngx_rtmp_r32(t-&gt;sizes2-&gt;sample_count));
+                           ntohl(t-&gt;sizes2-&gt;sample_count));
 
             return NGX_ERROR;
         }
@@ -1672,7 +1672,7 @@ ngx_rtmp_mp4_seek_size(ngx_rtmp_session_
 
     if (t-&gt;sizes) {
         if (t-&gt;sizes-&gt;sample_size) {
-            cr-&gt;size = ngx_rtmp_r32(t-&gt;sizes-&gt;sample_size);
+            cr-&gt;size = ntohl(t-&gt;sizes-&gt;sample_size);
 
             cr-&gt;offset += cr-&gt;size * cr-&gt;chunk_count;
 
@@ -1683,37 +1683,37 @@ ngx_rtmp_mp4_seek_size(ngx_rtmp_session_
             return NGX_OK;
         }
 
-        if (cr-&gt;pos &gt;= ngx_rtmp_r32(t-&gt;sizes-&gt;sample_count)) {
+        if (cr-&gt;pos &gt;= ntohl(t-&gt;sizes-&gt;sample_count)) {
             ngx_log_debug3(NGX_LOG_DEBUG_RTMP, s-&gt;connection-&gt;log, 0,
                            "mp4: track#%ui seek size[%ui/%uD] overflow",
                            t-&gt;id, cr-&gt;pos,
-                           ngx_rtmp_r32(t-&gt;sizes-&gt;sample_count));
+                           ntohl(t-&gt;sizes-&gt;sample_count));
 
             return NGX_ERROR;
         }
 
         for (pos = 1; pos &lt;= cr-&gt;chunk_count; ++pos) {
-            cr-&gt;offset += ngx_rtmp_r32(t-&gt;sizes-&gt;entries[cr-&gt;pos - pos]);
+            cr-&gt;offset += ntohl(t-&gt;sizes-&gt;entries[cr-&gt;pos - pos]);
         }
 
         cr-&gt;size_pos = cr-&gt;pos;
-        cr-&gt;size = ngx_rtmp_r32(t-&gt;sizes-&gt;entries[cr-&gt;size_pos]);
+        cr-&gt;size = ntohl(t-&gt;sizes-&gt;entries[cr-&gt;size_pos]);
 
         ngx_log_debug4(NGX_LOG_DEBUG_RTMP, s-&gt;connection-&gt;log, 0,
                        "mp4: track#%ui seek size[%ui/%uD]=%uz",
                        t-&gt;id, cr-&gt;size_pos,
-                       ngx_rtmp_r32(t-&gt;sizes-&gt;sample_count),
+                       ntohl(t-&gt;sizes-&gt;sample_count),
                        cr-&gt;size);
 
         return NGX_OK;
     }
 
     if (t-&gt;sizes2) {
-        if (cr-&gt;size_pos &gt;= ngx_rtmp_r32(t-&gt;sizes2-&gt;sample_count)) {
+        if (cr-&gt;size_pos &gt;= ntohl(t-&gt;sizes2-&gt;sample_count)) {
             ngx_log_debug3(NGX_LOG_DEBUG_RTMP, s-&gt;connection-&gt;log, 0,
                            "mp4: track#%ui seek size2[%ui/%uD] overflow",
                            t-&gt;id, cr-&gt;size_pos,
-                           ngx_rtmp_r32(t-&gt;sizes-&gt;sample_count));
+                           ntohl(t-&gt;sizes-&gt;sample_count));
 
             return NGX_ERROR;
         }
@@ -1744,11 +1744,11 @@ ngx_rtmp_mp4_next_key(ngx_rtmp_session_t
         cr-&gt;key_pos++;
     }
 
-    if (cr-&gt;key_pos &gt;= ngx_rtmp_r32(t-&gt;keys-&gt;entry_count)) {
+    if (cr-&gt;key_pos &gt;= ntohl(t-&gt;keys-&gt;entry_count)) {
         ngx_log_debug3(NGX_LOG_DEBUG_RTMP, s-&gt;connection-&gt;log, 0,
                 "mp4: track#%ui key[%ui/%uD] overflow",
                 t-&gt;id, cr-&gt;key_pos,
-                ngx_rtmp_r32(t-&gt;keys-&gt;entry_count));
+                ntohl(t-&gt;keys-&gt;entry_count));
 
         cr-&gt;key = 0;
 
@@ -1756,13 +1756,13 @@ ngx_rtmp_mp4_next_key(ngx_rtmp_session_t
     }
 
     ke = &amp;t-&gt;keys-&gt;entries[cr-&gt;key_pos];
-    cr-&gt;key = (cr-&gt;pos + 1 == ngx_rtmp_r32(*ke));
+    cr-&gt;key = (cr-&gt;pos + 1 == ntohl(*ke));
 
     ngx_log_debug6(NGX_LOG_DEBUG_RTMP, s-&gt;connection-&gt;log, 0,
                    "mp4: track#%ui key[%ui/%uD][%ui/%uD]=%s",
                    t-&gt;id, cr-&gt;key_pos,
-                   ngx_rtmp_r32(t-&gt;keys-&gt;entry_count),
-                   cr-&gt;pos, ngx_rtmp_r32(*ke),
+                   ntohl(t-&gt;keys-&gt;entry_count),
+                   cr-&gt;pos, ntohl(*ke),
                    cr-&gt;key ? "match" : "miss");
 
     return NGX_OK;
@@ -1782,27 +1782,27 @@ ngx_rtmp_mp4_seek_key(ngx_rtmp_session_t
         return NGX_OK;
     }
 
-    while (cr-&gt;key_pos &lt; ngx_rtmp_r32(t-&gt;keys-&gt;entry_count)) {
-        if (ngx_rtmp_r32(t-&gt;keys-&gt;entries[cr-&gt;key_pos]) &gt; cr-&gt;pos) {
+    while (cr-&gt;key_pos &lt; ntohl(t-&gt;keys-&gt;entry_count)) {
+        if (ntohl(t-&gt;keys-&gt;entries[cr-&gt;key_pos]) &gt; cr-&gt;pos) {
             break;
         }
 
         cr-&gt;key_pos++;
     }
 
-    if (cr-&gt;key_pos &gt;= ngx_rtmp_r32(t-&gt;keys-&gt;entry_count)) {
+    if (cr-&gt;key_pos &gt;= ntohl(t-&gt;keys-&gt;entry_count)) {
         ngx_log_debug3(NGX_LOG_DEBUG_RTMP, s-&gt;connection-&gt;log, 0,
                 "mp4: track#%ui seek key[%ui/%uD] overflow",
                 t-&gt;id, cr-&gt;key_pos,
-                ngx_rtmp_r32(t-&gt;keys-&gt;entry_count));
+                ntohl(t-&gt;keys-&gt;entry_count));
         return NGX_OK;
     }
 
     ke = &amp;t-&gt;keys-&gt;entries[cr-&gt;key_pos];
-    /*cr-&gt;key = (cr-&gt;pos + 1 == ngx_rtmp_r32(*ke));*/
+    /*cr-&gt;key = (cr-&gt;pos + 1 == ntohl(*ke));*/
 
     /* distance to the next keyframe */
-    dpos = ngx_rtmp_r32(*ke) - cr-&gt;pos - 1;
+    dpos = ntohl(*ke) - cr-&gt;pos - 1;
     cr-&gt;key = 1;
 
     /* TODO: range version needed */
@@ -1810,13 +1810,13 @@ ngx_rtmp_mp4_seek_key(ngx_rtmp_session_t
         ngx_rtmp_mp4_next_time(s, t);
     }
 
-/*    cr-&gt;key = (cr-&gt;pos + 1 == ngx_rtmp_r32(*ke));*/
+/*    cr-&gt;key = (cr-&gt;pos + 1 == ntohl(*ke));*/
 
     ngx_log_debug6(NGX_LOG_DEBUG_RTMP, s-&gt;connection-&gt;log, 0,
                    "mp4: track#%ui seek key[%ui/%uD][%ui/%uD]=%s",
                    t-&gt;id, cr-&gt;key_pos,
-                   ngx_rtmp_r32(t-&gt;keys-&gt;entry_count),
-                   cr-&gt;pos, ngx_rtmp_r32(*ke),
+                   ntohl(t-&gt;keys-&gt;entry_count),
+                   cr-&gt;pos, ntohl(*ke),
                    cr-&gt;key ? "match" : "miss");
 
     return NGX_OK;
@@ -1835,11 +1835,11 @@ ngx_rtmp_mp4_next_delay(ngx_rtmp_session
         return NGX_OK;
     }
 
-    if (cr-&gt;delay_pos &gt;= ngx_rtmp_r32(t-&gt;delays-&gt;entry_count)) {
+    if (cr-&gt;delay_pos &gt;= ntohl(t-&gt;delays-&gt;entry_count)) {
         ngx_log_debug3(NGX_LOG_DEBUG_RTMP, s-&gt;connection-&gt;log, 0,
                 "mp4: track#%ui delay[%ui/%uD] overflow",
                 t-&gt;id, cr-&gt;delay_pos,
-                ngx_rtmp_r32(t-&gt;delays-&gt;entry_count));
+                ntohl(t-&gt;delays-&gt;entry_count));
 
         return NGX_OK;
     }
@@ -1847,29 +1847,29 @@ ngx_rtmp_mp4_next_delay(ngx_rtmp_session
     cr-&gt;delay_count++;
     de = &amp;t-&gt;delays-&gt;entries[cr-&gt;delay_pos];
 
-    if (cr-&gt;delay_count &gt;= ngx_rtmp_r32(de-&gt;sample_count)) {
+    if (cr-&gt;delay_count &gt;= ntohl(de-&gt;sample_count)) {
         cr-&gt;delay_pos++;
         de++;
         cr-&gt;delay_count = 0;
     }
 
-    if (cr-&gt;delay_pos &gt;= ngx_rtmp_r32(t-&gt;delays-&gt;entry_count)) {
+    if (cr-&gt;delay_pos &gt;= ntohl(t-&gt;delays-&gt;entry_count)) {
         ngx_log_debug3(NGX_LOG_DEBUG_RTMP, s-&gt;connection-&gt;log, 0,
                 "mp4: track#%ui delay[%ui/%uD] overflow",
                 t-&gt;id, cr-&gt;delay_pos,
-                ngx_rtmp_r32(t-&gt;delays-&gt;entry_count));
+                ntohl(t-&gt;delays-&gt;entry_count));
 
         return NGX_OK;
     }
 
-    cr-&gt;delay = ngx_rtmp_r32(de-&gt;sample_offset);
+    cr-&gt;delay = ntohl(de-&gt;sample_offset);
 
     ngx_log_debug6(NGX_LOG_DEBUG_RTMP, s-&gt;connection-&gt;log, 0,
                    "mp4: track#%ui delay[%ui/%uD][%ui/%uD]=%ui",
                    t-&gt;id, cr-&gt;delay_pos,
-                   ngx_rtmp_r32(t-&gt;delays-&gt;entry_count),
+                   ntohl(t-&gt;delays-&gt;entry_count),
                    cr-&gt;delay_count,
-                   ngx_rtmp_r32(de-&gt;sample_count), cr-&gt;delay);
+                   ntohl(de-&gt;sample_count), cr-&gt;delay);
 
     return NGX_OK;
 }
@@ -1891,12 +1891,12 @@ ngx_rtmp_mp4_seek_delay(ngx_rtmp_session
     pos = 0;
     de = t-&gt;delays-&gt;entries;
 
-    while (cr-&gt;delay_pos &lt; ngx_rtmp_r32(t-&gt;delays-&gt;entry_count)) {
-        dpos = ngx_rtmp_r32(de-&gt;sample_count);
+    while (cr-&gt;delay_pos &lt; ntohl(t-&gt;delays-&gt;entry_count)) {
+        dpos = ntohl(de-&gt;sample_count);
 
         if (pos + dpos &gt; cr-&gt;pos) {
             cr-&gt;delay_count = cr-&gt;pos - pos;
-            cr-&gt;delay = ngx_rtmp_r32(de-&gt;sample_offset);
+            cr-&gt;delay = ntohl(de-&gt;sample_offset);
             break;
         }
 
@@ -1905,11 +1905,11 @@ ngx_rtmp_mp4_seek_delay(ngx_rtmp_session
         de++;
     }
 
-    if (cr-&gt;delay_pos &gt;= ngx_rtmp_r32(t-&gt;delays-&gt;entry_count)) {
+    if (cr-&gt;delay_pos &gt;= ntohl(t-&gt;delays-&gt;entry_count)) {
         ngx_log_debug3(NGX_LOG_DEBUG_RTMP, s-&gt;connection-&gt;log, 0,
                 "mp4: track#%ui seek delay[%ui/%uD] overflow",
                 t-&gt;id, cr-&gt;delay_pos,
-                ngx_rtmp_r32(t-&gt;delays-&gt;entry_count));
+                ntohl(t-&gt;delays-&gt;entry_count));
 
         return NGX_OK;
     }
@@ -1917,9 +1917,9 @@ ngx_rtmp_mp4_seek_delay(ngx_rtmp_session
     ngx_log_debug6(NGX_LOG_DEBUG_RTMP, s-&gt;connection-&gt;log, 0,
                    "mp4: track#%ui seek delay[%ui/%uD][%ui/%uD]=%ui",
                    t-&gt;id, cr-&gt;delay_pos,
-                   ngx_rtmp_r32(t-&gt;delays-&gt;entry_count),
+                   ntohl(t-&gt;delays-&gt;entry_count),
                    cr-&gt;delay_count,
-                   ngx_rtmp_r32(de-&gt;sample_count), cr-&gt;delay);
+                   ntohl(de-&gt;sample_count), cr-&gt;delay);
 
     return NGX_OK;
 }
@@ -2348,7 +2348,7 @@ ngx_rtmp_mp4_init(ngx_rtmp_session_t *s,
             return NGX_ERROR;
         }
 
-        size = (size_t) ngx_rtmp_r32(hdr[0]);
+        size = (size_t) ntohl(hdr[0]);
         shift = sizeof(hdr);
 
         if (size == 1) {
@@ -2362,7 +2362,7 @@ ngx_rtmp_mp4_init(ngx_rtmp_session_t *s,
                 return NGX_ERROR;
             }
 
-            size = (size_t) ngx_rtmp_r64(extended_size);
+            size = (size_t) ntohll(extended_size);
             shift += sizeof(extended_size);
 
         } else if (size == 0) {
--- a/nginx-mod-rtmp/ngx_rtmp_receive.c
+++ b/nginx-mod-rtmp/ngx_rtmp_receive.c
@@ -17,7 +17,6 @@ ngx_rtmp_protocol_message_handler(ngx_rt
         ngx_rtmp_header_t *h, ngx_chain_t *in)
 {
     ngx_buf_t              *b;
-    u_char                 *p;
     uint32_t                val;
     uint8_t                 limit;
 
@@ -30,11 +29,7 @@ ngx_rtmp_protocol_message_handler(ngx_rt
         return NGX_OK;
     }
 
-    p = (u_char*)&amp;val;
-    p[0] = b-&gt;pos[3];
-    p[1] = b-&gt;pos[2];
-    p[2] = b-&gt;pos[1];
-    p[3] = b-&gt;pos[0];
+    val=ntohl(*(uint32_t*)&amp;b-&gt;pos[0]);
 
     switch(h-&gt;type) {
         case NGX_RTMP_MSG_CHUNK_SIZE:
@@ -88,7 +83,6 @@ ngx_rtmp_user_message_handler(ngx_rtmp_s
                               ngx_chain_t *in)
 {
     ngx_buf_t              *b;
-    u_char                 *p;
     uint16_t                evt;
     uint32_t                val;
 
@@ -101,21 +95,13 @@ ngx_rtmp_user_message_handler(ngx_rtmp_s
         return NGX_OK;
     }
 
-    p = (u_char*)&amp;evt;
-
-    p[0] = b-&gt;pos[1];
-    p[1] = b-&gt;pos[0];
+    evt=ntohs(*(uint16_t*)&amp;b-&gt;pos[0]);
 
     ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s-&gt;connection-&gt;log, 0,
                    "RTMP recv user evt %s (%i)",
                    ngx_rtmp_user_message_type(evt), (ngx_int_t) evt);
 
-    p = (u_char *) &amp;val;
-
-    p[0] = b-&gt;pos[5];
-    p[1] = b-&gt;pos[4];
-    p[2] = b-&gt;pos[3];
-    p[3] = b-&gt;pos[2];
+    val=ntohl(*(uint32_t*)&amp;b-&gt;pos[2]);
 
     switch(evt) {
         case NGX_RTMP_USER_STREAM_BEGIN:
@@ -164,12 +150,7 @@ ngx_rtmp_user_message_handler(ngx_rtmp_s
                     return NGX_OK;
                 }
 
-                p = (u_char *) &amp;v.buflen;
-
-                p[0] = b-&gt;pos[9];
-                p[1] = b-&gt;pos[8];
-                p[2] = b-&gt;pos[7];
-                p[3] = b-&gt;pos[6];
+                v.buflen=ntohl(*(uint32_t*)&amp;b-&gt;pos[6]);
 
                 ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s-&gt;connection-&gt;log, 0,
                                "receive: set_buflen msid=%uD buflen=%uD",
@@ -240,18 +221,20 @@ ngx_rtmp_fetch_uint8(ngx_chain_t **in, u
 static ngx_int_t
 ngx_rtmp_fetch_uint32(ngx_chain_t **in, uint32_t *ret, ngx_int_t n)
 {
-    u_char     *r = (u_char *) ret;
+    u_char      b;
+    uint32_t    val=0;
     ngx_int_t   rc;
 
-    *ret = 0;
-
     while (--n &gt;= 0) {
-        rc = ngx_rtmp_fetch(in, &amp;r[n]);
+        rc = ngx_rtmp_fetch(in, &amp;b);
         if (rc != NGX_OK) {
+            *ret = 0;
             return rc;
         }
+        val = (val&lt;&lt;8)|b;
     }
 
+    *ret=val;
     return NGX_OK;
 }
 
--- a/nginx-mod-rtmp/ngx_rtmp_record_module.c
+++ b/nginx-mod-rtmp/ngx_rtmp_record_module.c
@@ -454,7 +454,7 @@ ngx_rtmp_record_node_open(ngx_rtmp_sessi
     ngx_err_t                   err;
     ngx_str_t                   path;
     ngx_int_t                   mode, create_mode;
-    u_char                      buf[8], *p;
+    u_char                      buf[8];
     off_t                       file_size;
     uint32_t                    tag_size, mlen, timestamp;
 
@@ -551,11 +551,7 @@ ngx_rtmp_record_node_open(ngx_rtmp_sessi
             goto done;
         }
 
-        p = (u_char *) &amp;tag_size;
-        p[0] = buf[3];
-        p[1] = buf[2];
-        p[2] = buf[1];
-        p[3] = buf[0];
+        tag_size=ntohl(*(uint32_t*)&amp;buf[0]);
 
         if (tag_size == 0 || tag_size + 4 &gt; file_size) {
             file_size = 0;
@@ -569,11 +565,7 @@ ngx_rtmp_record_node_open(ngx_rtmp_sessi
             goto done;
         }
 
-        p = (u_char *) &amp;mlen;
-        p[0] = buf[3];
-        p[1] = buf[2];
-        p[2] = buf[1];
-        p[3] = 0;
+        mlen=n3toh4(&amp;buf[1]);
 
         if (tag_size != mlen + 11) {
             ngx_log_error(NGX_LOG_CRIT, s-&gt;connection-&gt;log, ngx_errno,
@@ -582,11 +574,7 @@ ngx_rtmp_record_node_open(ngx_rtmp_sessi
             goto done;
         }
 
-        p = (u_char *) &amp;timestamp;
-        p[3] = buf[7];
-        p[0] = buf[6];
-        p[1] = buf[5];
-        p[2] = buf[4];
+        timestamp=n3toh4(&amp;buf[4])|((uint32_t)buf[7]&lt;&lt;24);
 
 done:
         rctx-&gt;file.offset = file_size;
@@ -891,7 +879,7 @@ ngx_rtmp_record_write_frame(ngx_rtmp_ses
                             ngx_rtmp_header_t *h, ngx_chain_t *in,
                             ngx_int_t inc_nframes)
 {
-    u_char                      hdr[11], *p, *ph;
+    u_char                      hdr[11], *ph;
     uint32_t                    timestamp, tag_size;
     ngx_rtmp_record_app_conf_t *rracf;
 
@@ -937,16 +925,10 @@ ngx_rtmp_record_write_frame(ngx_rtmp_ses
 
     *ph++ = (u_char)h-&gt;type;
 
-    p = (u_char*)&amp;h-&gt;mlen;
-    *ph++ = p[2];
-    *ph++ = p[1];
-    *ph++ = p[0];
-
-    p = (u_char*)&amp;timestamp;
-    *ph++ = p[2];
-    *ph++ = p[1];
-    *ph++ = p[0];
-    *ph++ = p[3];
+    ph = h4ton3(ph, h-&gt;mlen);
+
+    ph = h4ton3(ph, timestamp);
+    *ph++ = (u_char)(timestamp&gt;&gt;24);
 
     *ph++ = 0;
     *ph++ = 0;
@@ -985,12 +967,8 @@ ngx_rtmp_record_write_frame(ngx_rtmp_ses
 
     /* write tag size */
     ph = hdr;
-    p = (u_char*)&amp;tag_size;
-
-    *ph++ = p[3];
-    *ph++ = p[2];
-    *ph++ = p[1];
-    *ph++ = p[0];
+    *(uint32_t*)ph = htonl(tag_size);
+    ph += 4;
 
     if (ngx_write_file(&amp;rctx-&gt;file, hdr, ph - hdr,
                        rctx-&gt;file.offset)
</pre></body></html>