[07/12] rtpenc_xiph: Use AV_WB16 instead of manual bitshifts

Message ID 1425034865-28812-7-git-send-email-martin@martin.st
State Committed
Commit 7c1e2e64667421f931ab48141517f19d309c7eea
Headers show

Commit Message

Martin Storsjö Feb. 27, 2015, 11:01 a.m.
---
 libavformat/rtpenc_xiph.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

Comments

Luca Barbato Feb. 28, 2015, 12:29 a.m. | #1
On 27/02/15 12:01, Martin Storsjö wrote:
> ---
>  libavformat/rtpenc_xiph.c | 10 ++++++----
>  1 file changed, 6 insertions(+), 4 deletions(-)
> 

Ok.

Patch

diff --git a/libavformat/rtpenc_xiph.c b/libavformat/rtpenc_xiph.c
index def3bc5..ef31c04 100644
--- a/libavformat/rtpenc_xiph.c
+++ b/libavformat/rtpenc_xiph.c
@@ -19,6 +19,8 @@ 
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/intreadwrite.h"
+
 #include "avformat.h"
 #include "rtpenc.h"
 
@@ -91,8 +93,8 @@  void ff_rtp_send_xiph(AVFormatContext *s1, const uint8_t *buff, int size)
 
         if (s->num_frames > 1)
             q = s->buf_ptr; // jump ahead if needed
-        *q++ = (size >> 8) & 0xff;
-        *q++ = size & 0xff;
+        AV_WB16(q, size);
+        q += 2;
         memcpy(q, buff, size);
         q += size;
         s->buf_ptr = q;
@@ -113,8 +115,8 @@  void ff_rtp_send_xiph(AVFormatContext *s1, const uint8_t *buff, int size)
 
         // set packet headers
         *q++ = (frag << 6) | (xdt << 4); // num_frames = 0
-        *q++ = (len >> 8) & 0xff;
-        *q++ = len & 0xff;
+        AV_WB16(q, len);
+        q += 2;
         // set packet body
         memcpy(q, buff, len);
         q += len;