---
libavcodec/dca_parser.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/libavcodec/dca_parser.c b/libavcodec/dca_parser.c
index 276d873..88236b6 100644
--- a/libavcodec/dca_parser.c
+++ b/libavcodec/dca_parser.c
@@ -140,18 +140,19 @@ static int dca_parse(AVCodecParserContext *s,
AVCodecContext *avctx,
{
DCAParseContext *pc1 = s->priv_data;
ParseContext *pc = &pc1->pc;
- int next, duration, sample_rate;
+ int next, duration, sample_rate, ret;
if (s->flags & PARSER_FLAG_COMPLETE_FRAMES) {
next = buf_size;
} else {
next = dca_find_frame_end(pc1, buf, buf_size);
- if (ff_combine_frame(pc, next, &buf, &buf_size) < 0) {
- *poutbuf = NULL;
- *poutbuf_size = 0;
+ ret = ff_combine_packet(pc, next, &buf, &buf_size,
+ poutbuf, poutbuf_size);
+ if (ret == AVERROR(EAGAIN))
return buf_size;
- }
+ if (ret == AVERROR(ENOMEM))
+ return ret;
}
/* read the duration and sample rate from the frame header */
--
1.8.3.2
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
