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)
* 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>
1  2 
configure
libavcodec/x86/mpeg4qpel.asm
library.mak

diff --cc configure
Simple merge
Simple merge
diff --cc library.mak
Simple merge