Merge commit '64a2e844166d62093b45e680874eea8bd1facf5b'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 12 Jun 2015 19:42:36 +0000 (21:42 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 12 Jun 2015 19:42:50 +0000 (21:42 +0200)
* commit '64a2e844166d62093b45e680874eea8bd1facf5b':
  eamad: Use the correct headers

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

Simple merge