[FFmpeg-cvslog] Merge commit 'b748c280e59cac468ed36cbbe5e71d5ebd434020'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Sat Oct 21 23:26:55 2017 -0300| [b48ed00403603f5d850eaa7b3e2fcda9ef98fb1c] | committer: James Almer

Merge commit 'b748c280e59cac468ed36cbbe5e71d5ebd434020'

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

This commit is a noop. The deprecation was postponed.

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b48ed00403603f5d850eaa7b3e2fcda9ef98fb1c
---