Merge commit 'b748c280e59cac468ed36cbbe5e71d5ebd434020'
authorJames Almer <jamrial@gmail.com>
Sun, 22 Oct 2017 02:26:55 +0000 (23:26 -0300)
committerJames Almer <jamrial@gmail.com>
Sun, 22 Oct 2017 02:26:55 +0000 (23:26 -0300)
commitb48ed00403603f5d850eaa7b3e2fcda9ef98fb1c
tree70494f4334e049bf2c6b8a296379bbd74b4ad0ec
parent43befa68263be9db116997226e5147d88aba008d
parentb748c280e59cac468ed36cbbe5e71d5ebd434020
Merge commit 'b748c280e59cac468ed36cbbe5e71d5ebd434020'

* commit 'b748c280e59cac468ed36cbbe5e71d5ebd434020':
  lavc: Drop deprecated lowres option

This commit is a noop. The deprecation was postponed.

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