[FFmpeg-cvslog] avcodec/x86/vp9lpf: Always include x86util.asm

Michael Niedermayer git at videolan.org
Thu Sep 18 01:40:57 CEST 2014


ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni at gmx.at> | Wed Sep 17 23:36:53 2014 +0200| [d694ab846cf194862d5a0aa70217849b248c26ab] | committer: Michael Niedermayer

avcodec/x86/vp9lpf: Always include x86util.asm

Fixes executable stack

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 41d82b85ab0ee8bb2931c1f783e30c38c2fb5206)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d694ab846cf194862d5a0aa70217849b248c26ab
---

 libavcodec/x86/vp9lpf.asm |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/x86/vp9lpf.asm b/libavcodec/x86/vp9lpf.asm
index cb57a25..416f08f 100644
--- a/libavcodec/x86/vp9lpf.asm
+++ b/libavcodec/x86/vp9lpf.asm
@@ -20,10 +20,10 @@
 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 ;******************************************************************************
 
-%if ARCH_X86_64
-
 %include "libavutil/x86/x86util.asm"
 
+%if ARCH_X86_64
+
 SECTION_RODATA
 
 cextern pb_3



More information about the ffmpeg-cvslog mailing list