Merge commit '6dca24cd1d570b806b5a3fdaef9d3c8608942a81'
authorJames Almer <jamrial@gmail.com>
Sun, 22 Oct 2017 02:59:53 +0000 (23:59 -0300)
committerJames Almer <jamrial@gmail.com>
Sun, 22 Oct 2017 02:59:53 +0000 (23:59 -0300)
commit90000f15ec41fbb768b6b3d360131638d089bd59
tree430d2dff911d6567bf42803f681cb8bdc7adbd4c
parent898349d702064906e9b4830999465a1a381afcfb
parent6dca24cd1d570b806b5a3fdaef9d3c8608942a81
Merge commit '6dca24cd1d570b806b5a3fdaef9d3c8608942a81'

* commit '6dca24cd1d570b806b5a3fdaef9d3c8608942a81':
  lavc: Drop deprecated way of setting codec dimensions

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