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)
commit63b0356274bc496c486cbedcb563302c36996024
tree81419036f6b3f3736fd712305227ad4bd6ec571d
parentb68b5ec5136da66088b5a8f772c3775b79196eb4
parentb7a4127a45b780d76e6b09427a3d0197c4bc1cdb
Merge commit 'b7a4127a45b780d76e6b09427a3d0197c4bc1cdb'

* commit 'b7a4127a45b780d76e6b09427a3d0197c4bc1cdb':
  h264_qpel: Use the correct header

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