Merge commit 'c359d624d3efc3fd1d83210d78c4152bd329b765'
authorJames Almer <jamrial@gmail.com>
Thu, 23 Mar 2017 17:27:48 +0000 (14:27 -0300)
committerJames Almer <jamrial@gmail.com>
Thu, 23 Mar 2017 17:27:48 +0000 (14:27 -0300)
commit6397815be0bee10948387fcb90ead36ec2834ef7
treee616efad05f1147821dd80f88dae04707d795193
parenta1a80a6c9ce5309632a8b5c0241fa5ffcd09b5fc
parentc359d624d3efc3fd1d83210d78c4152bd329b765
Merge commit 'c359d624d3efc3fd1d83210d78c4152bd329b765'

* commit 'c359d624d3efc3fd1d83210d78c4152bd329b765':
  hevcdec: move decoder-independent declarations into a separate header

Merged-by: James Almer <jamrial@gmail.com>
14 files changed:
libavcodec/h2645_parse.c
libavcodec/hevc_mp4toannexb_bsf.c
libavcodec/hevc_parse.c
libavcodec/hevc_parser.c
libavcodec/hevc_ps.c
libavcodec/hevc_refs.c
libavcodec/hevc_sei.c
libavcodec/hevcdec.c
libavcodec/hevcdec.h
libavcodec/mediacodecdec.c
libavcodec/qsvenc_hevc.c
libavcodec/vaapi_encode_h265.c
libavformat/hevc.c
libavformat/hevcdec.c