Merge commit 'c2597c5a0a08526493abb9bc9544b61a290fe20f'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 13 Mar 2013 12:28:29 +0000 (13:28 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 13 Mar 2013 12:28:29 +0000 (13:28 +0100)
commit87d263a122f6212c236531f8586598605ecab87c
tree32b87745ae8461d61561abbcdf6c83c5e27d6c70
parent6c3e4e391dc881233e0cb96311da5a48a85a0eaf
parentc2597c5a0a08526493abb9bc9544b61a290fe20f
Merge commit 'c2597c5a0a08526493abb9bc9544b61a290fe20f'

* commit 'c2597c5a0a08526493abb9bc9544b61a290fe20f':
  h264_refs: cosmetics, reformat

Conflicts:
libavcodec/h264_refs.c

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