diff options
| author | James Zern <jzern@google.com> | 2016-02-04 06:25:44 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-02-04 06:25:44 +0000 |
| commit | 497b6744eae5553f5264b1c2350351a03d4a6351 (patch) | |
| tree | 85c6c0948d9604ec1015936839192330c0e559dd /vp9/encoder/vp9_svc_layercontext.c | |
| parent | b63788a116d3f503b11bee4797470bd658109530 (diff) | |
| parent | 29b9461a5a1d9cdb59ae788e1c24507f82dc12b5 (diff) | |
| download | libvpx-497b6744eae5553f5264b1c2350351a03d4a6351.tar libvpx-497b6744eae5553f5264b1c2350351a03d4a6351.tar.gz libvpx-497b6744eae5553f5264b1c2350351a03d4a6351.tar.bz2 libvpx-497b6744eae5553f5264b1c2350351a03d4a6351.zip | |
Merge changes from topic 'dead-code'
* changes:
yv12config.c: remove dead CONFIG_ALPHA code
vp9_encoder.c: remove unused macro
vpx_mem.c: remove unused macro
vp9_svc_layercontext.c: relocate a macro definition
vp9_encoder.c: protect SNPRINT* macros w/CONFIG check
vp9_aq_360.c: remove some unused macros
vp9_diamond_search_sad_avx.c: rename (un)likely macros
vp9_resize.c: add missing include
vp9_aq_complexity.c: remove unused macros
vp9_detokenize.c: remove unused macros
Diffstat (limited to 'vp9/encoder/vp9_svc_layercontext.c')
| -rw-r--r-- | vp9/encoder/vp9_svc_layercontext.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/vp9/encoder/vp9_svc_layercontext.c b/vp9/encoder/vp9_svc_layercontext.c index e0236aa6e..9724df4cd 100644 --- a/vp9/encoder/vp9_svc_layercontext.c +++ b/vp9/encoder/vp9_svc_layercontext.c @@ -16,7 +16,6 @@ #include "vp9/encoder/vp9_extend.h" #include "vpx_dsp/vpx_dsp_common.h" -#define SMALL_FRAME_FB_IDX 7 #define SMALL_FRAME_WIDTH 32 #define SMALL_FRAME_HEIGHT 16 @@ -644,6 +643,8 @@ int vp9_one_pass_cbr_svc_start_layer(VP9_COMP *const cpi) { } #if CONFIG_SPATIAL_SVC +#define SMALL_FRAME_FB_IDX 7 + int vp9_svc_start_frame(VP9_COMP *const cpi) { int width = 0, height = 0; LAYER_CONTEXT *lc; @@ -754,7 +755,8 @@ int vp9_svc_start_frame(VP9_COMP *const cpi) { return 0; } -#endif +#undef SMALL_FRAME_FB_IDX +#endif // CONFIG_SPATIAL_SVC struct lookahead_entry *vp9_svc_lookahead_pop(VP9_COMP *const cpi, struct lookahead_ctx *ctx, |