diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-09 13:06:04 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-09 13:06:04 +0200 |
| commit | ef9fe5bedd1993700818a0ba1c195cd6f6668afe (patch) | |
| tree | 3c70bf61e4bae16375575e3e6e8dac55fc1ba148 /libavformat/rtpenc_vp8.c | |
| parent | 238e904df3988ea0253ba08c8b2883e4740565b6 (diff) | |
| parent | a75b9a1804769169456306f570b6716d977ebdc5 (diff) | |
| download | ffmpeg-ef9fe5bedd1993700818a0ba1c195cd6f6668afe.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mingw/cygwin: Stop adding -fno-common to gcc CFLAGS
Restructure av_log_missing_feature message
rtp: Support packetization/depacketization of opus
file: Set the return value type for lseek to int64_t.
ppc: fix Altivec build with old compilers
build: add LTO support for PGI compiler
build: add -Mdse to PGI optimisation flags
rtpenc_vp8: Update the packetizer to the latest spec version
rtpdec_vp8: Make the depacketizer implement the latest spec draft
doc: allow building with old texi2html versions
avutil: skip old_pix_fmts.h since it is just a list
Conflicts:
libavcodec/aacdec.c
libavcodec/h264.c
libavcodec/ppc/fmtconvert_altivec.c
libavcodec/utils.c
libavformat/file.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtpenc_vp8.c')
| -rw-r--r-- | libavformat/rtpenc_vp8.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavformat/rtpenc_vp8.c b/libavformat/rtpenc_vp8.c index e865514cef..d16e6764c9 100644 --- a/libavformat/rtpenc_vp8.c +++ b/libavformat/rtpenc_vp8.c @@ -22,7 +22,7 @@ #include "rtpenc.h" /* Based on a draft spec for VP8 RTP. - * ( http://www.webmproject.org/code/specs/rtp/ ) */ + * ( http://tools.ietf.org/html/draft-ietf-payload-vp8-05 ) */ void ff_rtp_send_vp8(AVFormatContext *s1, const uint8_t *buf, int size) { RTPMuxContext *s = s1->priv_data; @@ -32,7 +32,9 @@ void ff_rtp_send_vp8(AVFormatContext *s1, const uint8_t *buf, int size) s->timestamp = s->cur_timestamp; max_packet_size = s->max_payload_size - 1; // minus one for header byte - *s->buf_ptr++ = 1; // 0b1 indicates start of frame + // no extended control bits, reference frame, start of partition, + // partition id 0 + *s->buf_ptr++ = 0x10; while (size > 0) { len = FFMIN(size, max_packet_size); |