Merge commit '67bb3a4e285a5871770cbaa2d78bf9024961dd0f'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 8 Jan 2014 04:13:25 +0000 (05:13 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 8 Jan 2014 04:13:25 +0000 (05:13 +0100)
commit9ef7c0c5510fb79c44291cc57c490fbb7f70f998
tree5b99992b83468ac38cd105d920d40f9a42967f92
parent1c010fd035c1a14dc73827b84f21f593e969a5d6
parent67bb3a4e285a5871770cbaa2d78bf9024961dd0f
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>
libavcodec/arm/h264dsp_init_arm.c