diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2003-01-18 01:37:42 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2003-01-18 01:37:42 +0000 |
| commit | 1d0eab1dcc26344309f624a95d91f97d72f4b847 (patch) | |
| tree | 37ae014bba1a776294910fba748ad563b662923b /libavcodec/motion_est.c | |
| parent | e51d4defe06c0acbfb56b5256cefae3b39a7d5c1 (diff) | |
| download | ffmpeg-1d0eab1dcc26344309f624a95d91f97d72f4b847.tar.gz | |
bugs
Originally committed as revision 1469 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/motion_est.c')
| -rw-r--r-- | libavcodec/motion_est.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/motion_est.c b/libavcodec/motion_est.c index 4dcc08d596..630d4fe239 100644 --- a/libavcodec/motion_est.c +++ b/libavcodec/motion_est.c @@ -1,7 +1,7 @@ /* * Motion estimation * Copyright (c) 2000,2001 Fabrice Bellard. - * Copyright (c) 2002 Michael Niedermayer + * Copyright (c) 2002-2003 Michael Niedermayer * * * This library is free software; you can redistribute it and/or @@ -313,6 +313,7 @@ static inline int get_penalty_factor(MpegEncContext *s, int type){ case FF_CMP_DCT: case FF_CMP_SATD: case FF_CMP_SSE: + case FF_CMP_PSNR: return s->qscale*8; case FF_CMP_BIT: return 1; @@ -1030,7 +1031,7 @@ void ff_estimate_p_frame_motion(MpegEncContext * s, } #endif }else{ - s->scene_change_score+= 20; + s->scene_change_score+= s->qscale; mb_type|= MB_TYPE_INTRA; mx = 0; my = 0; |