Merge commit '49fe280753e0f167ac3d9f227f0c0f7744501fc1'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 15 Feb 2013 11:18:37 +0000 (12:18 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 15 Feb 2013 11:18:42 +0000 (12:18 +0100)
commit048ecbd3f83362573231add2841084d3f56d37ba
treeaae49aa4351e2c5211a2918632cab3e93d77928a
parent61fbb4cd57d7bd280c6645df98acdacfe6004a88
parent49fe280753e0f167ac3d9f227f0c0f7744501fc1
Merge commit '49fe280753e0f167ac3d9f227f0c0f7744501fc1'

* commit '49fe280753e0f167ac3d9f227f0c0f7744501fc1':
  h264idct: Replace duplicate scan8 table by appropriate #include

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