[FFmpeg-cvslog] Merge commit '330ad1f6a53a37dec228cb424ca57e1268fafc64'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Aug 21 12:56:37 2013 +0200| [e853cf53256f847fc1b8436a4bef060177a01bb2] | committer: Michael Niedermayer

Merge commit '330ad1f6a53a37dec228cb424ca57e1268fafc64'

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

Conflicts:
	libavcodec/h264_ps.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e853cf53256f847fc1b8436a4bef060177a01bb2
---