virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avcodec/mlp_parser: check ff_combine_frame() return code

Browse Source 
Fixes CID602338

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-07-04 19:33:54 +02:00
parent d1a8659efe
commit 2d15554850
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/mlp_parser.c
View File

@ -230,6 +230,7 @@ static int mlp_parse(AVCodecParserContext *s,
int sync_present;
uint8_t parity_bits;
int next;
int ret;
int i, p = 0;
*poutbuf_size = 0;
@ -256,7 +257,10 @@ static int mlp_parse(AVCodecParserContext *s,
return buf_size;
}
ff_combine_frame(&mp->pc, i - 7, &buf, &buf_size);
if ((ret = ff_combine_frame(&mp->pc, i - 7, &buf, &buf_size)) < 0) {
av_log(avctx, AV_LOG_WARNING, "ff_combine_frame failed\n");
return ret;
}
return i - 7;
}