Merge "Adjust to scene detection for 1 pass vbr."
authorMarco Paniconi <marpan@google.com>
Thu, 12 Oct 2017 19:36:33 +0000 (19:36 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Thu, 12 Oct 2017 19:36:33 +0000 (19:36 +0000)

Trivial merge