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)
* commit '7df9e693a34c84c698da60426c78140c950f95ed':
  cosmetics: Fix ATRAC codec name spelling

Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 files changed:
1  2 
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

diff --cc Changelog
Simple merge
@@@ -822,15 -719,12 +822,15 @@@ following image formats are supported
      @tab encoding supported through external library libopencore-amrnb
  @item AMR-WB                 @tab  E  @tab  X
      @tab encoding supported through external library libvo-amrwbenc
 +@item Amazing Studio PAF Audio @tab     @tab  X
  @item Apple lossless audio   @tab  X  @tab  X
      @tab QuickTime fourcc 'alac'
- @item Atrac 1                @tab     @tab  X
- @item Atrac 3                @tab     @tab  X
+ @item ATRAC1                 @tab     @tab  X
+ @item ATRAC3                 @tab     @tab  X
  @item Bink Audio             @tab     @tab  X
      @tab Used in Bink and Smacker files in many games.
 +@item CELT                   @tab     @tab  E
 +    @tab decoding supported through external library libcelt
  @item Delphine Software International CIN audio  @tab     @tab  X
      @tab Codec used in Delphine Software International games.
  @item Discworld II BMV Audio @tab     @tab  X
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge