From f7106e00f7f1f8879c1fe827dbbc60936a19d6ea Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Thu, 24 Oct 2013 16:53:50 +0200 Subject: avformat/rmdec: fix return code of ff_rm_parse_packet() Broken by aecb9d3 Fixes assertion failure Fixes Ticket3042 Signed-off-by: Michael Niedermayer --- libavformat/rmdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libavformat/rmdec.c') diff --git a/libavformat/rmdec.c b/libavformat/rmdec.c index a79fbaf4db..42fbb9c191 100644 --- a/libavformat/rmdec.c +++ b/libavformat/rmdec.c @@ -788,7 +788,7 @@ ff_rm_parse_packet (AVFormatContext *s, AVIOContext *pb, rm->current_stream= st->id; ret = rm_assemble_video_frame(s, pb, rm, ast, pkt, len, seq, ×tamp); if(ret) - return ret; //got partial frame or error + return ret < 0 ? ret : -1; //got partial frame or error } else if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO) { if ((ast->deint_id == DEINT_ID_GENR) || (ast->deint_id == DEINT_ID_INT4) || -- cgit v1.2.1