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)
commit3277d481ebe1cfa8f14006245554cf5745f9a257
tree75582df8f66177c716768f24ba3e56726ad411cf
parent5ac25c91020d345ee88615d9bbbfce22cdcc1b04
parent9134e9f8bbb4e27684c2e48936c91b67797c79f9
Merge "Use input framerate as timebase if none was explicitly specified."