Merge commit 'e0652795292223f8bc8e5bac019c1fca7323d23c'
authorClément Bœsch <clement@stupeflix.com>
Tue, 21 Jun 2016 08:19:13 +0000 (10:19 +0200)
committerClément Bœsch <clement@stupeflix.com>
Tue, 21 Jun 2016 08:24:31 +0000 (10:24 +0200)
commit04aefe205b285a07646c99a834dcea04cd8a0110
tree103065a3a63d6d79b63dee300919aca52d9f9f46
parent26cfafa52dfb2f3d6236799094d1bc3d30defadd
parente0652795292223f8bc8e5bac019c1fca7323d23c
Merge commit 'e0652795292223f8bc8e5bac019c1fca7323d23c'

* commit 'e0652795292223f8bc8e5bac019c1fca7323d23c':
  h264: remove an artificial restriction on the number of slice threads

Tested with multiple runs of fate-h264 THREADS=50 THREAD_TYPE=slice

Merged-by: Clément Bœsch <clement@stupeflix.com>
libavcodec/h264.c
libavcodec/h264.h
libavcodec/h264_slice.c