[FFmpeg-cvslog] lavc/rawdec: add assertion check in raw_decode()

Stefano Sabatini git at videolan.org
Tue Jul 3 01:28:43 CEST 2012


ffmpeg | branch: master | Stefano Sabatini <stefasab at gmail.com> | Mon Jun 25 18:56:46 2012 +0200| [ab7dbdc92c449d6c26cc164d149395bd753c0e53] | committer: Stefano Sabatini

lavc/rawdec: add assertion check in raw_decode()

Check on an implicit assumption done on the number of coded bits for
paletted rawvideo with coded bits == 2.

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

 libavcodec/rawdec.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavcodec/rawdec.c b/libavcodec/rawdec.c
index 7b7840f..ba416db 100644
--- a/libavcodec/rawdec.c
+++ b/libavcodec/rawdec.c
@@ -27,6 +27,7 @@
 #include "avcodec.h"
 #include "imgconvert.h"
 #include "raw.h"
+#include "libavutil/avassert.h"
 #include "libavutil/intreadwrite.h"
 #include "libavutil/imgutils.h"
 #include "libavutil/opt.h"
@@ -179,6 +180,7 @@ static int raw_decode(AVCodecContext *avctx,
             }
             linesize_align = 8;
         } else {
+            av_assert0(avctx->bits_per_coded_sample == 2);
             for(i=0; 4*i+3 < buf_size && i<avpkt->size; i++){
                 dst[4*i+0]= buf[i]>>6;
                 dst[4*i+1]= buf[i]>>4&3;



More information about the ffmpeg-cvslog mailing list