Commit f7106e00 authored by Michael Niedermayer's avatar Michael Niedermayer

avformat/rmdec: fix return code of ff_rm_parse_packet()

Broken by aecb9d39
Fixes assertion failure
Fixes Ticket3042
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 1b3a7e1f
......@@ -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, &timestamp);
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) ||
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment