[FFmpeg-cvslog] lavc/hapenc: Silence a warning for multithreaded encoding.
Carl Eugen Hoyos
git at videolan.org
Tue Jun 30 15:09:00 CEST 2015
ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Tue Jun 30 14:34:56 2015 +0200| [8080688d0e3d771bb2930457cd64c0f01591e59b] | committer: Carl Eugen Hoyos
lavc/hapenc: Silence a warning for multithreaded encoding.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8080688d0e3d771bb2930457cd64c0f01591e59b
---
libavcodec/hapdec.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/libavcodec/hapdec.c b/libavcodec/hapdec.c
index 6e3c138..e6b7d61 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);
More information about the ffmpeg-cvslog
mailing list