Merge commit 'db5cc75f8b5620e7cd2d05762c3b087ab16d8c24'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 4 Mar 2015 00:23:26 +0000 (01:23 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 4 Mar 2015 00:23:54 +0000 (01:23 +0100)
* commit 'db5cc75f8b5620e7cd2d05762c3b087ab16d8c24':
  wma.h: #include "avcodec.h"

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/wma.h

Simple merge