[FFmpeg-cvslog] Merge commit '2b8dd371e4d276ca0d342e82b8b4cc281be0630a'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Oct 23 13:05:52 2012 +0200| [af3fe43d841cb16189a81968dcc589168e92af41] | committer: Michael Niedermayer

Merge commit '2b8dd371e4d276ca0d342e82b8b4cc281be0630a'

* commit '2b8dd371e4d276ca0d342e82b8b4cc281be0630a':
  lavu: postpone recent deprecations until the next major bump
  APIchanges: update lavr bump date
  avconv: only apply presets when we have an encoder.
  atrac3: replace a calculation with FFALIGN()
  atrac3: remove unused ATRAC3Context field, sample_rate
  atrac3: use sizeof(variable) instead of sizeof(type)
  atrac3: simplify MDCT window calculation

Conflicts:
	doc/APIchanges

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

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