[FFmpeg-cvslog] avformat/rmdec: fix return code of ff_rm_parse_packet()

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Oct 24 16:53:50 2013 +0200| [f7106e00f7f1f8879c1fe827dbbc60936a19d6ea] | committer: Michael Niedermayer

avformat/rmdec: fix return code of ff_rm_parse_packet()

Broken by aecb9d3
Fixes assertion failure
Fixes Ticket3042

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f7106e00f7f1f8879c1fe827dbbc60936a19d6ea
---

 libavformat/rmdec.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/rmdec.c b/libavformat/rmdec.c
index a79fbaf..42fbb9c 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, &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) ||