Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 23 Dec 2012 14:03:15 +0000 (15:03 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 23 Dec 2012 14:03:15 +0000 (15:03 +0100)
commit8e09e183fc5fbddec153e41bb8f9b30eb6e11add
tree15ef362af8657ad573185826617e56a257cc69e3
parentdef18e5470bdcddb9d737784cc6ae427c195da7c
parentb6d7d4efae60845a93be6948ef78482bba1fc291
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  8bps: cosmetics
  aasc: cosmetics, reformat
  ansi: remove an extra return
  asvdec: cosmetics, reformat
  aura: cosmetics, reformat

Conflicts:
libavcodec/aasc.c
libavcodec/asvdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/8bps.c
libavcodec/aasc.c
libavcodec/asvdec.c
libavcodec/aura.c