Merge commit '7df9e693a34c84c698da60426c78140c950f95ed'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 3 Sep 2013 13:05:00 +0000 (15:05 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 3 Sep 2013 13:05:18 +0000 (15:05 +0200)
commit4cfe3b7405431060900d8a05402c2f14ec99f034
tree3049db3ef9739aacbc69554cc17ccf309591b5be
parent50fd98b7ac4c410f4413d382eecb415011b37920
parent7df9e693a34c84c698da60426c78140c950f95ed
Merge commit '7df9e693a34c84c698da60426c78140c950f95ed'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 files changed:
Changelog
doc/general.texi
libavcodec/atrac.c
libavcodec/atrac.h
libavcodec/atrac1.c
libavcodec/atrac1data.h
libavcodec/atrac3.c
libavcodec/atrac3data.h
libavcodec/codec_desc.c
libavformat/omadec.c
libavformat/rmdec.c
libavformat/spdif.h