summaryrefslogtreecommitdiff
path: root/libavcodec/h264.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-09-10 16:28:53 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-09-21 18:02:13 +0200
commit97437dada65833d09604c40f01c874a676de3c32 (patch)
treee7fde958e784bdd7ddc67e6a7b216819dbae5bb8 /libavcodec/h264.h
parentc8736de331e4da336e8dfb8805a220af2bd67dc2 (diff)
downloadffmpeg-97437dada65833d09604c40f01c874a676de3c32.tar.gz
h264dec: Prevent CABAC and CAVLC bitsteram overreading
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 23f5cff92cdcfa55a735c458fcb5f95c0e0f3b1f)
Diffstat (limited to 'libavcodec/h264.h')
-rw-r--r--libavcodec/h264.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h
index 4188ad922c..76e9832975 100644
--- a/libavcodec/h264.h
+++ b/libavcodec/h264.h
@@ -53,6 +53,8 @@
#define MAX_DELAYED_PIC_COUNT 16
+#define MAX_MBPAIR_SIZE (256*1024) // a tighter bound could be calculated if someone cares about a few bytes
+
/* Compiling in interlaced support reduces the speed
* of progressive decoding by about 2%. */
#define ALLOW_INTERLACE