Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(350)

Unified Diff: libvpx/source/libvpx/vpx/src/vpx_encoder.c

Issue 7624054: Revert r97185 "Update libvpx snapshot to v0.9.7-p1 (Cayuga)." (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party
Patch Set: Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « libvpx/source/libvpx/vpx/src/vpx_decoder.c ('k') | libvpx/source/libvpx/vpx/vp8.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: libvpx/source/libvpx/vpx/src/vpx_encoder.c
diff --git a/libvpx/source/libvpx/vpx/src/vpx_encoder.c b/libvpx/source/libvpx/vpx/src/vpx_encoder.c
index 5e86835ea05488f7ee5b10aead874384b7488eb9..db778ffc90e74f6d163b78f13415d83d5e954291 100644
--- a/libvpx/source/libvpx/vpx/src/vpx_encoder.c
+++ b/libvpx/source/libvpx/vpx/src/vpx_encoder.c
@@ -16,7 +16,6 @@
#include <limits.h>
#include <string.h>
#include "vpx/internal/vpx_codec_internal.h"
-#include "vpx_config.h"
#define SAVE_STATUS(ctx,var) (ctx?(ctx->err = var):var)
@@ -41,9 +40,6 @@ vpx_codec_err_t vpx_codec_enc_init_ver(vpx_codec_ctx_t *ctx,
else if ((flags & VPX_CODEC_USE_PSNR)
&& !(iface->caps & VPX_CODEC_CAP_PSNR))
res = VPX_CODEC_INCAPABLE;
- else if ((flags & VPX_CODEC_USE_OUTPUT_PARTITION)
- && !(iface->caps & VPX_CODEC_CAP_OUTPUT_PARTITION))
- res = VPX_CODEC_INCAPABLE;
else
{
ctx->iface = iface;
« no previous file with comments | « libvpx/source/libvpx/vpx/src/vpx_decoder.c ('k') | libvpx/source/libvpx/vpx/vp8.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698