mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit '67bb3a4e285a5871770cbaa2d78bf9024961dd0f'
* commit '67bb3a4e285a5871770cbaa2d78bf9024961dd0f': arm: cosmetics: Reindent the h264dsp neon init function Conflicts: libavcodec/arm/h264dsp_init_arm.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
9ef7c0c551