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 /libavresample | |
| 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 'libavresample')
| -rw-r--r-- | libavresample/x86/audio_convert.asm | 2 | ||||
| -rw-r--r-- | libavresample/x86/audio_mix.asm | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libavresample/x86/audio_convert.asm b/libavresample/x86/audio_convert.asm index a1213a69d5..e7f715776c 100644 --- a/libavresample/x86/audio_convert.asm +++ b/libavresample/x86/audio_convert.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" %include "util.asm" SECTION_RODATA 32 diff --git a/libavresample/x86/audio_mix.asm b/libavresample/x86/audio_mix.asm index 13b364aac2..7f3b5b9080 100644 --- a/libavresample/x86/audio_mix.asm +++ b/libavresample/x86/audio_mix.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" %include "util.asm" SECTION_TEXT |