[FFmpeg-cvslog] rv10: Reject slices that does not have the same type as the first one

[Laurent Aimar]

ffmpeg | branch: release/0.6 | Laurent Aimar <fenrir at videolan.org> | Sun Sep 18 00:03:08 2011 +0200| [7cd7461ec8013a381938b52568f9eb08ab3d1720] | committer: Reinhard Tartler

rv10: Reject slices that does not have the same type as the first one

This prevents crashes with some corrupted bitstreams.

Signed-off-by: Martin Storsjö <martin at martin.st>
(cherry picked from commit 4a29b471869353c3077fb4b25b6518eb1047afb7)

Signed-off-by: Anton Khirnov <anton at khirnov.net>
(cherry picked from commit 28d948ac44e38e8bec2f6268ccf4747ff4d992a9)

Signed-off-by: Reinhard Tartler <siretart at tauware.de>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7cd7461ec8013a381938b52568f9eb08ab3d1720
---

 libavcodec/rv10.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/libavcodec/rv10.c b/libavcodec/rv10.c
index 7b635b3..af0d16c 100644
--- a/libavcodec/rv10.c
+++ b/libavcodec/rv10.c
@@ -559,6 +559,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->pict_type != s->pict_type) {
+            av_log(s->avctx, AV_LOG_ERROR, "Slice type mismatch\n");
+            return -1;
+        }
     }
 
     dprintf(avctx, "qscale=%d\n", s->qscale);