[x264-devel] commit: Merge some of adaptive quant and weightp (Jason Garrett-Glaser )

[git at videolan.org]

x264 | branch: master | Jason Garrett-Glaser <darkshikari at gmail.com> | Wed May 26 12:55:35 2010 -0700| [5832bdfaed3bcce1b2823b6594386e0357d8ff31] | committer: Jason Garrett-Glaser 

Merge some of adaptive quant and weightp
Eliminate redundant work; both of them were calculating variance of the frame.

> http://git.videolan.org/gitweb.cgi/x264.git/?a=commit;h=5832bdfaed3bcce1b2823b6594386e0357d8ff31
---

 common/frame.h        |    4 +-
 encoder/analyse.h     |    1 -
 encoder/encoder.c     |   12 ++---
 encoder/ratecontrol.c |  124 +++++++++++++++++++++++++++++++-----------------
 encoder/slicetype.c   |   31 ++----------
 5 files changed, 92 insertions(+), 80 deletions(-)

Diff:   http://git.videolan.org/gitweb.cgi/x264.git/?a=commitdiff;h=5832bdfaed3bcce1b2823b6594386e0357d8ff31