diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-29 03:26:42 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-29 03:27:07 +0200 |
| commit | 8e7eb268758dcb37a4452d02e8908ebf709e21e2 (patch) | |
| tree | 7af4d0bcbf0ce2d7a3b32913260faed6957c6243 | |
| parent | 6e835eb2dd5204f04822558474c16f41583e0ed5 (diff) | |
| parent | 9cef65434e5e5ffbd4a856ce7ae9c067dec039b7 (diff) | |
| download | ffmpeg-8e7eb268758dcb37a4452d02e8908ebf709e21e2.tar.gz | |
Merge commit '9cef65434e5e5ffbd4a856ce7ae9c067dec039b7' into release/2.4
* commit '9cef65434e5e5ffbd4a856ce7ae9c067dec039b7':
h264_ps: properly check cropping parameters against overflow
Conflicts:
libavcodec/h264_ps.c
See: c3bd306e78f9e3ca2f136f5b30cbe49fa0884f82
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/h264_ps.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/h264_ps.c b/libavcodec/h264_ps.c index 7c303d6ad4..641e72dc58 100644 --- a/libavcodec/h264_ps.c +++ b/libavcodec/h264_ps.c @@ -480,10 +480,10 @@ int ff_h264_decode_seq_parameter_set(H264Context *h) #endif sps->crop = get_bits1(&h->gb); if (sps->crop) { - int crop_left = get_ue_golomb(&h->gb); - int crop_right = get_ue_golomb(&h->gb); - int crop_top = get_ue_golomb(&h->gb); - int crop_bottom = get_ue_golomb(&h->gb); + unsigned int crop_left = get_ue_golomb(&h->gb); + unsigned int crop_right = get_ue_golomb(&h->gb); + unsigned int crop_top = get_ue_golomb(&h->gb); + unsigned int crop_bottom = get_ue_golomb(&h->gb); int width = 16 * sps->mb_width; int height = 16 * sps->mb_height * (2 - sps->frame_mbs_only_flag); |