diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-08 12:53:44 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-08 12:53:44 +0200 |
| commit | 7beadfe1f7777574e99fd4cf6bcd7abad4fb4089 (patch) | |
| tree | 48b177a5d395f894b8ad8b99086cecf4271aedb5 /libavcodec/x86/dsputilenc_mmx.c | |
| parent | 8a0118b4b49460fb2d33b3fac765c7131816ecc7 (diff) | |
| parent | 7b699d813681e4fad419ec63c96d595e98b2dbfa (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mov_chan: Only set the channel_layout if setting it to a nonzero value
mov_chan: Reindent an incorrectly indented line
mp2 muxer: mark as AVFMT_NOTIMESTAMPS.
x86: float_dsp: fix ff_vector_fmac_scalar_avx() on Win64
x86: more specific checks for availability of required assembly capabilities
x86: avcodec: Drop silly "_mmx" suffix from dsputil template names
fate: Drop redundant setting of FUZZ to 1
cavsdsp: set idct permutation independently of dsputil
x86: allow using add_hfyu_median_prediction_cmov on any cpu with cmov
Conflicts:
libavcodec/x86/dsputil_mmx.c
libavformat/mp3enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/dsputilenc_mmx.c')
| -rw-r--r-- | libavcodec/x86/dsputilenc_mmx.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/x86/dsputilenc_mmx.c b/libavcodec/x86/dsputilenc_mmx.c index 9f9680b596..325d55062b 100644 --- a/libavcodec/x86/dsputilenc_mmx.c +++ b/libavcodec/x86/dsputilenc_mmx.c @@ -1042,7 +1042,7 @@ static int ssd_int8_vs_int16_mmx(const int8_t *pix1, const int16_t *pix2, int si #define SET_RND MOVQ_WONE #define SCALE_OFFSET 1 -#include "dsputil_mmx_qns_template.c" +#include "dsputil_qns_template.c" #undef DEF #undef SET_RND @@ -1056,7 +1056,7 @@ static int ssd_int8_vs_int16_mmx(const int8_t *pix1, const int16_t *pix2, int si "pmulhrw " #s ", "#x " \n\t"\ "pmulhrw " #s ", "#y " \n\t" -#include "dsputil_mmx_qns_template.c" +#include "dsputil_qns_template.c" #undef DEF #undef SET_RND @@ -1075,7 +1075,7 @@ static int ssd_int8_vs_int16_mmx(const int8_t *pix1, const int16_t *pix2, int si "pmulhrsw " #s ", "#x " \n\t"\ "pmulhrsw " #s ", "#y " \n\t" -#include "dsputil_mmx_qns_template.c" +#include "dsputil_qns_template.c" #undef DEF #undef SET_RND |