diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-12 10:57:06 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-12 10:57:06 +0100 |
| commit | da501ea857b13ea13749e372ccca9ae0804ff4d5 (patch) | |
| tree | 1f43b7a2ba9a1ee63c1c38cc87983cbec20d8075 /libavutil | |
| parent | 3a04c18d899d278eea551c216e5117974063062b (diff) | |
| parent | 802713c4e7b41bc2deed754d78649945c3442063 (diff) | |
| download | ffmpeg-da501ea857b13ea13749e372ccca9ae0804ff4d5.tar.gz | |
Merge commit '802713c4e7b41bc2deed754d78649945c3442063'
* commit '802713c4e7b41bc2deed754d78649945c3442063':
mss2: prevent potential uninitialized reads
mss2: reindent after last commit
mss2: fix handling of unmasked implicit WMV9 rectangles
configure: add lavu dependency to lavr/lavfi .pc files
x86inc: Set program_name outside of x86inc.asm
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/x86/x86inc.asm | 2 | ||||
| -rw-r--r-- | libavutil/x86/x86util.asm | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/libavutil/x86/x86inc.asm b/libavutil/x86/x86inc.asm index 01d7655a17..97ccc040e7 100644 --- a/libavutil/x86/x86inc.asm +++ b/libavutil/x86/x86inc.asm @@ -35,7 +35,7 @@ ; to x264-devel@videolan.org . %ifndef program_name - %define program_name ff + %define program_name x264 %endif %define WIN64 0 diff --git a/libavutil/x86/x86util.asm b/libavutil/x86/x86util.asm index 03cc47b4e2..fdda429ee2 100644 --- a/libavutil/x86/x86util.asm +++ b/libavutil/x86/x86util.asm @@ -23,6 +23,7 @@ ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ;****************************************************************************** +%define program_name ff %define cpuflags_mmxext cpuflags_mmx2 %include "libavutil/x86/x86inc.asm" |