diff options
| author | XhmikosR <xhmikosr@users.sourceforge.net> | 2010-08-07 15:27:05 +0400 |
|---|---|---|
| committer | XhmikosR <xhmikosr@users.sourceforge.net> | 2010-08-07 15:27:05 +0400 |
| commit | ad4c7ee4cce2e9637a05e5aef01182adb7da856d (patch) | |
| tree | 78e0d645d3bb07bebc6262195e5575e9d510a715 /src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264_ps.c | |
| parent | af2a4036ec6a39acb89d82188cd2be2d697c2a84 (diff) | |
updated ffmpeg
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@2212 10f7b99b-c216-0410-bff0-8a66a9350fd8
Diffstat (limited to 'src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264_ps.c')
| -rw-r--r-- | src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264_ps.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264_ps.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264_ps.c index e7b444dd1..40b71ec24 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264_ps.c +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264_ps.c @@ -25,6 +25,7 @@ * @author Michael Niedermayer <michaelni@gmx.at>
*/
+#include "libavcore/imgutils.h"
#include "internal.h"
#include "dsputil.h"
#include "avcodec.h"
@@ -343,7 +344,7 @@ int ff_h264_decode_seq_parameter_set(H264Context *h){ sps->mb_width = get_ue_golomb(&s->gb) + 1;
sps->mb_height= get_ue_golomb(&s->gb) + 1;
if((unsigned)sps->mb_width >= INT_MAX/16 || (unsigned)sps->mb_height >= INT_MAX/16 ||
- avcodec_check_dimensions(NULL, 16*sps->mb_width, 16*sps->mb_height)){
+ av_check_image_size(16*sps->mb_width, 16*sps->mb_height, 0, h->s.avctx)){
av_log(h->s.avctx, AV_LOG_ERROR, "mb_width/height overflow\n");
goto fail;
}
|