virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

h263: Always check both dimensions

Browse Source 
CC: libav-stable@libav.org
Found-By: ago@gentoo.org
This commit is contained in:
Luca Barbato
2015-06-26 15:57:16 +02:00
committed by Vittorio Giovara
parent 6f4cd33efb
commit 0a49a62f99
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/ituh263dec.c
View File

@@ -30,6 +30,7 @@
#include <limits.h> #include <limits.h>
#include "libavutil/attributes.h" #include "libavutil/attributes.h"
#include "libavutil/imgutils.h"
#include "libavutil/internal.h" #include "libavutil/internal.h"
#include "libavutil/mathematics.h" #include "libavutil/mathematics.h"
#include "avcodec.h" #include "avcodec.h"
@@ -868,7 +869,7 @@ end:
/* most is hardcoded. should extend to handle all h263 streams */ /* most is hardcoded. should extend to handle all h263 streams */
int ff_h263_decode_picture_header(MpegEncContext *s) int ff_h263_decode_picture_header(MpegEncContext *s)
{ {
int format, width, height, i; int format, width, height, i, ret;
uint32_t startcode; uint32_t startcode;
align_get_bits(&s->gb); align_get_bits(&s->gb);
@@ -919,8 +920,6 @@ int ff_h263_decode_picture_header(MpegEncContext *s)
/* H.263v1 */ /* H.263v1 */
width = ff_h263_format[format][0]; width = ff_h263_format[format][0];
height = ff_h263_format[format][1]; height = ff_h263_format[format][1];
if (!width)
return -1;
s->pict_type = AV_PICTURE_TYPE_I + get_bits1(&s->gb); s->pict_type = AV_PICTURE_TYPE_I + get_bits1(&s->gb);
@@ -1073,6 +1072,9 @@ int ff_h263_decode_picture_header(MpegEncContext *s)
s->qscale = get_bits(&s->gb, 5); s->qscale = get_bits(&s->gb, 5);
} }
if ((ret = av_image_check_size(s->width, s->height, 0, s)) < 0)
return ret;
s->mb_width = (s->width + 15) / 16; s->mb_width = (s->width + 15) / 16;
s->mb_height = (s->height + 15) / 16; s->mb_height = (s->height + 15) / 16;
s->mb_num = s->mb_width * s->mb_height; s->mb_num = s->mb_width * s->mb_height;