]> git.sesse.net Git - ffmpeg/commitdiff
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)
* commit 'b748c280e59cac468ed36cbbe5e71d5ebd434020':
  lavc: Drop deprecated lowres option

This commit is a noop. The deprecation was postponed.

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

Trivial merge