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>

diff --cc libavcodec/h264.h
index b94f06b,047937a..8af991b
--- 1/libavcodec/h264.h
--- 2/libavcodec/h264.h
+++ b/libavcodec/h264.h
@@@ -66,13 -63,13 +66,13 @@@
   * 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
 -#define MB_FIELD(h)    h->mb_field_decoding_flag
 -#define FRAME_MBAFF(h) h->mb_aff_frame
 -#define FIELD_PICTURE(h) (h->picture_structure != PICT_FRAME)
 +#define MB_MBAFF(h)    (h)->mb_mbaff
 +#define MB_FIELD(h)    (h)->mb_field_decoding_flag
 +#define FRAME_MBAFF(h) (h)->mb_aff_frame
 +#define FIELD_PICTURE(h) ((h)->picture_structure != PICT_FRAME)
  #define LEFT_MBS 2
  #define LTOP     0
  #define LBOT     1