[FFmpeg-cvslog] Merge commit '34150be515cd9c43b0b679806b8d01774960af78'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Mar  1 12:27:59 2014 +0100| [11146a9b440cd616b3a5ab322cfcca95da2aec7f] | committer: Michael Niedermayer

Merge commit '34150be515cd9c43b0b679806b8d01774960af78'

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

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=11146a9b440cd616b3a5ab322cfcca95da2aec7f
---