[FFmpeg-cvslog] rtpenc_xiph: Use AV_WB16 instead of manual bitshifts

Martin Storsjö git at videolan.org
Sun Mar 1 01:23:52 CET 2015


ffmpeg | branch: master | Martin Storsjö <martin at martin.st> | Thu Feb 26 13:42:43 2015 +0200| [7c1e2e64667421f931ab48141517f19d309c7eea] | committer: Martin Storsjö

rtpenc_xiph: Use AV_WB16 instead of manual bitshifts

Signed-off-by: Martin Storsjö <martin at martin.st>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7c1e2e64667421f931ab48141517f19d309c7eea
---

 libavformat/rtpenc_xiph.c |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

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;



More information about the ffmpeg-cvslog mailing list