• Michael Niedermayer's avatar
    Merge commit '2b8dd371' · af3fe43d
    Michael Niedermayer authored
    * commit '2b8dd371':
      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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    af3fe43d
atrac3.c 32.1 KB