Merge commit 'b7a4127a45b780d76e6b09427a3d0197c4bc1cdb'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 12 Jun 2015 19:55:24 +0000 (21:55 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 12 Jun 2015 19:55:40 +0000 (21:55 +0200)
* commit 'b7a4127a45b780d76e6b09427a3d0197c4bc1cdb':
  h264_qpel: Use the correct header

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/x86/h264_qpel.c

Simple merge