Merge commit '89a13998a1b5074411dff5a461dce3837057b0b8'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 27 Apr 2016 15:48:20 +0000 (16:48 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 27 Apr 2016 15:48:30 +0000 (16:48 +0100)
commitc0b51aa2d2c66cb52577a287b3b821e89f214514
tree473a1c27cc3232fd8e50bb9972ffe7d87fd55a7a
parentfed686af232487dad6ec46294b3e5018f11943f1
parent89a13998a1b5074411dff5a461dce3837057b0b8
Merge commit '89a13998a1b5074411dff5a461dce3837057b0b8'

* commit '89a13998a1b5074411dff5a461dce3837057b0b8':
  svq3: rip out the svq3-relevant parts of pred_motion() out of h264

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
libavcodec/svq3.c