diff options
| author | Laurent Aimar <fenrir@videolan.org> | 2011-09-18 00:03:08 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-09-21 14:40:34 +0200 |
| commit | bb6702f20675868fba91f6be5e5120b5d8ef031f (patch) | |
| tree | bee48e26adfa7f723717b42e0fed00ecc0b8ed25 | |
| parent | dd606be909437c6fac8a91ffb9dacfd6e81a1ac0 (diff) | |
| download | ffmpeg-bb6702f20675868fba91f6be5e5120b5d8ef031f.tar.gz | |
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@martin.st>
(cherry picked from commit 4a29b471869353c3077fb4b25b6518eb1047afb7)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
| -rw-r--r-- | libavcodec/rv10.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/rv10.c b/libavcodec/rv10.c index 78f97b16b1..223500c356 100644 --- a/libavcodec/rv10.c +++ b/libavcodec/rv10.c @@ -543,6 +543,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; + } } av_dlog(avctx, "qscale=%d\n", s->qscale); |