diff options
| author | Johann Koenig <johannkoenig@google.com> | 2018-01-22 19:38:42 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-01-22 19:38:42 +0000 |
| commit | 37612541199ca2ff1d5f72d9b1a15f02b672beb2 (patch) | |
| tree | ec5812f9afd7e2663544fb025e4f900562c7b295 /vp9/vp9_cx_iface.c | |
| parent | 9debbc2ec7e6ff004dba4d66d2780e216ca50b1a (diff) | |
| parent | 281f68a81f0951063f6aac83dea0a786defd2cf1 (diff) | |
| download | libvpx-37612541199ca2ff1d5f72d9b1a15f02b672beb2.tar libvpx-37612541199ca2ff1d5f72d9b1a15f02b672beb2.tar.gz libvpx-37612541199ca2ff1d5f72d9b1a15f02b672beb2.tar.bz2 libvpx-37612541199ca2ff1d5f72d9b1a15f02b672beb2.zip | |
Merge changes from topic "clang-format"
* changes:
clang-format v5.0.0 vp9/
remove spurious comments
clang-format v5.0.0 vp8/
clang-format v5.0.0 vpx_dsp/
clang-format v5.0.0 mem_ops.h
clang-format v5.0.0 vpx_util/vpx_atomic.h
clang-format v5.0.0 y4minput.c
clang-format v5.0.0 vpxenc.c
clang-format v5.0.0 examples/
clang-format v5.0.0 test/
Diffstat (limited to 'vp9/vp9_cx_iface.c')
| -rw-r--r-- | vp9/vp9_cx_iface.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/vp9/vp9_cx_iface.c b/vp9/vp9_cx_iface.c index 5bfe9aa05..cdfb0336b 100644 --- a/vp9/vp9_cx_iface.c +++ b/vp9/vp9_cx_iface.c @@ -1067,12 +1067,11 @@ static vpx_codec_frame_flags_t get_frame_pkt_flags(const VP9_COMP *cpi, vpx_codec_frame_flags_t flags = lib_flags << 16; if (lib_flags & FRAMEFLAGS_KEY || - (cpi->use_svc && - cpi->svc - .layer_context[cpi->svc.spatial_layer_id * - cpi->svc.number_temporal_layers + - cpi->svc.temporal_layer_id] - .is_key_frame)) + (cpi->use_svc && cpi->svc + .layer_context[cpi->svc.spatial_layer_id * + cpi->svc.number_temporal_layers + + cpi->svc.temporal_layer_id] + .is_key_frame)) flags |= VPX_FRAME_IS_KEY; if (cpi->droppable) flags |= VPX_FRAME_IS_DROPPABLE; |