Merge commit 'bb2cb0a66d86ec4ad9f43a488e8b6ab894c22d2f'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 6 May 2015 18:32:52 +0000 (20:32 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 6 May 2015 18:32:52 +0000 (20:32 +0200)
commit251f9dcf225b2aac2181da3d7e05413483e1be74
tree34271fc1c5d1ce1f88190d05c38ba6d073e1bade
parentd423fc12e6e11f5d7792f8fd916fb10133862360
parentbb2cb0a66d86ec4ad9f43a488e8b6ab894c22d2f
Merge commit 'bb2cb0a66d86ec4ad9f43a488e8b6ab894c22d2f'

* commit 'bb2cb0a66d86ec4ad9f43a488e8b6ab894c22d2f':
  quickdraw: Switch to greedy parsing

Conflicts:
libavcodec/qdrw.c

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