diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-31 13:57:09 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-31 13:57:09 +0100 |
| commit | 9766d9c9851577d8162d5f006dffc721902a1409 (patch) | |
| tree | 938847263d4b058201617e0cdc5bd50ed098af7f /libswscale | |
| parent | 264f12342c3e71e4ecc9a2993e656e064f774105 (diff) | |
| parent | 04581c8c77ce779e4e70684ac45302972766be0f (diff) | |
| download | ffmpeg-9766d9c9851577d8162d5f006dffc721902a1409.tar.gz | |
Merge commit '04581c8c77ce779e4e70684ac45302972766be0f'
* commit '04581c8c77ce779e4e70684ac45302972766be0f':
x86: yasm: Use complete source path for macro helper %includes
Conflicts:
Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale')
| -rw-r--r-- | libswscale/x86/input.asm | 2 | ||||
| -rw-r--r-- | libswscale/x86/output.asm | 2 | ||||
| -rw-r--r-- | libswscale/x86/scale.asm | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/libswscale/x86/input.asm b/libswscale/x86/input.asm index 1db6aa9693..327b9f0bc5 100644 --- a/libswscale/x86/input.asm +++ b/libswscale/x86/input.asm @@ -21,7 +21,7 @@ ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ;****************************************************************************** -%include "x86util.asm" +%include "libavutil/x86/x86util.asm" SECTION_RODATA diff --git a/libswscale/x86/output.asm b/libswscale/x86/output.asm index 9d5a869fff..cb230b181b 100644 --- a/libswscale/x86/output.asm +++ b/libswscale/x86/output.asm @@ -20,7 +20,7 @@ ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ;****************************************************************************** -%include "x86util.asm" +%include "libavutil/x86/x86util.asm" SECTION_RODATA diff --git a/libswscale/x86/scale.asm b/libswscale/x86/scale.asm index 65530fe2e0..c6dafdebc3 100644 --- a/libswscale/x86/scale.asm +++ b/libswscale/x86/scale.asm @@ -19,7 +19,7 @@ ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ;****************************************************************************** -%include "x86util.asm" +%include "libavutil/x86/x86util.asm" SECTION_RODATA |