[FFmpeg-cvslog] avcodec/h264_cabac: Fix use with the checked bitstream-reader

Michael Niedermayer git at videolan.org
Fri Jan 24 00:15:15 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jan 24 00:05:17 2014 +0100| [78530240715c3b127fcb0e5ead823816389f0cbf] | committer: Michael Niedermayer

avcodec/h264_cabac: Fix use with the checked bitstream-reader

Found-by: Dale Curtis <dalecurtis at google.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavcodec/h264_cabac.c |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/libavcodec/h264_cabac.c b/libavcodec/h264_cabac.c
index c0ca154..d35c408 100644
--- a/libavcodec/h264_cabac.c
+++ b/libavcodec/h264_cabac.c
@@ -1619,6 +1619,9 @@ decode_cabac_residual_internal(H264Context *h, int16_t *block,
     cc.range     = h->cabac.range;
     cc.low       = h->cabac.low;
     cc.bytestream= h->cabac.bytestream;
+#if !UNCHECKED_BITSTREAM_READER
+    cc.bytestream_end = h->cabac.bytestream_end;
+#endif
 #else
 #define CC &h->cabac
 #endif



More information about the ffmpeg-cvslog mailing list