Merge commit '34150be515cd9c43b0b679806b8d01774960af78'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 1 Mar 2014 11:27:59 +0000 (12:27 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 1 Mar 2014 11:27:59 +0000 (12:27 +0100)
commit11146a9b440cd616b3a5ab322cfcca95da2aec7f
tree4114e81850eb9dbcb2683f9de05e4b0e6d82cf5e
parentad48c9374e13ecdf1399c44e9ea443a77232168a
parent34150be515cd9c43b0b679806b8d01774960af78
Merge commit '34150be515cd9c43b0b679806b8d01774960af78'

* commit '34150be515cd9c43b0b679806b8d01774960af78':
  build: Let the iac decoder depend on the imc decoder

Conflicts:
configure

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