-
Michael Niedermayer authored
* commit '330ad1f6': h264_ps: K&R formatting cosmetics Conflicts: libavcodec/h264_ps.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
e853cf53
* commit '330ad1f6': h264_ps: K&R formatting cosmetics Conflicts: libavcodec/h264_ps.c Merged-by: Michael Niedermayer <michaelni@gmx.at>