aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/h264.h
diff options
context:
space:
mode:
authorJanne Grunau <janne-libav@jannau.net>2012-12-15 22:21:23 +0100
committerJanne Grunau <janne-libav@jannau.net>2012-12-18 11:01:14 +0100
commit61c6eef5456f2bc8b1dc49a0a759c975551cea29 (patch)
tree33bee5b20a90f39428dcf2eec256cc93323bca53 /libavcodec/h264.h
parent26e4f0c70f781a16f4234c101ceceb640ec5ff31 (diff)
downloadffmpeg-61c6eef5456f2bc8b1dc49a0a759c975551cea29.tar.gz
h264: prevent decoding of slice NALs in extradata
It is not posible to call get_buffer during frame-mt codec initialization. Libavformat might pass huge amounts of data as extradata after parsing broken files. The 'extradata' for the fuzzed sample sample_varPAR_s5374_r001-02.avi is 2.8M large and contains multiple slices.
Diffstat (limited to 'libavcodec/h264.h')
-rw-r--r--libavcodec/h264.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h
index 3c99030ed2..30494706a8 100644
--- a/libavcodec/h264.h
+++ b/libavcodec/h264.h
@@ -112,7 +112,8 @@ enum {
NAL_END_STREAM,
NAL_FILLER_DATA,
NAL_SPS_EXT,
- NAL_AUXILIARY_SLICE = 19
+ NAL_AUXILIARY_SLICE = 19,
+ NAL_FF_IGNORE = 0xff0f001,
};
/**