diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 14:08:14 +0300 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 14:09:03 +0300 |
| commit | 665e0c10a63d31dd6c7b1fba14db074625d54614 (patch) | |
| tree | bf528757579d4ac171369b9466705719632415e4 /libavcodec/h264_ps.c | |
| parent | e4588e376a63e50a98c4ae0658cf45a9c4e6c556 (diff) | |
| parent | d8a45d2d49f54fde042b195f9d5859251252493d (diff) | |
Merge commit 'd8a45d2d49f54fde042b195f9d5859251252493d'
* commit 'd8a45d2d49f54fde042b195f9d5859251252493d':
h264_ps: properly check cropping parameters against overflow
Conflicts:
libavcodec/h264_ps.c
See: c3bd306e78f9e3ca2f136f5b30cbe49fa0884f82
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264_ps.c')
| -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 c2747ac84c..7174d5b775 100644 --- a/libavcodec/h264_ps.c +++ b/libavcodec/h264_ps.c @@ -460,10 +460,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); |