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

Unified Diff: source/libvpx/webmdec.cc

Issue 1302353004: libvpx: Pull from upstream (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/libvpx.git@master
Patch Set: Created 5 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 | « source/libvpx/vpxenc.c ('k') | source/libvpx/webmenc.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: source/libvpx/webmdec.cc
diff --git a/source/libvpx/webmdec.cc b/source/libvpx/webmdec.cc
index e152f5ee03a7275cabd0d7453cf5b4a1fa26ca31..1020d046ba872bf416d5f4009e01c68de9b8c103 100644
--- a/source/libvpx/webmdec.cc
+++ b/source/libvpx/webmdec.cc
@@ -103,6 +103,8 @@ int file_is_webm(struct WebmInputContext *webm_ctx,
vpx_ctx->fourcc = VP8_FOURCC;
} else if (!strncmp(video_track->GetCodecId(), "V_VP9", 5)) {
vpx_ctx->fourcc = VP9_FOURCC;
+ } else if (!strncmp(video_track->GetCodecId(), "V_VP10", 6)) {
+ vpx_ctx->fourcc = VP10_FOURCC;
} else {
rewind_and_reset(webm_ctx, vpx_ctx);
return 0;
« no previous file with comments | « source/libvpx/vpxenc.c ('k') | source/libvpx/webmenc.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698