Merge "Use input framerate as timebase if none was explicitly specified."
authorJames Zern <jzern@google.com>
Wed, 20 Jan 2016 02:27:29 +0000 (02:27 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Wed, 20 Jan 2016 02:27:29 +0000 (02:27 +0000)

Trivial merge