Merge remote-tracking branch 'cehoyos/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 6 May 2015 23:59:18 +0000 (01:59 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 6 May 2015 23:59:22 +0000 (01:59 +0200)
* cehoyos/master:
  lavf/img2dec: Autodetect qdraw images.
  lavc/qdrw: Also support real-world qdraw images.

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

Trivial merge