Merge commit '256ef198'
* commit '256ef198': h264: arm: use intra pred8x8 functions only for chroma_format_idc <= 1 Conflicts: libavcodec/arm/h264pred_init_arm.c See: 565cabf5Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Showing
Please
register
or
sign in
to comment