git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5c047f3
)
lavc/hapenc: Silence a warning for multithreaded encoding.
author
Carl Eugen Hoyos
<cehoyos@ag.or.at>
Tue, 30 Jun 2015 12:34:56 +0000
(14:34 +0200)
committer
Carl Eugen Hoyos
<cehoyos@ag.or.at>
Tue, 30 Jun 2015 12:34:56 +0000
(14:34 +0200)
libavcodec/hapdec.c
patch
|
blob
|
history
diff --git
a/libavcodec/hapdec.c
b/libavcodec/hapdec.c
index
6e3c138
..
e6b7d61
100644
(file)
--- 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);