On Sun, 18 Sep 2011, Kostya Shishkov wrote:
On Sun, Sep 18, 2011 at 12:03:08AM +0200, Laurent Aimar wrote:
This prevents crashes with some corrupted bitstreams.
---
libavcodec/rv10.c | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/libavcodec/rv10.c b/libavcodec/rv10.c
index d789eff..3ba8102 100644
--- a/libavcodec/rv10.c
+++ b/libavcodec/rv10.c
@@ -531,6 +531,11 @@ static int rv10_decode_packet(AVCodecContext *avctx,
if(MPV_frame_start(s, avctx) < 0)
return -1;
ff_er_frame_start(s);
+ } else {
+ if (s->current_picture_ptr->f.pict_type != s->pict_type) {
+ av_log(s->avctx, AV_LOG_ERROR, "Slice type mismatch\n");
+ return -1;
+ }
}
av_dlog(avctx, "qscale=%d\n", s->qscale);
--
Looks OK
Pushed this one and hopefully all other of the ones you ok'd so far.
// Martin
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
