highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '04581c8c77ce779e4e70684ac45302972766be0f'

Browse Source 
* commit '04581c8c77ce779e4e70684ac45302972766be0f':
  x86: yasm: Use complete source path for macro helper %includes

Conflicts:
	Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2012-10-31 13:57:09 +01:00
parent 264f12342c 04581c8c77
commit 9766d9c985
17 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavresample/x86/audio_convert.asm
View File

@@ -20,7 +20,7 @@
;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
;******************************************************************************
%include "x86util.asm"
%include "libavutil/x86/x86util.asm"
%include "util.asm"
SECTION_RODATA 32

2
libavresample/x86/audio_mix.asm
View File

@@ -19,7 +19,7 @@
;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
;******************************************************************************
%include "x86util.asm"
%include "libavutil/x86/x86util.asm"
%include "util.asm"
SECTION_TEXT