Merge commit '2b379a925162b6783bd9a81dc03e647e8b65494c'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 12 Jul 2013 11:10:53 +0000 (13:10 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 12 Jul 2013 11:10:53 +0000 (13:10 +0200)
commit9d47333e3eee1d9a31a98ebf67338463943846dc
tree4e850a0a6195c3f17e2366e3b760c59fbafe1bbe
parent50617fce073ca3e360388b38a83341e37db92b80
parent2b379a925162b6783bd9a81dc03e647e8b65494c
Merge commit '2b379a925162b6783bd9a81dc03e647e8b65494c'

* commit '2b379a925162b6783bd9a81dc03e647e8b65494c':
  mlpdsp: x86: Respect cpuflags

Conflicts:
libavcodec/x86/mlpdsp.c

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