From: Rafaël Carré Date: Thu, 28 Jan 2010 13:04:25 +0000 (+0000) Subject: Initialize thread_context[0] with h264 parser context. X-Git-Tag: v0.6~1593 X-Git-Url: https://git.libav.org/?p=libav.git;a=commitdiff_plain;h=e9ca315dd188c38621c9439ef813d1cdf846ce1d Initialize thread_context[0] with h264 parser context. This allows freeing the parser memory in the thread_context freeing loop. Patch by Rafaël Carré gmailify(rafael, carre) Originally committed as revision 21508 to svn://svn.ffmpeg.org/ffmpeg/trunk --- diff --git a/libavcodec/h264_parser.c b/libavcodec/h264_parser.c index dabd475f93..d9af8c9c36 100644 --- a/libavcodec/h264_parser.c +++ b/libavcodec/h264_parser.c @@ -309,11 +309,17 @@ static void close(AVCodecParserContext *s) ff_h264_free_context(h); } +static int init(AVCodecParserContext *s) +{ + H264Context *h = s->priv_data; + h->thread_context[0] = h; + return 0; +} AVCodecParser h264_parser = { { CODEC_ID_H264 }, sizeof(H264Context), - NULL, + init, h264_parse, close, h264_split,