[FFmpeg-cvslog] Merge commit '516089d5d86b6809a9458f9cf171f2bc9a8e2a25'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Apr 22 12:40:56 2013 +0200| [51286aaffcad24c1ee134bbcea5202e7e5950cc8] | committer: Michael Niedermayer

Merge commit '516089d5d86b6809a9458f9cf171f2bc9a8e2a25'

* commit '516089d5d86b6809a9458f9cf171f2bc9a8e2a25':
  riff: Add ACTRAC3+ guid

No change, this commit was in ffmpeg already with this formating

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

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