Merge commit 'dd343fd986459f467a2d1d70c26101dff1d47d68'
authorJames Almer <jamrial@gmail.com>
Mon, 23 Oct 2017 21:15:49 +0000 (18:15 -0300)
committerJames Almer <jamrial@gmail.com>
Mon, 23 Oct 2017 21:15:49 +0000 (18:15 -0300)
commitb773a8d8c1dfe4cfc6eabf509e26ab011270b9ed
tree5055beedccbbf7f81f523598117a09755dc6b083
parentf192f2f061d979e3d2716b9892ca276b5d5cd418
parentdd343fd986459f467a2d1d70c26101dff1d47d68
Merge commit 'dd343fd986459f467a2d1d70c26101dff1d47d68'

* commit 'dd343fd986459f467a2d1d70c26101dff1d47d68':
  lavu: Drop deprecated VDPAU pixel formats

Merged-by: James Almer <jamrial@gmail.com>
12 files changed:
configure
libavcodec/allcodecs.c
libavcodec/h263dec.c
libavcodec/h264_picture.c
libavcodec/h264dec.c
libavcodec/mpeg12dec.c
libavcodec/mpeg4videodec.c
libavcodec/vc1dec.c
libavcodec/vdpau.c
libavutil/pixdesc.c
libavutil/pixfmt.h
libavutil/version.h