From b3f2a3fe3fe4e2a752fa2ef26d1e39d51f30cc52 Mon Sep 17 00:00:00 2001
From: Daniel Kang <daniel.d.kang@gmail.com>
Date: Mon, 11 Feb 2013 13:45:10 -0500
Subject: [PATCH 1/2] x86: mpeg4qpel: Make movsxifnidn do the right thing

Fixes an instruction that does nothing by changing the
source to dword.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
---
 libavcodec/x86/mpeg4qpel.asm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/x86/mpeg4qpel.asm b/libavcodec/x86/mpeg4qpel.asm
index 6b5d20326d..df20ea9dc6 100644
--- a/libavcodec/x86/mpeg4qpel.asm
+++ b/libavcodec/x86/mpeg4qpel.asm
@@ -100,7 +100,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

From 304b806cb524fb040f8e09a241040f1af2cb820b Mon Sep 17 00:00:00 2001
From: Diego Biurrun <diego@biurrun.de>
Date: Sun, 3 Feb 2013 15:03:08 +0100
Subject: [PATCH 2/2] build: Make library minor version visible in the Makefile

This allows employing that number in library install commands.
---
 configure   | 1 +
 library.mak | 1 +
 2 files changed, 2 insertions(+)

diff --git a/configure b/configure
index 0d55bba42b..0731c27ec9 100755
--- a/configure
+++ b/configure
@@ -3958,6 +3958,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/library.mak b/library.mak
index 3b4bd2d161..f3e44273f7 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)%)