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

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Aug 26 14:53:10 2013 +0200| [09ea5048a9afcb3478fa310bfdc5636222eaf1c7] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  imc: support mode 1

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

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