Merge commit 'c43a96fe16e6a6ea091e64ca271f0788f4a0bea9'
authorJames Almer <jamrial@gmail.com>
Mon, 23 Oct 2017 19:56:18 +0000 (16:56 -0300)
committerJames Almer <jamrial@gmail.com>
Mon, 23 Oct 2017 19:56:18 +0000 (16:56 -0300)
commit3e0a16f0033390a32f8d96c0bd1040030c89e1c0
tree51af5d35432a8d911faac3c22aa0ee2d7634a22b
parenteb5f84633991eeed2c4a547ae04b593ad6adb03e
parentc43a96fe16e6a6ea091e64ca271f0788f4a0bea9
Merge commit 'c43a96fe16e6a6ea091e64ca271f0788f4a0bea9'

* commit 'c43a96fe16e6a6ea091e64ca271f0788f4a0bea9':
  lavc: Drop deprecated time_base variable for decoding

This commit is a noop. The API has been postponed.

Merged-by: James Almer <jamrial@gmail.com>