summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2008-12-30 19:49:27 +0000
committerMichael Niedermayer <michaelni@gmx.at>2008-12-30 19:49:27 +0000
commit51d6852f43774165beefee96a9e875db5e3a8189 (patch)
treeca85dbf2bbb59786cf2557fde80bf6b2e4bf4095 /libavformat
parentaed464654bda3d9a9ed33d5fcc3d48681b076b92 (diff)
All non zero returns of rm_assemble_video_frame() are errors, check things
accordingly. Originally committed as revision 16398 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/rmdec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/rmdec.c b/libavformat/rmdec.c
index 2471f94a00..43fec701a7 100644
--- a/libavformat/rmdec.c
+++ b/libavformat/rmdec.c
@@ -590,7 +590,7 @@ ff_rm_parse_packet (AVFormatContext *s, ByteIOContext *pb,
if (st->codec->codec_type == CODEC_TYPE_VIDEO) {
rm->current_stream= st->id;
- if(rm_assemble_video_frame(s, pb, rm, ast, pkt, len) == 1)
+ if(rm_assemble_video_frame(s, pb, rm, ast, pkt, len))
return -1; //got partial frame
} else if (st->codec->codec_type == CODEC_TYPE_AUDIO) {
if ((st->codec->codec_id == CODEC_ID_RA_288) ||