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 /vp9/encoder/vp9_encoder.h | |
| 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 'vp9/encoder/vp9_encoder.h')
| -rw-r--r-- | vp9/encoder/vp9_encoder.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/vp9/encoder/vp9_encoder.h b/vp9/encoder/vp9_encoder.h index 92bc0adcc..cf269c108 100644 --- a/vp9/encoder/vp9_encoder.h +++ b/vp9/encoder/vp9_encoder.h @@ -457,8 +457,7 @@ typedef struct VP9_COMP { void vp9_initialize_enc(void); -struct VP9_COMP *vp9_create_compressor(VP9EncoderConfig *oxcf, - BufferPool *const pool); +struct VP9_COMP *vp9_create_compressor(VP9EncoderConfig *oxcf); void vp9_remove_compressor(VP9_COMP *cpi); void vp9_change_config(VP9_COMP *cpi, const VP9EncoderConfig *oxcf); @@ -519,9 +518,8 @@ static INLINE int get_ref_frame_idx(const VP9_COMP *cpi, static INLINE YV12_BUFFER_CONFIG *get_ref_frame_buffer( VP9_COMP *cpi, MV_REFERENCE_FRAME ref_frame) { - VP9_COMMON *const cm = &cpi->common; - BufferPool *const pool = cm->buffer_pool; - return &pool->frame_bufs[cm->ref_frame_map[get_ref_frame_idx(cpi, ref_frame)]] + VP9_COMMON * const cm = &cpi->common; + return &cm->frame_bufs[cm->ref_frame_map[get_ref_frame_idx(cpi, ref_frame)]] .buf; } |