Merge commit '150c896a9e46b23b97debb0a5f66fbaeaa32f153'
authorJames Almer <jamrial@gmail.com>
Thu, 23 Mar 2017 18:12:23 +0000 (15:12 -0300)
committerJames Almer <jamrial@gmail.com>
Thu, 23 Mar 2017 18:14:06 +0000 (15:14 -0300)
commitb29c8c995f17156204eb074e12b781a94b02c2a9
tree8c5d8e84609c6890f99285149730d3189c47d1bb
parent5c6efaffd09de059aa5c7fb9d62bc2e53ba96baf
parent150c896a9e46b23b97debb0a5f66fbaeaa32f153
Merge commit '150c896a9e46b23b97debb0a5f66fbaeaa32f153'

* commit '150c896a9e46b23b97debb0a5f66fbaeaa32f153':
  hevcdec: split ff_hevc_diag_scan* declarations into a separate header

Merged-by: James Almer <jamrial@gmail.com>
libavcodec/dxva2_hevc.c
libavcodec/hevc_cabac.c
libavcodec/hevc_data.c
libavcodec/hevc_data.h
libavcodec/hevc_ps.c
libavcodec/hevcdec.c
libavcodec/hevcdec.h
libavcodec/vdpau_hevc.c