[FFmpeg-cvslog] avcodec/rv30: put the rpr check back in init with the max vs bits bug fixed

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Jan  4 04:18:43 2014 +0100| [be524ffc16bf14cab0ad112b0dcb48d09a2a40ff] | committer: Michael Niedermayer

avcodec/rv30: put the rpr check back in init with the max vs bits bug fixed

Its usefull to know immediatly if extradata is wrong and not just when later
the decoder tries to use it.

This check was removed by: a6a2282c25abe43e352010a7c3fbc92994c0bc1c
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavcodec/rv30.c |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libavcodec/rv30.c b/libavcodec/rv30.c
index 901ba89..dff4117 100644
--- a/libavcodec/rv30.c
+++ b/libavcodec/rv30.c
@@ -267,6 +267,10 @@ static av_cold int rv30_decode_init(AVCodecContext *avctx)
     }
 
     r->max_rpr = avctx->extradata[1] & 7;
+    if(avctx->extradata_size < 2*r->max_rpr + 8){
+        av_log(avctx, AV_LOG_WARNING, "Insufficient extradata - need at least %d bytes, got %d\n",
+               2*r->max_rpr + 8, avctx->extradata_size);
+    }
 
     r->parse_slice_header = rv30_parse_slice_header;
     r->decode_intra_types = rv30_decode_intra_types;