[FFmpeg-devel] [PATCH] vp9: fix compilation with threading disabled.

[gh0st]

This also fixes the warning.

---
 libavcodec/vp9.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/vp9.c b/libavcodec/vp9.c
index a71045e..f940d60 100644
--- a/libavcodec/vp9.c
+++ b/libavcodec/vp9.c
@@ -88,7 +88,7 @@ static void vp9_await_tile_progress(VP9Context *s, int
field, int n) {
     pthread_mutex_unlock(&s->progress_mutex);
 }
 #else
-static void vp9_free_entries(VP9Context *s) {}
+static void vp9_free_entries(AVCodecContext *avctx) {}
 static int vp9_alloc_entries(AVCodecContext *avctx, int n) { return 0; }
 static void vp9_report_tile_progress(VP9Context *s, int field, int n) {}
 static void vp9_await_tile_progress(VP9Context *s, int field, int n) {}
@@ -1599,7 +1599,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
             s->td[i].uveob[1] = s->td[i].uveob_base[1];
         }

-        if (avctx->active_thread_type == FF_THREAD_SLICE) {
+        if (HAVE_THREADS && avctx->active_thread_type == FF_THREAD_SLICE) {
             int tile_row, tile_col;

             assert(!pass);
-- 
2.8.3


On Sat, Sep 9, 2017 at 11:13 PM, Ronald S. Bultje <rsbultje at gmail.com>
wrote:

> ---
>  libavcodec/vp9.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/libavcodec/vp9.c b/libavcodec/vp9.c
> index a71045e..499f357 100644
> --- a/libavcodec/vp9.c
> +++ b/libavcodec/vp9.c
> @@ -1599,7 +1599,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
>              s->td[i].uveob[1] = s->td[i].uveob_base[1];
>          }
>
> -        if (avctx->active_thread_type == FF_THREAD_SLICE) {
> +        if (HAVE_THREADS && avctx->active_thread_type == FF_THREAD_SLICE)
> {
>              int tile_row, tile_col;
>
>              assert(!pass);
> --
> 2.8.1
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel at ffmpeg.org
> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>