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)
commit0d20896775a2a61c4f25338b5ca7c3bdfb20bf95
tree0f5bf0dc85f932d04d5b9f1f5373fadee44f0b21
parentb4fbad2634c4f9d094dbe000c794fa277ecd678e
parentdb5cc75f8b5620e7cd2d05762c3b087ab16d8c24
Merge commit 'db5cc75f8b5620e7cd2d05762c3b087ab16d8c24'

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

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