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)
* commit '89a13998a1b5074411dff5a461dce3837057b0b8':
  svq3: rip out the svq3-relevant parts of pred_motion() out of h264

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

Simple merge