[FFmpeg-cvslog] Acquire lock when initializing parsers.
Reimar Döffinger
git at videolan.org
Wed Dec 5 21:01:45 CET 2012
ffmpeg | branch: master | Reimar Döffinger <Reimar.Doeffinger at gmx.de> | Tue Nov 27 21:57:33 2012 +0100| [7feef7dbca5f6a816e04b63c17aad5dacd272f6e] | committer: Reimar Döffinger
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 at gmx.de>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7feef7dbca5f6a816e04b63c17aad5dacd272f6e
---
libavcodec/parser.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/libavcodec/parser.c b/libavcodec/parser.c
index 2e204e2..e2a6f08 100644
--- a/libavcodec/parser.c
+++ b/libavcodec/parser.c
@@ -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);
}
More information about the ffmpeg-cvslog
mailing list