Merge commit '0bfdcce4d42a6e654c00ea5f9237dc987626457f'
authorJames Almer <jamrial@gmail.com>
Thu, 23 Mar 2017 23:02:11 +0000 (20:02 -0300)
committerJames Almer <jamrial@gmail.com>
Thu, 23 Mar 2017 23:02:11 +0000 (20:02 -0300)
commitdc39ccdc3b88e9ec3b4aa3581798c30660d94d07
treeea6dd9bc79af60d63fe0edd905158b3440db23d4
parent0f4abbd4ee1c5b34068cb48ceab3515641d6e0fb
parent0bfdcce4d42a6e654c00ea5f9237dc987626457f
Merge commit '0bfdcce4d42a6e654c00ea5f9237dc987626457f'

* commit '0bfdcce4d42a6e654c00ea5f9237dc987626457f':
  hevc: move the SliceType enum to hevc.h

Merged-by: James Almer <jamrial@gmail.com>
libavcodec/hevc.h
libavcodec/hevc_cabac.c
libavcodec/hevc_mvs.c
libavcodec/hevc_parser.c
libavcodec/hevc_refs.c
libavcodec/hevcdec.c
libavcodec/hevcdec.h
libavcodec/vaapi_encode_h265.c
libavcodec/vaapi_hevc.c