diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-24 16:53:50 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-24 16:53:50 +0200 |
| commit | f7106e00f7f1f8879c1fe827dbbc60936a19d6ea (patch) | |
| tree | a1eccff8826b62ea858be3120171e462052bdf79 /libavformat/rmdec.c | |
| parent | 1b3a7e1f42c3d89253e9837ada98e6bfb0cbab2f (diff) | |
| download | ffmpeg-f7106e00f7f1f8879c1fe827dbbc60936a19d6ea.tar.gz | |
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>
Diffstat (limited to 'libavformat/rmdec.c')
| -rw-r--r-- | libavformat/rmdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
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) || |