[FFmpeg-cvslog] hqx: Mark codec as init-thread-safe and init-cleanup

Vittorio Giovara git at videolan.org
Fri Apr 24 22:21:02 CEST 2015


ffmpeg | branch: master | Vittorio Giovara <vittorio.giovara at gmail.com> | Tue Apr  7 00:40:37 2015 +0200| [bb428e00ac158244d6691bf135be404e85b66a8b] | committer: Vittorio Giovara

hqx: Mark codec as init-thread-safe and init-cleanup

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bb428e00ac158244d6691bf135be404e85b66a8b
---

 libavcodec/hqx.c |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/libavcodec/hqx.c b/libavcodec/hqx.c
index de460a5..11b872c 100644
--- a/libavcodec/hqx.c
+++ b/libavcodec/hqx.c
@@ -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,
 };



More information about the ffmpeg-cvslog mailing list