mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-28 20:53:54 +02:00
Acquire lock when initializing parsers.
This is necessary since they might be initializing or even using static VLC tables. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
This commit is contained in:
parent
25fec8595d
commit
7feef7dbca
@ -23,6 +23,7 @@
|
||||
#include <string.h>
|
||||
|
||||
#include "parser.h"
|
||||
#include "internal.h"
|
||||
#include "libavutil/mem.h"
|
||||
|
||||
static AVCodecParser *av_first_parser = NULL;
|
||||
@ -67,7 +68,10 @@ AVCodecParserContext *av_parser_init(int codec_id)
|
||||
s->fetch_timestamp=1;
|
||||
s->pict_type = AV_PICTURE_TYPE_I;
|
||||
if (parser->parser_init) {
|
||||
if (ff_lock_avcodec(NULL) < 0)
|
||||
goto err_out;
|
||||
ret = parser->parser_init(s);
|
||||
ff_unlock_avcodec();
|
||||
if (ret != 0)
|
||||
goto err_out;
|
||||
}
|
||||
@ -202,8 +206,11 @@ int av_parser_change(AVCodecParserContext *s,
|
||||
void av_parser_close(AVCodecParserContext *s)
|
||||
{
|
||||
if(s){
|
||||
if (s->parser->parser_close)
|
||||
if (s->parser->parser_close) {
|
||||
ff_lock_avcodec(NULL);
|
||||
s->parser->parser_close(s);
|
||||
ff_unlock_avcodec();
|
||||
}
|
||||
av_free(s->priv_data);
|
||||
av_free(s);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user