Merge commit '304b806cb524fb040f8e09a241040f1af2cb820b'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 12 Feb 2013 12:26:15 +0000 (13:26 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 12 Feb 2013 12:26:22 +0000 (13:26 +0100)
commit7491356111e7f171b6cd4f23a8d8fb32439485ca
tree7d38acb2667947c92c7ddb5873c1d6f922656e37
parentfe54f6cb453c030f9aae2a703bf1e1e00caeb041
parent304b806cb524fb040f8e09a241040f1af2cb820b
Merge commit '304b806cb524fb040f8e09a241040f1af2cb820b'

* commit '304b806cb524fb040f8e09a241040f1af2cb820b':
  build: Make library minor version visible in the Makefile
  x86: mpeg4qpel: Make movsxifnidn do the right thing

Merged-by: Michael Niedermayer <michaelni@gmx.at>
configure
libavcodec/x86/mpeg4qpel.asm
library.mak