diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-14 00:57:21 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-14 00:57:25 +0100 |
| commit | 55f53f6c29acd459df64abf20cbd016c420b6cf6 (patch) | |
| tree | 6d35adec5646a2c9a3c8bf9187d18299d1a3a098 /libavcodec | |
| parent | fdf4eb7911b37e49716b5a64004498ff308a8324 (diff) | |
| parent | 6a8b35dc88b4a1a452f192fbbf53ae7f59bc3f23 (diff) | |
| download | ffmpeg-55f53f6c29acd459df64abf20cbd016c420b6cf6.tar.gz | |
Merge commit '6a8b35dc88b4a1a452f192fbbf53ae7f59bc3f23'
* commit '6a8b35dc88b4a1a452f192fbbf53ae7f59bc3f23':
dsputilenc_mmx: Merge two assignment blocks with identical conditions
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/x86/dsputilenc_mmx.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/libavcodec/x86/dsputilenc_mmx.c b/libavcodec/x86/dsputilenc_mmx.c index 5de8ade8b1..f289dcd9b5 100644 --- a/libavcodec/x86/dsputilenc_mmx.c +++ b/libavcodec/x86/dsputilenc_mmx.c @@ -982,9 +982,6 @@ av_cold void ff_dsputilenc_init_mmx(DSPContext *c, AVCodecContext *avctx) c->nsse[1] = nsse8_mmx; if(!(avctx->flags & CODEC_FLAG_BITEXACT)){ c->vsad[0] = vsad16_mmx; - } - - if(!(avctx->flags & CODEC_FLAG_BITEXACT)){ c->try_8x8basis= try_8x8basis_mmx; } c->add_8x8basis= add_8x8basis_mmx; |