Merge remote-tracking branch 'cehoyos/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 29 Jan 2015 02:02:04 +0000 (03:02 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 29 Jan 2015 02:02:09 +0000 (03:02 +0100)
* cehoyos/master:
  Add an ARES atom to extradata when encoding avui.

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

Trivial merge