[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Oct 23 15:12:09 2012 +0200| [4d54ecf4b8e897e993911ff51d53f52de88f29d5] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  fate: check that dependencies actually exist
  fate: fix ENCMUX macro

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

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