Merge commit 'a2664c91fba15a1307f676ffad511f8f86fb3a27'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 23 Oct 2012 10:41:02 +0000 (12:41 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 23 Oct 2012 10:41:08 +0000 (12:41 +0200)
* commit 'a2664c91fba15a1307f676ffad511f8f86fb3a27':
  atrac3: move the 'samples_per_frame' field from ATRAC3Context to where it is used
  atrac3: remove unused ATRAC3Context field, samples_per_channel
  atrac3: use AVCodecContext.block_align instead of keeping a private copy
  atrac3: move the 'delay' field from ATRAC3Context to where it is used
  atrac3: move the 'version' field from ATRAC3Context to where it is used

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/atrac3.c

Simple merge