diff options
| author | John Koleszar <jkoleszar@google.com> | 2011-02-07 14:16:24 -0500 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2011-02-07 14:16:24 -0500 |
| commit | c540bbc3679f5b3fcfaeb8449196a9d0b56fdba1 (patch) | |
| tree | 3183dc740091a7e36f9bb3538913f61db602923a /vp8/decoder/decodframe.c | |
| parent | 2bb322380d6b4b046e7a9aeba2b1058684d46e30 (diff) | |
| parent | eaadfb58695f1b5928be47e87bb00d7a6096a3ab (diff) | |
| download | libvpx-c540bbc3679f5b3fcfaeb8449196a9d0b56fdba1.tar libvpx-c540bbc3679f5b3fcfaeb8449196a9d0b56fdba1.tar.gz libvpx-c540bbc3679f5b3fcfaeb8449196a9d0b56fdba1.tar.bz2 libvpx-c540bbc3679f5b3fcfaeb8449196a9d0b56fdba1.zip | |
Merge remote branch 'internal/upstream' into HEAD
Diffstat (limited to 'vp8/decoder/decodframe.c')
| -rw-r--r-- | vp8/decoder/decodframe.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/vp8/decoder/decodframe.c b/vp8/decoder/decodframe.c index 57d90675e..9bd6bc514 100644 --- a/vp8/decoder/decodframe.c +++ b/vp8/decoder/decodframe.c @@ -475,8 +475,7 @@ static void setup_token_decoder(VP8D_COMP *pbi, "Truncated packet or corrupt partition " "%d length", i + 1); - if (vp8dx_start_decode(bool_decoder, IF_RTCD(&pbi->dboolhuff), - partition, partition_size)) + if (vp8dx_start_decode(bool_decoder, partition, partition_size)) vpx_internal_error(&pc->error, VPX_CODEC_MEM_ERROR, "Failed to allocate bool decoder %d", i + 1); @@ -650,8 +649,7 @@ int vp8_decode_frame(VP8D_COMP *pbi) init_frame(pbi); - if (vp8dx_start_decode(bc, IF_RTCD(&pbi->dboolhuff), - data, data_end - data)) + if (vp8dx_start_decode(bc, data, data_end - data)) vpx_internal_error(&pc->error, VPX_CODEC_MEM_ERROR, "Failed to allocate bool decoder 0"); if (pc->frame_type == KEY_FRAME) { |