Merge commit '503dda7d4f5b4d76eed0239e9da66993a182b009'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Mar 2014 23:18:38 +0000 (00:18 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Mar 2014 23:18:38 +0000 (00:18 +0100)
commitdb94b144e95f540e6fc1f010fe229d1c32ba0aa8
tree7c0d65529e82b271373b0c32cf6fb010bc03b7be
parent153557dfcb10eeebfb82b6b5b679a53e2df98bee
parent503dda7d4f5b4d76eed0239e9da66993a182b009
Merge commit '503dda7d4f5b4d76eed0239e9da66993a182b009'

* commit '503dda7d4f5b4d76eed0239e9da66993a182b009':
  dsputil.h: K&R formatting cosmetics

Conflicts:
libavcodec/dsputil.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/dsputil.h