RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-25 00:32:31 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit 'bb428e00ac158244d6691bf135be404e85b66a8b'

Browse Source 
* commit 'bb428e00ac158244d6691bf135be404e85b66a8b':
  hqx: Mark codec as init-thread-safe and init-cleanup

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-04-24 22:00:28 +02:00
commit 8d5088a168
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/hqx.c
View File

@ -521,13 +521,10 @@ static av_cold int hqx_decode_close(AVCodecContext *avctx)
static av_cold int hqx_decode_init(AVCodecContext *avctx) static av_cold int hqx_decode_init(AVCodecContext *avctx)
{ {
HQXContext *ctx = avctx->priv_data; HQXContext *ctx = avctx->priv_data;
int ret = ff_hqx_init_vlcs(ctx);
if (ret < 0)
hqx_decode_close(avctx);
ff_hqxdsp_init(&ctx->hqxdsp); ff_hqxdsp_init(&ctx->hqxdsp);
return ret; return ff_hqx_init_vlcs(ctx);
} }
AVCodec ff_hqx_decoder = { AVCodec ff_hqx_decoder = {
@ -540,4 +537,6 @@ AVCodec ff_hqx_decoder = {
.decode = hqx_decode_frame, .decode = hqx_decode_frame,
.close = hqx_decode_close, .close = hqx_decode_close,
.capabilities = CODEC_CAP_DR1 | CODEC_CAP_SLICE_THREADS, .capabilities = CODEC_CAP_DR1 | CODEC_CAP_SLICE_THREADS,
.caps_internal = FF_CODEC_CAP_INIT_THREADSAFE |
FF_CODEC_CAP_INIT_CLEANUP,
}; };