RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit 'a454dec19aa6666b555deec431bc42eda391d7b6' 

* commit 'a454dec19aa6666b555deec431bc42eda391d7b6':
  pixdesc: fix NV20* descriptors
  h264_sei: check SEI size

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-09-24 15:43:22 +02:00
parent d195e6e410 a454dec19a
commit 1fb0d96114
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/h264_sei.c
View File

@ -285,7 +285,8 @@ int ff_h264_decode_sei(H264Context *h)
av_log(h->avctx, AV_LOG_DEBUG, "SEI %d len:%d\n", type, size); av_log(h->avctx, AV_LOG_DEBUG, "SEI %d len:%d\n", type, size);
if (size > get_bits_left(&h->gb) / 8) { if (size > get_bits_left(&h->gb) / 8) {
av_log(h->avctx, AV_LOG_ERROR, "SEI truncated\n"); av_log(h->avctx, AV_LOG_ERROR, "SEI type %d truncated at %d\n",
type, get_bits_left(&h->gb));
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
next = get_bits_count(&h->gb) + 8 * size; next = get_bits_count(&h->gb) + 8 * size;