[FFmpeg-cvslog] Merge remote-tracking branch 'cehoyos/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jan 29 03:02:04 2015 +0100| [4155f2d7cc6a6413bbc6c40741e4d07e6612cac5] | committer: Michael Niedermayer

Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Add an ARES atom to extradata when encoding avui.

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

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