Merge commit '4476027d93680cd88d2f75ef1cef5b0c276a8704'
authorJames Almer <jamrial@gmail.com>
Mon, 23 Oct 2017 19:28:38 +0000 (16:28 -0300)
committerJames Almer <jamrial@gmail.com>
Mon, 23 Oct 2017 19:28:38 +0000 (16:28 -0300)
commit5a2e581879b8901b8660b82ff8d333d18fc629ff
treef23f44735c3c45ec6a8bf89db168ab403a24cf99
parentb79a7da36faa6bb5914b04800b548e99eb3b81ca
parent4476027d93680cd88d2f75ef1cef5b0c276a8704
Merge commit '4476027d93680cd88d2f75ef1cef5b0c276a8704'

* commit '4476027d93680cd88d2f75ef1cef5b0c276a8704':
  lavc: Drop deprecated avctx codec name

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