diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2015-06-30 14:34:56 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2015-06-30 14:34:56 +0200 |
| commit | 8080688d0e3d771bb2930457cd64c0f01591e59b (patch) | |
| tree | fbd3eb264ba533848a2ffd2b5631be1e15277f3f /libavcodec/hapdec.c | |
| parent | 5c047f3ad49c8a8a5ae126d134b1004a4dcbc39b (diff) | |
| download | ffmpeg-8080688d0e3d771bb2930457cd64c0f01591e59b.tar.gz | |
lavc/hapenc: Silence a warning for multithreaded encoding.
Diffstat (limited to 'libavcodec/hapdec.c')
| -rw-r--r-- | libavcodec/hapdec.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/hapdec.c b/libavcodec/hapdec.c index 6e3c138199..e6b7d61b92 100644 --- a/libavcodec/hapdec.c +++ b/libavcodec/hapdec.c @@ -177,7 +177,8 @@ static int hap_decode(AVCodecContext *avctx, void *data, ret = ff_thread_get_buffer(avctx, &tframe, 0); if (ret < 0) return ret; - ff_thread_finish_setup(avctx); + if (avctx->codec->update_thread_context) + ff_thread_finish_setup(avctx); /* Use the decompress function on the texture, one block per thread */ avctx->execute2(avctx, decompress_texture_thread, tframe.f, NULL, blocks); |