diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-24 22:00:28 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-24 22:00:35 +0200 |
| commit | 8d5088a168d13cfb8f21ee8de0dc8477982ea7d6 (patch) | |
| tree | ecdeb4439e814f156e33b038568346fd0ca8d69e /libavcodec/hqx.c | |
| parent | f2978aa7ed0faa768fc438b55a45c2e007124ffe (diff) | |
| parent | bb428e00ac158244d6691bf135be404e85b66a8b (diff) | |
| download | ffmpeg-8d5088a168d13cfb8f21ee8de0dc8477982ea7d6.tar.gz | |
Merge commit 'bb428e00ac158244d6691bf135be404e85b66a8b'
* commit 'bb428e00ac158244d6691bf135be404e85b66a8b':
hqx: Mark codec as init-thread-safe and init-cleanup
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/hqx.c')
| -rw-r--r-- | libavcodec/hqx.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libavcodec/hqx.c b/libavcodec/hqx.c index 9d3b1150d0..44016ac34a 100644 --- a/libavcodec/hqx.c +++ b/libavcodec/hqx.c @@ -521,13 +521,10 @@ static av_cold int hqx_decode_close(AVCodecContext *avctx) static av_cold int hqx_decode_init(AVCodecContext *avctx) { HQXContext *ctx = avctx->priv_data; - int ret = ff_hqx_init_vlcs(ctx); - if (ret < 0) - hqx_decode_close(avctx); ff_hqxdsp_init(&ctx->hqxdsp); - return ret; + return ff_hqx_init_vlcs(ctx); } AVCodec ff_hqx_decoder = { @@ -540,4 +537,6 @@ AVCodec ff_hqx_decoder = { .decode = hqx_decode_frame, .close = hqx_decode_close, .capabilities = CODEC_CAP_DR1 | CODEC_CAP_SLICE_THREADS, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | + FF_CODEC_CAP_INIT_CLEANUP, }; |