git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
1b3a7e1
)
avformat/rmdec: fix return code of ff_rm_parse_packet()
author
Michael Niedermayer
<michaelni@gmx.at>
Thu, 24 Oct 2013 14:53:50 +0000
(16:53 +0200)
committer
Michael Niedermayer
<michaelni@gmx.at>
Thu, 24 Oct 2013 14:53:50 +0000
(16:53 +0200)
Broken by
aecb9d3
Fixes assertion failure
Fixes Ticket3042
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/rmdec.c
patch
|
blob
|
history
diff --git
a/libavformat/rmdec.c
b/libavformat/rmdec.c
index
a79fbaf
..
42fbb9c
100644
(file)
--- 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) ||