[FFmpeg-cvslog] Merge commit '7df9e693a34c84c698da60426c78140c950f95ed'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Sep  3 15:05:00 2013 +0200| [4cfe3b7405431060900d8a05402c2f14ec99f034] | committer: Michael Niedermayer

Merge commit '7df9e693a34c84c698da60426c78140c950f95ed'

* commit '7df9e693a34c84c698da60426c78140c950f95ed':
  cosmetics: Fix ATRAC codec name spelling

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4cfe3b7405431060900d8a05402c2f14ec99f034
---