diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2004-06-07 17:30:02 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2004-06-07 17:30:02 +0000 |
| commit | d4c5d2adf3cb15fd67bad5a916bac52089fdba82 (patch) | |
| tree | 687264872cd9f7abc2a48b22fdc54e387328f934 /libavcodec/motion_est.c | |
| parent | e6a2ac3474986280dda041521229683f00f04759 (diff) | |
| download | ffmpeg-d4c5d2adf3cb15fd67bad5a916bac52089fdba82.tar.gz | |
nsse weight
Originally committed as revision 3205 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/motion_est.c')
| -rw-r--r-- | libavcodec/motion_est.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/motion_est.c b/libavcodec/motion_est.c index bee1e07f00..be8465b626 100644 --- a/libavcodec/motion_est.c +++ b/libavcodec/motion_est.c @@ -223,7 +223,6 @@ static inline int get_penalty_factor(MpegEncContext *s, int type){ switch(type&0xFF){ default: case FF_CMP_SAD: - case FF_CMP_NSSE: return s->lambda>>FF_LAMBDA_SHIFT; case FF_CMP_DCT: return (3*s->lambda)>>(FF_LAMBDA_SHIFT+1); @@ -232,6 +231,7 @@ static inline int get_penalty_factor(MpegEncContext *s, int type){ case FF_CMP_RD: case FF_CMP_PSNR: case FF_CMP_SSE: + case FF_CMP_NSSE: return s->lambda2>>FF_LAMBDA_SHIFT; case FF_CMP_BIT: return 1; |