ffmpeg | branch: master | Carl Eugen Hoyos <ceho...@ag.or.at> | Tue Sep 8 10:16:34 2015 +0200| [84c9bf62b42c5505ada727817954a0a41463ccac] | committer: Carl Eugen Hoyos
lavc/dxv: Silence "Multiple ff_thread_finish_setup() calls" warnings. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=84c9bf62b42c5505ada727817954a0a41463ccac --- libavcodec/dxv.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/dxv.c b/libavcodec/dxv.c index b0e252b..69bd2a1 100644 --- a/libavcodec/dxv.c +++ b/libavcodec/dxv.c @@ -397,7 +397,8 @@ static int dxv_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); /* Now decompress the texture with the standard functions. */ avctx->execute2(avctx, decompress_texture_thread, _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
