projects
/
platform
/
upstream
/
libav.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
aed4646
)
All non zero returns of rm_assemble_video_frame() are errors, check things
author
Michael Niedermayer
<michaelni@gmx.at>
Tue, 30 Dec 2008 19:49:27 +0000
(19:49 +0000)
committer
Michael Niedermayer
<michaelni@gmx.at>
Tue, 30 Dec 2008 19:49:27 +0000
(19:49 +0000)
accordingly.
Originally committed as revision 16398 to svn://svn.ffmpeg.org/ffmpeg/trunk
libavformat/rmdec.c
patch
|
blob
|
history
diff --git
a/libavformat/rmdec.c
b/libavformat/rmdec.c
index
2471f94
..
43fec70
100644
(file)
--- 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) ||