Merge commit '6fd91fa11909f27902498648680dbb3d13f1f175'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 8 Dec 2014 20:38:07 +0000 (21:38 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 8 Dec 2014 20:48:36 +0000 (21:48 +0100)
commit74622ad320bbd3e01674224e67b59b09f22c38d6
tree487b1592231c4e80459bb3058657c2de89606342
parent6b4cbfec757a1a3be48bc08489afc47b9cd18a0e
parent6fd91fa11909f27902498648680dbb3d13f1f175
Merge commit '6fd91fa11909f27902498648680dbb3d13f1f175'

* commit '6fd91fa11909f27902498648680dbb3d13f1f175':
  h264: increase MAX_SLICES to 32

The available sample decodes correctly before, but the reporter of the bug
claims that this change reduces artifacts. This is thus merged
If someone has samples that decode differently depending in the MAX_SLICES
value, please open a ticket on trac.
Also this change should be reverted if it turns out that the artifacts
that where seen had a different cause

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/h264.h