[FFmpeg-cvslog] Merge commit 'a2664c91fba15a1307f676ffad511f8f86fb3a27'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Oct 23 12:41:02 2012 +0200| [8748472f399604e41fc86bf66526f467b6ad6a23] | committer: Michael Niedermayer

Merge commit 'a2664c91fba15a1307f676ffad511f8f86fb3a27'

* 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 at gmx.at>

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