Merge "vp9_svc_layercontext: Clean up function definition mismatch."

This commit is contained in:
Frank Galligan
2014-05-08 08:48:54 -07:00
committed by Gerrit Code Review

View File

@@ -221,7 +221,7 @@ void vp9_inc_frame_in_layer(SVC *svc) {
++lc->current_video_frame_in_layer; ++lc->current_video_frame_in_layer;
} }
int vp9_is_upper_layer_key_frame(const VP9_COMP *cpi) { int vp9_is_upper_layer_key_frame(const VP9_COMP *const cpi) {
return cpi->use_svc && return cpi->use_svc &&
cpi->svc.number_temporal_layers == 1 && cpi->svc.number_temporal_layers == 1 &&
cpi->svc.spatial_layer_id > 0 && cpi->svc.spatial_layer_id > 0 &&