Merge commit 'd00f1e0fc10bb945cdf140a6c320eb0c9cd25162'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 6 May 2015 18:23:54 +0000 (20:23 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 6 May 2015 18:23:54 +0000 (20:23 +0200)
commitd423fc12e6e11f5d7792f8fd916fb10133862360
tree0b7f5ffa952fd1cfd69ea058c1b7dc89d6b8826f
parent958ddef46c222b080988700c3526cb165d23ed62
parentd00f1e0fc10bb945cdf140a6c320eb0c9cd25162
Merge commit 'd00f1e0fc10bb945cdf140a6c320eb0c9cd25162'

* commit 'd00f1e0fc10bb945cdf140a6c320eb0c9cd25162':
  quickdraw: Convert to bytestream2

Conflicts:
libavcodec/qdrw.c

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