virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity

avcodec/vc1_parser: check ff_vc1_parse_frame_header*() return value

Browse Source 
Fixed CID739860

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-10-27 13:28:08 +01:00
parent 46143d2555
commit 7eda2e524b
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/vc1_parser.c
View File

@ -51,6 +51,7 @@ static void vc1_extract_headers(AVCodecParserContext *s, AVCodecContext *avctx,
for(start = buf, end = buf + buf_size; next < end; start = next){ for(start = buf, end = buf + buf_size; next < end; start = next){
int buf2_size, size; int buf2_size, size;
int ret;
next = find_next_marker(start + 4, end); next = find_next_marker(start + 4, end);
size = next - start - 4; size = next - start - 4;
@ -66,9 +67,12 @@ static void vc1_extract_headers(AVCodecParserContext *s, AVCodecContext *avctx,
break; break;
case VC1_CODE_FRAME: case VC1_CODE_FRAME:
if(vpc->v.profile < PROFILE_ADVANCED) if(vpc->v.profile < PROFILE_ADVANCED)
ff_vc1_parse_frame_header (&vpc->v, &gb); ret = ff_vc1_parse_frame_header (&vpc->v, &gb);
else else
ff_vc1_parse_frame_header_adv(&vpc->v, &gb); ret = ff_vc1_parse_frame_header_adv(&vpc->v, &gb);
if (ret < 0)
break;
/* keep AV_PICTURE_TYPE_BI internal to VC1 */ /* keep AV_PICTURE_TYPE_BI internal to VC1 */
if (vpc->v.s.pict_type == AV_PICTURE_TYPE_BI) if (vpc->v.s.pict_type == AV_PICTURE_TYPE_BI)