aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-01-24 00:05:17 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-01-24 00:05:17 +0100
commit78530240715c3b127fcb0e5ead823816389f0cbf (patch)
tree8773d5d68631fe7c45936ba48985baab497872b1
parent4d888a0ad8239f5438b9ecca2bc84dee3cb4e728 (diff)
downloadffmpeg-78530240715c3b127fcb0e5ead823816389f0cbf.tar.gz
avcodec/h264_cabac: Fix use with the checked bitstream-reader
Found-by: Dale Curtis <dalecurtis@google.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/h264_cabac.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/h264_cabac.c b/libavcodec/h264_cabac.c
index c0ca154bf7..d35c408788 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