Merge commit '01f111bdb21b4ea6d2ff3ea919d70ae9ca451cf9'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Sep 2013 09:09:38 +0000 (11:09 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Sep 2013 09:09:41 +0000 (11:09 +0200)
commitde493809f31a91a57e37c570b538e47647d51b29
tree0fbce2c7f5b9023faa94a625373be23cf14bfd1f
parentf35b2fa8c9b8fea87448bf585020e93198ae47fd
parent01f111bdb21b4ea6d2ff3ea919d70ae9ca451cf9
Merge commit '01f111bdb21b4ea6d2ff3ea919d70ae9ca451cf9'

* commit '01f111bdb21b4ea6d2ff3ea919d70ae9ca451cf9':
  h264dec: K&R formatting cosmetics

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/h264dec.c