Merge commit 'da5ba26b9e25f408e8d2f9428c9eca699f11a7db'
authorJames Almer <jamrial@gmail.com>
Mon, 23 Oct 2017 18:59:02 +0000 (15:59 -0300)
committerJames Almer <jamrial@gmail.com>
Mon, 23 Oct 2017 18:59:02 +0000 (15:59 -0300)
commitf7eb1c9ac55bd27583419fb09c3dbb70b3ce56bc
tree8e9ce08b38422f730f3cd78fb10f1c15c444ca40
parent0b79fdeb9a81b8a568c7efea1063352338f4aa5b
parentda5ba26b9e25f408e8d2f9428c9eca699f11a7db
Merge commit 'da5ba26b9e25f408e8d2f9428c9eca699f11a7db'

* commit 'da5ba26b9e25f408e8d2f9428c9eca699f11a7db':
  lavc: Drop deprecated macroblock type symbols

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