generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "Merge branch 'frame-parallel' to enable frame parallel decode in master branch."

Browse Source 
This reverts commit bde04ce503

Change-Id: I053dae04c761b04a36dc239558503905a14d2470
This commit is contained in:
Johann
2015-01-23 08:42:02 -08:00
committed by Gerrit Code Review
parent bde04ce503
commit a18da9760a
36 changed files with 601 additions and 1967 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
webmdec.cc
View File

@@ -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);