summaryrefslogtreecommitdiff
path: root/vp8/common
diff options
context:
space:
mode:
authorJohn Koleszar <jkoleszar@google.com>2011-08-12 14:51:36 -0400
committerJohn Koleszar <jkoleszar@google.com>2011-08-12 14:51:36 -0400
commite96131705a3ce05fa271388434d1aaef7e3942c3 (patch)
tree4b6c03f37e9203412627f7b46f1440b1e801b40b /vp8/common
parenta4c2211ea3256847ac21d9e806df6aac7ea7413a (diff)
downloadlibvpx-e96131705a3ce05fa271388434d1aaef7e3942c3.tar
libvpx-e96131705a3ce05fa271388434d1aaef7e3942c3.tar.gz
libvpx-e96131705a3ce05fa271388434d1aaef7e3942c3.tar.bz2
libvpx-e96131705a3ce05fa271388434d1aaef7e3942c3.zip
Revert "Improved 1-pass CBR rate control"
This reverts commit b5ea2fbc2c1554769848774c836aad262af95072. Further testing showed noticable keyframe popping in some cases, reverting this for now to give time for a proper fix. Conflicts: vp8/encoder/onyx_if.c vp8/encoder/ratectrl.c Change-Id: I159f53d1bf0e24c035754ab3ded8ccfd58fd04af
Diffstat (limited to 'vp8/common')
-rw-r--r--vp8/common/onyxd.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/vp8/common/onyxd.h b/vp8/common/onyxd.h
index d3e5c2fa7..08f1cca80 100644
--- a/vp8/common/onyxd.h
+++ b/vp8/common/onyxd.h
@@ -18,7 +18,6 @@
extern "C"
{
#endif
-#include "vpx/vpx_codec.h"
#include "type_aliases.h"
#include "vpx_scale/yv12config.h"
#include "ppflags.h"