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

Unified Diff: source/libvpx/webmdec.cc

Issue 1339513003: libvpx: Pull from upstream (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/libvpx.git@master
Patch Set: Created 5 years, 3 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/vpx_dsp/x86/vpx_subpixel_8t_ssse3.asm ('k') | no next file » | 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 1020d046ba872bf416d5f4009e01c68de9b8c103..f541cfecc1692ebb6894d3ffa5efc42970249c2a 100644
--- a/source/libvpx/webmdec.cc
+++ b/source/libvpx/webmdec.cc
@@ -94,7 +94,7 @@ int file_is_webm(struct WebmInputContext *webm_ctx,
}
}
- if (video_track == NULL) {
+ if (video_track == NULL || video_track->GetCodecId() == NULL) {
rewind_and_reset(webm_ctx, vpx_ctx);
return 0;
}
« no previous file with comments | « source/libvpx/vpx_dsp/x86/vpx_subpixel_8t_ssse3.asm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698