Merge commit 'fae6fd5b873911cfcd7f7b3d72de6598af5e003a'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 20 Feb 2013 10:50:01 +0000 (11:50 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 20 Feb 2013 10:50:12 +0000 (11:50 +0100)
commit8c6d9ca6387f25f2dfc47e18cc1def87d733586f
treedb1a9979f8299eccba7b45e5e1e4b6e5bf16a415
parent98f63e1f34b34e97aa41c94e948c5fc869684287
parentfae6fd5b873911cfcd7f7b3d72de6598af5e003a
Merge commit 'fae6fd5b873911cfcd7f7b3d72de6598af5e003a'

* commit 'fae6fd5b873911cfcd7f7b3d72de6598af5e003a':
  h264/svq3: Stop using draw_edges

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