Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 26 Aug 2013 12:53:10 +0000 (14:53 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 26 Aug 2013 12:53:15 +0000 (14:53 +0200)
commit09ea5048a9afcb3478fa310bfdc5636222eaf1c7
treedd503e8183e9ded483426e5602fe662be9f7ba87
parent6063f012f2f1c5c54ad518330d1d8cceba68d855
parent4eb4bb3a022a4126f5f749ad971f644467c0369e
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  imc: support mode 1

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/imc.c