summaryrefslogtreecommitdiff
path: root/libavcodec/h264_parser.c
diff options
context:
space:
mode:
authorJanne Grunau <janne-libav@jannau.net>2012-01-06 00:17:37 +0100
committerJanne Grunau <janne-libav@jannau.net>2012-01-06 01:47:45 +0100
commitf907615f0813e8499f06a7eebccf1c63fce87c8e (patch)
tree01382964311578995424eaaa0e4b6c1bc9bcf2e6 /libavcodec/h264_parser.c
parent580bb779360e9832e3b5581e349f76bca75ada08 (diff)
parsers: initialize MpegEncContext.slice_context_count to 1
The mpeg4 video, H264 and VC-1 parser hold (directly or indirectly) a MpegEncContext in their private context. Since they do not call the common mpegvideo init function slice_context_count has explicitly set to 1. Prevents a null pointer dereference in the h264 parser and fixes bug 193.
Diffstat (limited to 'libavcodec/h264_parser.c')
-rw-r--r--libavcodec/h264_parser.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/h264_parser.c b/libavcodec/h264_parser.c
index 826c17a0f1..bcaa04a115 100644
--- a/libavcodec/h264_parser.c
+++ b/libavcodec/h264_parser.c
@@ -330,6 +330,7 @@ static int init(AVCodecParserContext *s)
{
H264Context *h = s->priv_data;
h->thread_context[0] = h;
+ h->s.slice_context_count = 1;
return 0;
}