aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-12-08 21:38:07 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-12-08 21:48:36 +0100
commit74622ad320bbd3e01674224e67b59b09f22c38d6 (patch)
tree487b1592231c4e80459bb3058657c2de89606342
parent6b4cbfec757a1a3be48bc08489afc47b9cd18a0e (diff)
parent6fd91fa11909f27902498648680dbb3d13f1f175 (diff)
downloadffmpeg-74622ad320bbd3e01674224e67b59b09f22c38d6.tar.gz
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>
-rw-r--r--libavcodec/h264.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h
index b94f06b6d1..8af991b4c7 100644
--- a/libavcodec/h264.h
+++ b/libavcodec/h264.h
@@ -66,7 +66,7 @@
* The maximum number of slices supported by the decoder.
* must be a power of 2
*/
-#define MAX_SLICES 16
+#define MAX_SLICES 32
#ifdef ALLOW_INTERLACE
#define MB_MBAFF(h) (h)->mb_mbaff