diff options
| author | Wim Taymans <wim.taymans@collabora.co.uk> | 2011-08-04 09:36:07 +0200 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@collabora.co.uk> | 2011-08-04 09:36:07 +0200 |
| commit | 01b9b5002fb057604855dffc9faac4903df4b8d7 (patch) | |
| tree | e6fc518a8dadb3d755e4ee409becba0cd783fee8 /gst/rtpvp8 | |
| parent | 2988a4ccb224f0be59e0b67ca84e88a01bcee8ec (diff) | |
| parent | cc9e4903138894963e52d52dfc22ffb23d763b9c (diff) | |
Merge branch 'master' into 0.11
Conflicts:
common
configure.ac
gst/colorspace/colorspace.c
gst/colorspace/colorspace.h
gst/colorspace/gstcolorspace.c
Diffstat (limited to 'gst/rtpvp8')
| -rw-r--r-- | gst/rtpvp8/gstrtpvp8pay.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/gst/rtpvp8/gstrtpvp8pay.c b/gst/rtpvp8/gstrtpvp8pay.c index b54ec2898..c6c773dca 100644 --- a/gst/rtpvp8/gstrtpvp8pay.c +++ b/gst/rtpvp8/gstrtpvp8pay.c @@ -141,6 +141,11 @@ gst_rtp_vp8_pay_parse_frame (GstRtpVP8Pay * self, GstBuffer * buffer) self->is_keyframe = keyframe = ((data[0] & 0x1) == 0); version = (data[0] >> 1) & 0x7; + if (G_UNLIKELY (version > 3)) { + GST_ERROR_OBJECT (self, "Unknown VP8 version %u", version); + goto error; + } + /* keyframe, version and show_frame use 5 bits */ header_size = data[2] << 11 | data[1] << 3 | (data[0] >> 5); |