* commit '256ef19844892c6cf8e0386e3287bae970ec6320': h264: arm: use intra pred8x8 functions only for chroma_format_idc <= 1 Conflicts: libavcodec/arm/h264pred_init_arm.c See: 565cabf5c8 Merged-by: Michael Niedermayer <michael@niedermayer.cc>
565cabf5c8