summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVignesh Venkatasubramanian <vigneshv@google.com>2015-09-10 10:44:59 -0700
committerVignesh Venkatasubramanian <vigneshv@google.com>2015-09-10 10:44:59 -0700
commit09969ac9a29cdf8528e6980425a6df2c13674100 (patch)
tree40d4825f1bf0575703562e6fb74944f67589a48d
parent2ff108aac65c54154c5b181a8f00c4fe7a7d2d46 (diff)
downloadlibvpx-09969ac9a29cdf8528e6980425a6df2c13674100.tar
libvpx-09969ac9a29cdf8528e6980425a6df2c13674100.tar.gz
libvpx-09969ac9a29cdf8528e6980425a6df2c13674100.tar.bz2
libvpx-09969ac9a29cdf8528e6980425a6df2c13674100.zip
webmdec: Handle codec id being NULL.
WebM files could have CodecId missing in the track headers. Treat those files as unknown input file type in vpxdec. Fixes issue #1064. Change-Id: I6c3bb7b4bd3a4f5c244312482a5996f8b68db3f3
-rw-r--r--webmdec.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/webmdec.cc b/webmdec.cc
index 1020d046b..f541cfecc 100644
--- a/webmdec.cc
+++ b/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;
}