RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use err_out label for error-case cleanup. 

Will simplify future changes (introducing proper
locking around opening/closing parsers).

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
This commit is contained in:
Reimar Döffinger 2012-11-27 21:10:12 +01:00
parent 8aa29f063c
commit 92947c6d72
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
libavcodec/parser.c
View File

@ -40,7 +40,7 @@ void av_register_codec_parser(AVCodecParser *parser)
AVCodecParserContext *av_parser_init(int codec_id) AVCodecParserContext *av_parser_init(int codec_id)
{ {
AVCodecParserContext *s; AVCodecParserContext *s = NULL;
AVCodecParser *parser; AVCodecParser *parser;
int ret; int ret;
@ -59,22 +59,17 @@ AVCodecParserContext *av_parser_init(int codec_id)
found: found:
s = av_mallocz(sizeof(AVCodecParserContext)); s = av_mallocz(sizeof(AVCodecParserContext));
if (!s) if (!s)
return NULL; goto err_out;
s->parser = parser; s->parser = parser;
s->priv_data = av_mallocz(parser->priv_data_size); s->priv_data = av_mallocz(parser->priv_data_size);
if (!s->priv_data) { if (!s->priv_data)
av_free(s); goto err_out;
return NULL;
}
s->fetch_timestamp=1; s->fetch_timestamp=1;
s->pict_type = AV_PICTURE_TYPE_I; s->pict_type = AV_PICTURE_TYPE_I;
if (parser->parser_init) { if (parser->parser_init) {
ret = parser->parser_init(s); ret = parser->parser_init(s);
if (ret != 0) { if (ret != 0)
av_free(s->priv_data); goto err_out;
av_free(s);
return NULL;
}
} }
s->key_frame = -1; s->key_frame = -1;
s->convergence_duration = 0; s->convergence_duration = 0;
@ -82,6 +77,12 @@ AVCodecParserContext *av_parser_init(int codec_id)
s->dts_ref_dts_delta = INT_MIN; s->dts_ref_dts_delta = INT_MIN;
s->pts_dts_delta = INT_MIN; s->pts_dts_delta = INT_MIN;
return s; return s;
err_out:
if (s)
av_freep(&s->priv_data);
av_free(s);
return NULL;
} }
void ff_fetch_timestamp(AVCodecParserContext *s, int off, int remove){ void ff_fetch_timestamp(AVCodecParserContext *s, int off, int remove){