Browse code

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>

Michael Niedermayer authored on 2013/02/12 21:26:15
Showing 3 changed files
... ...
@@ -4457,6 +4457,7 @@ get_version(){
4457 4457
     eval ${name}_VERSION=\$${name}_VERSION_MAJOR.\$${name}_VERSION_MINOR.\$${name}_VERSION_MICRO
4458 4458
     eval echo "${lcname}_VERSION=\$${name}_VERSION" >> config.mak
4459 4459
     eval echo "${lcname}_VERSION_MAJOR=\$${name}_VERSION_MAJOR" >> config.mak
4460
+    eval echo "${lcname}_VERSION_MINOR=\$${name}_VERSION_MINOR" >> config.mak
4460 4461
 }
4461 4462
 
4462 4463
 map 'get_version $v' $LIBRARY_LIST
... ...
@@ -102,7 +102,7 @@ PUT_NO_RND_PIXELS8_L2
102 102
 ; put_no_rnd_pixels16_l2(uint8_t *dst, uint8_t *src1, uint8_t *src2, int dstStride, int src1Stride, int h)
103 103
 %macro PUT_NO_RND_PIXELS16_l2 0
104 104
 cglobal put_no_rnd_pixels16_l2, 6,6
105
-    movsxdifnidn r3, r3
105
+    movsxdifnidn r3, r3d
106 106
     movsxdifnidn r4, r4d
107 107
     pcmpeqb      m6, m6
108 108
     test        r5d, 1
... ...
@@ -4,6 +4,7 @@ include $(SRC_PATH)/common.mak
4 4
 
5 5
 LIBVERSION := $(lib$(NAME)_VERSION)
6 6
 LIBMAJOR   := $(lib$(NAME)_VERSION_MAJOR)
7
+LIBMINOR   := $(lib$(NAME)_VERSION_MINOR)
7 8
 INCINSTDIR := $(INCDIR)/lib$(NAME)
8 9
 
9 10
 INSTHEADERS := $(INSTHEADERS) $(HEADERS:%=$(SUBDIR)%)