Merge commit '10aa44aa675e05067845e3e55fac37642cbbdae4'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 28 Jul 2013 11:05:35 +0000 (13:05 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 28 Jul 2013 11:06:38 +0000 (13:06 +0200)
commitd781220991135811c6b0803cb7d02675c3e1e50a
treecff87d41ceef21d99a20a79e193e782faad949ef
parent1ecf380223b03cb7864dcfca7e4ab49638e17bd9
parent10aa44aa675e05067845e3e55fac37642cbbdae4
Merge commit '10aa44aa675e05067845e3e55fac37642cbbdae4'

* commit '10aa44aa675e05067845e3e55fac37642cbbdae4':
  avidec: K&R formatting cosmetics

Conflicts:
libavformat/avidec.c

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