Merge commit '35cf146a33ce41a1adb6c9bd5a0827eacb1b6bfc'
authorJames Almer <jamrial@gmail.com>
Mon, 23 Oct 2017 21:20:07 +0000 (18:20 -0300)
committerJames Almer <jamrial@gmail.com>
Mon, 23 Oct 2017 21:20:07 +0000 (18:20 -0300)
commit572b7a0b8562fd42e51fda1006cdfd3c387fd649
tree440df6deb635f2382379107a8d6175bac0bf525f
parentc0cfc0ce11c14285299838d2c1e96159bf9cb9de
parent35cf146a33ce41a1adb6c9bd5a0827eacb1b6bfc
Merge commit '35cf146a33ce41a1adb6c9bd5a0827eacb1b6bfc'

* commit '35cf146a33ce41a1adb6c9bd5a0827eacb1b6bfc':
  lavu: Drop deprecated av_dlog macro

Merged-by: James Almer <jamrial@gmail.com>
libavutil/log.h
libavutil/version.h