From df727d408c7e4aa7709ca62e3f693b98eac6213c Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Fri, 19 Oct 2012 00:05:03 +0200 Subject: [PATCH] mlp_parser: print error when ff_combine_frame() fails to add the current buffer Fixes part of CID602338 Signed-off-by: Michael Niedermayer --- libavcodec/mlp_parser.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavcodec/mlp_parser.c b/libavcodec/mlp_parser.c index 5fb1424b46..1f5a3b13ab 100644 --- a/libavcodec/mlp_parser.c +++ b/libavcodec/mlp_parser.c @@ -239,7 +239,8 @@ static int mlp_parse(AVCodecParserContext *s, } if (!mp->in_sync) { - ff_combine_frame(&mp->pc, END_NOT_FOUND, &buf, &buf_size); + if (ff_combine_frame(&mp->pc, END_NOT_FOUND, &buf, &buf_size) != -1) + av_log(avctx, AV_LOG_WARNING, "ff_combine_frame failed\n"); return buf_size; } @@ -257,7 +258,8 @@ static int mlp_parse(AVCodecParserContext *s, } if (mp->pc.index + buf_size < 2) { - ff_combine_frame(&mp->pc, END_NOT_FOUND, &buf, &buf_size); + if (ff_combine_frame(&mp->pc, END_NOT_FOUND, &buf, &buf_size) != -1) + av_log(avctx, AV_LOG_WARNING, "ff_combine_frame failed\n"); return buf_size; }