diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-19 13:01:06 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-19 13:01:06 +0100 |
| commit | 1b03e09198e5db75064b202e00bd77f84fa47063 (patch) | |
| tree | 8762aef7ade71799436a3f02d91087a807c7ebbb /libavutil/x86/x86util.asm | |
| parent | a5faae46a393d52bebf95ac76580968453f10b6c (diff) | |
| parent | ef5d41a5534b65f03d02f2e11a503ab8416bfc3b (diff) | |
| download | ffmpeg-1b03e09198e5db75064b202e00bd77f84fa47063.tar.gz | |
Merge commit 'ef5d41a5534b65f03d02f2e11a503ab8416bfc3b'
* commit 'ef5d41a5534b65f03d02f2e11a503ab8416bfc3b':
x86inc: Rename "program_name" to "private_prefix"
configure: Run SHFLAGS through ldflags_filter()
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/x86/x86util.asm')
| -rw-r--r-- | libavutil/x86/x86util.asm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavutil/x86/x86util.asm b/libavutil/x86/x86util.asm index 1b3bf73773..946eeabfd7 100644 --- a/libavutil/x86/x86util.asm +++ b/libavutil/x86/x86util.asm @@ -23,7 +23,7 @@ ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ;****************************************************************************** -%define program_name ff +%define private_prefix ff %define cpuflags_mmxext cpuflags_mmx2 %include "libavutil/x86/x86inc.asm" |