Merge commit '2b8dd371e4d276ca0d342e82b8b4cc281be0630a'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 23 Oct 2012 11:05:52 +0000 (13:05 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 23 Oct 2012 11:05:52 +0000 (13:05 +0200)
commitaf3fe43d841cb16189a81968dcc589168e92af41
tree7eff21028da5c97039874b95eed27f3a61c90f97
parent7bc6631dd0270941d38d44e6190a47509ef1c801
parent2b8dd371e4d276ca0d342e82b8b4cc281be0630a
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@gmx.at>
doc/APIchanges
ffmpeg_opt.c
libavcodec/atrac3.c
libavutil/version.h