Michael Niedermayer af3fe43d84 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>
2012-10-23 13:05:52 +02:00
..
2012-10-08 11:22:42 +02:00
2012-10-15 11:24:08 -06:00
2012-01-28 11:04:19 +01:00
2012-05-22 00:39:53 +02:00
2012-10-22 10:46:43 +02:00
2012-10-22 23:22:39 +00:00
2012-10-02 09:43:27 +02:00