[FFmpeg-cvslog] Merge commit 'bbb64356cca65d7a2a33f59b2267ee58f28a061a'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Mar 13 21:40:41 2014 +0100| [cbfc9046e1c7e295b74f252902ae6f255eef4e78] | committer: Michael Niedermayer

Merge commit 'bbb64356cca65d7a2a33f59b2267ee58f28a061a'

* commit 'bbb64356cca65d7a2a33f59b2267ee58f28a061a':
  build: Record dependency of eatqi decoder on dsputil

Conflicts:
	configure

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

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