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)
commit85d0df0c3090b99014d4e542a9476dcd8c52937d
tree53f5e2f811c79611a0978933868ccb4a1c8f8095
parentd52c5e9d75e92dfb2a304d523567e201f2393047
parent64a2e844166d62093b45e680874eea8bd1facf5b
Merge commit '64a2e844166d62093b45e680874eea8bd1facf5b'

* commit '64a2e844166d62093b45e680874eea8bd1facf5b':
  eamad: Use the correct headers

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