OSDN Git Service

hqx: Mark codec as init-thread-safe and init-cleanup
authorVittorio Giovara <vittorio.giovara@gmail.com>
Mon, 6 Apr 2015 22:40:37 +0000 (00:40 +0200)
committerVittorio Giovara <vittorio.giovara@gmail.com>
Fri, 24 Apr 2015 13:55:11 +0000 (14:55 +0100)
libavcodec/hqx.c

index de460a5..11b872c 100644 (file)
@@ -523,13 +523,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 = {
@@ -542,4 +539,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,
 };