diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-19 00:05:03 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-19 00:05:03 +0200 |
| commit | df727d408c7e4aa7709ca62e3f693b98eac6213c (patch) | |
| tree | 34a72f3f53442c432c841376f69d40ab09fb15af /libavcodec/mlp_parser.c | |
| parent | e807a2b64899c8be82b5321ed0cb633777786c51 (diff) | |
mlp_parser: print error when ff_combine_frame() fails to add the current buffer
Fixes part of CID602338
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mlp_parser.c')
| -rw-r--r-- | libavcodec/mlp_parser.c | 6 |
1 files 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; } |