Merge commit '6d8629aa'

* commit '6d8629aa': aac: K&R formatting cosmetics Conflicts: libavcodec/aacdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '6d8629aa'
* commit '6d8629aa': aac: K&R formatting cosmetics Conflicts: libavcodec/aacdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
1bcfb1ee · Michael Niedermayer · ef906390 · 6d8629aa · 1bcfb1ee
Commit 1bcfb1ee authored Jun 28, 2013 by Michael Niedermayer
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 173 additions and 95 deletions

aacdec.c libavcodec/aacdec.c +173 -95

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