Merge commit '330ad1f6a53a37dec228cb424ca57e1268fafc64'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 21 Aug 2013 10:56:37 +0000 (12:56 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 21 Aug 2013 10:56:37 +0000 (12:56 +0200)
commite853cf53256f847fc1b8436a4bef060177a01bb2
tree580de29c0c28427ce3c53b3b26800fc6f01cc76f
parent8299ed261a950a7b114f07b37ba45bf0b539345b
parent330ad1f6a53a37dec228cb424ca57e1268fafc64
Merge commit '330ad1f6a53a37dec228cb424ca57e1268fafc64'

* commit '330ad1f6a53a37dec228cb424ca57e1268fafc64':
  h264_ps: K&R formatting cosmetics

Conflicts:
libavcodec/h264_ps.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/h264_ps.c