| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-12 12:26:15 (GMT) |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-12 12:26:22 (GMT) |
| commit | 7491356111e7f171b6cd4f23a8d8fb32439485ca (patch) | |
| tree | 7d38acb2667947c92c7ddb5873c1d6f922656e37 | |
| parent | fe54f6cb453c030f9aae2a703bf1e1e00caeb041 (diff) | |
| parent | 304b806cb524fb040f8e09a241040f1af2cb820b (diff) | |
| download | ffmpeg-7491356111e7f171b6cd4f23a8d8fb32439485ca.zip ffmpeg-7491356111e7f171b6cd4f23a8d8fb32439485ca.tar.gz ffmpeg-7491356111e7f171b6cd4f23a8d8fb32439485ca.tar.bz2 | |
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>
| -rwxr-xr-x | configure | 1 | ||||
| -rw-r--r-- | libavcodec/x86/mpeg4qpel.asm | 2 | ||||
| -rw-r--r-- | library.mak | 1 |
3 files changed, 3 insertions, 1 deletions
@@ -4457,6 +4457,7 @@ get_version(){ eval ${name}_VERSION=\$${name}_VERSION_MAJOR.\$${name}_VERSION_MINOR.\$${name}_VERSION_MICRO eval echo "${lcname}_VERSION=\$${name}_VERSION" >> config.mak eval echo "${lcname}_VERSION_MAJOR=\$${name}_VERSION_MAJOR" >> config.mak + eval echo "${lcname}_VERSION_MINOR=\$${name}_VERSION_MINOR" >> config.mak } map 'get_version $v' $LIBRARY_LIST diff --git a/libavcodec/x86/mpeg4qpel.asm b/libavcodec/x86/mpeg4qpel.asm index afbdf35..ca52375 100644 --- a/libavcodec/x86/mpeg4qpel.asm +++ b/libavcodec/x86/mpeg4qpel.asm @@ -102,7 +102,7 @@ PUT_NO_RND_PIXELS8_L2 ; put_no_rnd_pixels16_l2(uint8_t *dst, uint8_t *src1, uint8_t *src2, int dstStride, int src1Stride, int h) %macro PUT_NO_RND_PIXELS16_l2 0 cglobal put_no_rnd_pixels16_l2, 6,6 - movsxdifnidn r3, r3 + movsxdifnidn r3, r3d movsxdifnidn r4, r4d pcmpeqb m6, m6 test r5d, 1 diff --git a/library.mak b/library.mak index 273b3d6..9e931f3 100644 --- a/library.mak +++ b/library.mak @@ -4,6 +4,7 @@ include $(SRC_PATH)/common.mak LIBVERSION := $(lib$(NAME)_VERSION) LIBMAJOR := $(lib$(NAME)_VERSION_MAJOR) +LIBMINOR := $(lib$(NAME)_VERSION_MINOR) INCINSTDIR := $(INCDIR)/lib$(NAME) INSTHEADERS := $(INSTHEADERS) $(HEADERS:%=$(SUBDIR)%) |