ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-21 05:46:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '7c1e2e64667421f931ab48141517f19d309c7eea'

Browse Source 
* commit '7c1e2e64667421f931ab48141517f19d309c7eea':
  rtpenc_xiph: Use AV_WB16 instead of manual bitshifts

Conflicts:
	libavformat/rtpenc_xiph.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-03-01 01:17:10 +01:00
commit 7e53009588
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavformat/rtpenc_xiph.c
View File

@ -20,6 +20,8 @@
*/
#include "libavutil/avassert.h"
#include "libavutil/intreadwrite.h"
#include "avformat.h"
#include "rtpenc.h"
@ -92,8 +94,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;
@ -114,8 +116,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;