summaryrefslogtreecommitdiffstats
path: root/libavcodec/h264.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-11-18 14:23:06 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-11-18 14:26:58 +0100
commit4fecc3cf0998927456a9f8d8334587dd64154ec5 (patch)
treeddaec636ce0860768f35748ace85241e252a4be0 /libavcodec/h264.h
parent4bee03034bf4f244055e69f602358fcf7bc9946d (diff)
downloadffmpeg-streaming-4fecc3cf0998927456a9f8d8334587dd64154ec5.zip
ffmpeg-streaming-4fecc3cf0998927456a9f8d8334587dd64154ec5.tar.gz
h264: Skip odd NALs in extradata, prevent undefined behavior
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264.h')
-rw-r--r--libavcodec/h264.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h
index 298f983..00a1fc3 100644
--- a/libavcodec/h264.h
+++ b/libavcodec/h264.h
@@ -447,6 +447,7 @@ typedef struct H264Context {
int nal_unit_type;
uint8_t *rbsp_buffer[2];
unsigned int rbsp_buffer_size[2];
+ int decoding_extradata;
/**
* Used to parse AVC variant of h264
OpenPOWER on IntegriCloud