[FFmpeg-cvslog] Merge commit '5d1007f74dd496d54b932242004382f44e3b22b4'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Oct 23 12:51:13 2012 +0200| [7bc6631dd0270941d38d44e6190a47509ef1c801] | committer: Michael Niedermayer

Merge commit '5d1007f74dd496d54b932242004382f44e3b22b4'

* commit '5d1007f74dd496d54b932242004382f44e3b22b4':
  atrac3: initialize static tables in AVCodec.init_static_data()
  atrac3: separate window initialization from IMDCT initialization
  atrac3: move the 'frame_factor' field from ATRAC3Context to where it is used
  atrac3: remove unused ATRAC3Context field, bit_rate

Conflicts:
	libavcodec/atrac3.c

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

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