Merge commit '0a36988e48dd581d29e77f768f987738bdf365f0'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 1 Mar 2014 04:11:37 +0000 (05:11 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 1 Mar 2014 04:11:37 +0000 (05:11 +0100)
commitc4c2b2ea5c0a1879f512c2023956d7322edc98d3
tree8967a82887bfff277faf03560514f78fe81bc780
parent5aab33dea38ee262d6345e8348a184609a2ee46e
parent0a36988e48dd581d29e77f768f987738bdf365f0
Merge commit '0a36988e48dd581d29e77f768f987738bdf365f0'

* commit '0a36988e48dd581d29e77f768f987738bdf365f0':
  build: Let AMV decoder depend on the SP5X decoder

Conflicts:
configure
libavcodec/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
configure
libavcodec/Makefile