Merge commit '256ef19844892c6cf8e0386e3287bae970ec6320'
authorMichael Niedermayer <michael@niedermayer.cc>
Sat, 18 Jul 2015 00:12:27 +0000 (02:12 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Sat, 18 Jul 2015 00:13:22 +0000 (02:13 +0200)
commitc0894e62881480f2fdedc95a41101f1add03d419
treee910ff5d2e17e95f5a054fe0f1ec011391f76b73
parentb1861f18b6e384f3b5cd071f49b43a2b2e8607e1
parent256ef19844892c6cf8e0386e3287bae970ec6320
Merge commit '256ef19844892c6cf8e0386e3287bae970ec6320'

* commit '256ef19844892c6cf8e0386e3287bae970ec6320':
  h264: arm: use intra pred8x8 functions only for chroma_format_idc <= 1

Conflicts:
libavcodec/arm/h264pred_init_arm.c

See: 565cabf5c80b25d86c2e539afcb3b24024fbce0a
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/arm/h264pred_init_arm.c