Merge commit '7b917041184874e7d7cba4450813de7e0bb28a33'
authorJames Almer <jamrial@gmail.com>
Sun, 22 Oct 2017 02:40:03 +0000 (23:40 -0300)
committerJames Almer <jamrial@gmail.com>
Sun, 22 Oct 2017 02:40:03 +0000 (23:40 -0300)
commitc68a3ab96ec0497ae2d627ddd30c61737d18173e
tree5176f02ac79027e41655aa4c67a16913675461c6
parentb48ed00403603f5d850eaa7b3e2fcda9ef98fb1c
parent7b917041184874e7d7cba4450813de7e0bb28a33
Merge commit '7b917041184874e7d7cba4450813de7e0bb28a33'

* commit '7b917041184874e7d7cba4450813de7e0bb28a33':
  lavc: Drop deprecated VDPAU codec capability

Merged-by: James Almer <jamrial@gmail.com>
12 files changed:
libavcodec/avcodec.h
libavcodec/decode.c
libavcodec/error_resilience.c
libavcodec/h263dec.c
libavcodec/h264_picture.c
libavcodec/h264_slice.c
libavcodec/h264dec.c
libavcodec/mpegpicture.c
libavcodec/mpegvideo.c
libavcodec/vc1dec.c
libavcodec/vdpau.h
libavcodec/version.h