Merge commit '8db804e8f549d5b86a1edf62736e0ef80f160da9'
authorClément Bœsch <u@pkh.me>
Mon, 20 Mar 2017 07:09:15 +0000 (08:09 +0100)
committerClément Bœsch <u@pkh.me>
Mon, 20 Mar 2017 07:09:15 +0000 (08:09 +0100)
commit6557d784d21d41e173f141472b615c85c1422d75
tree136ae740f34438beec1954bab8e68f51cd4f7f6e
parent64722057b41d5463522740c79995db73678252b5
parent8db804e8f549d5b86a1edf62736e0ef80f160da9
Merge commit '8db804e8f549d5b86a1edf62736e0ef80f160da9'

* commit '8db804e8f549d5b86a1edf62736e0ef80f160da9':
  mov: Remove old b-frame/video delay heuristic

This commit is a noop, see 425be3c810e019c7a1298be7219536fa28f7ba49

Merged-by: Clément Bœsch <u@pkh.me>