Merge commit '330ad1f6'

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

Merge commit '330ad1f6'
* commit '330ad1f6': h264_ps: K&R formatting cosmetics Conflicts: libavcodec/h264_ps.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
e853cf53 · Michael Niedermayer · 8299ed26 · 330ad1f6 · e853cf53
Commit e853cf53 authored Aug 21, 2013 by Michael Niedermayer
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 337 additions and 319 deletions

h264_ps.c libavcodec/h264_ps.c +337 -319

No files found.
--- a/libavcodec/h264_ps.c
+++ b/libavcodec/h264_ps.c