Merge commit 'f713411d4cfbd9c467aeda77b16ca6bc4db55d10'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 29 Jan 2013 12:57:57 +0000 (13:57 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 29 Jan 2013 12:57:57 +0000 (13:57 +0100)
commitf02033b98b7545dad2e123a939ac7dceb1ce2f7a
treeebdd92421e55fdf3d3010b25c7d69b7e4f7f75fa
parent14aa358c20c222b991c56d13b4da536dc84763d3
parentf713411d4cfbd9c467aeda77b16ca6bc4db55d10
Merge commit 'f713411d4cfbd9c467aeda77b16ca6bc4db55d10'

* commit 'f713411d4cfbd9c467aeda77b16ca6bc4db55d10':
  mdec: cosmetics, reformat

Conflicts:
libavcodec/mdec.c

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