1. ffmpeg
  2. Commit f7106e00f7f1f8879c1fe827dbbc60936a19d6ea
Browse code

avformat/rmdec: fix return code of ff_rm_parse_packet()

Broken by aecb9d3
Fixes assertion failure
Fixes Ticket3042

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

Michael Niedermayer authored on 2013/10/24 23:53:50
Showing 1 changed files
libavformat/rmdec.c
History View file @ f7106e0
... ... 
@@ -788,7 +788,7 @@ ff_rm_parse_packet (AVFormatContext *s, AVIOContext *pb,
788 788 
         rm->current_stream= st->id;
789 789 
         ret = rm_assemble_video_frame(s, pb, rm, ast, pkt, len, seq, &timestamp);
790 790 
         if(ret)
791 
-            return ret; //got partial frame or error
791 
+            return ret < 0 ? ret : -1; //got partial frame or error
792 792 
     } else if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO) {
793 793 
         if ((ast->deint_id == DEINT_ID_GENR) ||
794 794 
             (ast->deint_id == DEINT_ID_INT4) ||