OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d788af6
)
Avoid NULL dereference on corrupted bitstream with real decoder.
author
Laurent Aimar
<fenrir@videolan.org>
Sat, 17 Sep 2011 21:43:58 +0000
(23:43 +0200)
committer
Michael Niedermayer
<michaelni@gmx.at>
Sat, 17 Sep 2011 22:57:49 +0000
(
00:57
+0200)
rv34_decode_slice() can return without allocating any pictures.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/rv34.c
patch
|
blob
|
history
diff --git
a/libavcodec/rv34.c
b/libavcodec/rv34.c
index
ca727a5
..
963bd1e
100644
(file)
--- a/
libavcodec/rv34.c
+++ b/
libavcodec/rv34.c
@@
-1538,7
+1538,7
@@
int ff_rv34_decode_frame(AVCodecContext *avctx,
break;
}
- if(last){
+ if(last
&& s->current_picture_ptr
){
if(r->loop_filter)
r->loop_filter(r, s->mb_height - 1);
ff_er_frame_end(s);