Merge commit '0c7986df444273b0e53d3992ba9cc1108bd6a386'
authorJames Almer <jamrial@gmail.com>
Mon, 23 Oct 2017 17:59:23 +0000 (14:59 -0300)
committerJames Almer <jamrial@gmail.com>
Mon, 23 Oct 2017 17:59:23 +0000 (14:59 -0300)
commit51b88c3d4eb5838975b7338bc85a77a38b3f1af8
tree941a349f54ab4310ee774fc8453487a7e257e91a
parentd8a124e7ebc0c737ad398664bd0d55ac4f7f7ae3
parent0c7986df444273b0e53d3992ba9cc1108bd6a386
Merge commit '0c7986df444273b0e53d3992ba9cc1108bd6a386'

* commit '0c7986df444273b0e53d3992ba9cc1108bd6a386':
  lavc: Drop deprecated workaround bugs options

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