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)
commit5f2b4a2f6a13aaa1139cadd70ae7652545eb9615
treee2b1b3120bb8e5b995408aacc0b932c959d8c9a7
parentbc6f84fff74131e869b72a10ac2efe8b745779a4
parent2279de6eca1294082a307feb211b217781da8045
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  lavf/img2dec: Autodetect qdraw images.
  lavc/qdrw: Also support real-world qdraw images.

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