diff options
| author | Johann <johannkoenig@google.com> | 2015-01-23 08:42:02 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2015-01-23 08:42:02 -0800 |
| commit | a18da9760a74d9ce6fb9f875706dc639c95402f5 (patch) | |
| tree | c2806c233776eb3bcb57f3d37d7202358c585143 /webmdec.cc | |
| parent | bde04ce5039cbcf86c8b34bdb4127e18d7e1d0c7 (diff) | |
| download | libvpx-a18da9760a74d9ce6fb9f875706dc639c95402f5.tar libvpx-a18da9760a74d9ce6fb9f875706dc639c95402f5.tar.gz libvpx-a18da9760a74d9ce6fb9f875706dc639c95402f5.tar.bz2 libvpx-a18da9760a74d9ce6fb9f875706dc639c95402f5.zip | |
Revert "Merge branch 'frame-parallel' to enable frame parallel decode in master branch."
This reverts commit bde04ce5039cbcf86c8b34bdb4127e18d7e1d0c7
Change-Id: I053dae04c761b04a36dc239558503905a14d2470
Diffstat (limited to 'webmdec.cc')
| -rw-r--r-- | webmdec.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/webmdec.cc b/webmdec.cc index d591f3e3d..4383e8efd 100644 --- a/webmdec.cc +++ b/webmdec.cc @@ -41,7 +41,6 @@ void reset(struct WebmInputContext *const webm_ctx) { webm_ctx->block_frame_index = 0; webm_ctx->video_track_index = 0; webm_ctx->timestamp_ns = 0; - webm_ctx->is_key_frame = false; } void get_first_cluster(struct WebmInputContext *const webm_ctx) { @@ -183,7 +182,6 @@ int webm_read_frame(struct WebmInputContext *webm_ctx, } *bytes_in_buffer = frame.len; webm_ctx->timestamp_ns = block->GetTime(cluster); - webm_ctx->is_key_frame = block->IsKey(); mkvparser::MkvReader *const reader = reinterpret_cast<mkvparser::MkvReader*>(webm_ctx->reader); |