Merge commit '0871e2337777d9161e7f3554bcad19dabc9e15e1'
authorJames Almer <jamrial@gmail.com>
Mon, 23 Oct 2017 18:04:19 +0000 (15:04 -0300)
committerJames Almer <jamrial@gmail.com>
Mon, 23 Oct 2017 18:05:12 +0000 (15:05 -0300)
commitc381f6a483e00ab8bfa4f777284b89acdad6dd94
tree4ee201d57d46594c02093659d9173039eb12c3a0
parentb13e61d6296e4f91f1f495ff436c61ad5de323fb
parent0871e2337777d9161e7f3554bcad19dabc9e15e1
Merge commit '0871e2337777d9161e7f3554bcad19dabc9e15e1'

* commit '0871e2337777d9161e7f3554bcad19dabc9e15e1':
  lavc: Drop deprecated architectures symbols

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