[FFmpeg-cvslog] Revert "Do not decode RV30 files if the extradata is too small"

Michael Niedermayer git at videolan.org
Sun Jul 17 14:21:18 CEST 2011


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jul 17 14:05:03 2011 +0200| [fc096e2e861e821a743bf9c42abee0fb41fff5d6] | committer: Michael Niedermayer

Revert "Do not decode RV30 files if the extradata is too small"

This commit is plain wrong, theres no reason to error out at this point nor is the
error value guranteed to be negative as it should be

This reverts commit 289c60001fb0a9a1d7a97c876d8a42b84c6874ac.

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

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

diff --git a/libavcodec/rv30.c b/libavcodec/rv30.c
index c36bf44..cd11079 100644
--- a/libavcodec/rv30.c
+++ b/libavcodec/rv30.c
@@ -256,7 +256,6 @@ static av_cold int rv30_decode_init(AVCodecContext *avctx)
     if(avctx->extradata_size - 8 < (r->rpr - 1) * 2){
         av_log(avctx, AV_LOG_ERROR, "Insufficient extradata - need at least %d bytes, got %d\n",
                6 + r->rpr * 2, avctx->extradata_size);
-        return EINVAL;
     }
     r->parse_slice_header = rv30_parse_slice_header;
     r->decode_intra_types = rv30_decode_intra_types;



More information about the ffmpeg-cvslog mailing list