diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-03-16 01:36:49 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-03-16 01:36:49 +0100 |
| commit | 4257ce112c41f741408b817d305630dadc3ee52d (patch) | |
| tree | 7121a52130f9b73dd4a2cdbae2d71d50918a39d5 /libavutil | |
| parent | c743aad557fe14980b9912869d90008ecb29ba97 (diff) | |
| parent | 702985b8b7bfe0d8eac2747f3a03e7f15886364c (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
dxa: remove useless code
lavf: don't select an attached picture as default stream for seeking.
avconv: remove pointless checks.
avconv: check for get_filtered_frame() failure.
avconv: remove a pointless check.
swscale: convert hscale() to use named arguments.
x86inc: add *mp named argument support to DEFINE_ARGS.
swscale: convert hscale to cpuflags().
Conflicts:
ffmpeg.c
libswscale/x86/scale.asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/x86/x86inc.asm | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavutil/x86/x86inc.asm b/libavutil/x86/x86inc.asm index 7268e97d48..a357e364d3 100644 --- a/libavutil/x86/x86inc.asm +++ b/libavutil/x86/x86inc.asm @@ -246,6 +246,7 @@ DECLARE_REG_TMP_SIZE 0,1,2,3,4,5,6,7,8,9 CAT_UNDEF arg_name %+ %%i, w CAT_UNDEF arg_name %+ %%i, b CAT_UNDEF arg_name %+ %%i, m + CAT_UNDEF arg_name %+ %%i, mp CAT_UNDEF arg_name, %%i %assign %%i %%i+1 %endrep @@ -260,6 +261,7 @@ DECLARE_REG_TMP_SIZE 0,1,2,3,4,5,6,7,8,9 %xdefine %1w r %+ %%i %+ w %xdefine %1b r %+ %%i %+ b %xdefine %1m r %+ %%i %+ m + %xdefine %1mp r %+ %%i %+ mp CAT_XDEFINE arg_name, %%i, %1 %assign %%i %%i+1 %rotate 1 |