Merge commit '2c10e2a2f62477efaef5b641974594f7df4ca339'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 25 Jan 2013 13:14:21 +0000 (14:14 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 25 Jan 2013 13:14:21 +0000 (14:14 +0100)
* commit '2c10e2a2f62477efaef5b641974594f7df4ca339':
  build: Make the H.264 parser select h264qpel
  x86: h264qpel: add cpu flag checks for init function

Conflicts:
libavcodec/x86/h264_qpel.c

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

diff --cc configure
Simple merge
Simple merge