[FFmpeg-cvslog] Merge commit 'db5cc75f8b5620e7cd2d05762c3b087ab16d8c24'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Mar  4 01:23:26 2015 +0100| [0d20896775a2a61c4f25338b5ca7c3bdfb20bf95] | committer: Michael Niedermayer

Merge commit 'db5cc75f8b5620e7cd2d05762c3b087ab16d8c24'

* commit 'db5cc75f8b5620e7cd2d05762c3b087ab16d8c24':
  wma.h: #include "avcodec.h"

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

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