| Message ID | CAEXO35r04-+WJGN=8N509OeGsZFBBH7=2wT4-JeD8iueLC+44Q@mail.gmail.com |
|---|---|
| State | New |
| Headers | show |
On Sat, Sep 09, 2017 at 11:24:12PM +0700, gh0st wrote: > 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) { This is corrupted by newlines [...]
Hm, I don't understand, what exactly is the problem? It applies fine for me. On Sun, Sep 10, 2017 at 1:27 AM, Michael Niedermayer <michael@niedermayer.cc > wrote: > On Sat, Sep 09, 2017 at 11:24:12PM +0700, gh0st wrote: > > 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) { > > This is corrupted by newlines > > [...] > -- > Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB > > Observe your enemies, for they first find out your faults. -- Antisthenes > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > http://ffmpeg.org/mailman/listinfo/ffmpeg-devel > >
On Sun, Sep 10, 2017 at 01:42:15AM +0700, gh0st wrote: > Hm, I don't understand, what exactly is the problem? It applies fine for me. The patch on the mailing list is corrupted by a newline produced by something in the mail handling, likely on your side. If you take the patch you sent, its very likely fine, the patch once it got throgh all mail handling is not > > On Sun, Sep 10, 2017 at 1:27 AM, Michael Niedermayer <michael@niedermayer.cc > > wrote: > > > On Sat, Sep 09, 2017 at 11:24:12PM +0700, gh0st wrote: > > > 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) { > > > > This is corrupted by newlines > > > > [...] > > -- > > Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB > > > > Observe your enemies, for they first find out your faults. -- Antisthenes > > > > _______________________________________________ > > ffmpeg-devel mailing list > > ffmpeg-devel@ffmpeg.org > > http://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > > > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
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) {}
This also fixes the warning. --- libavcodec/vp9.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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);