Merge commit '150c896a9e46b23b97debb0a5f66fbaeaa32f153'

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

Merged-by: James Almer <jamrial@gmail.com>

diff --cc libavcodec/dxva2_hevc.c
Simple merge

diff --cc libavcodec/hevc_cabac.c
index 969f37203f467e5daf93b07434aa02b033966656,eb16f57cd86f91c89a1f44e136ea4c82f48fc4a3..205fc4edef109c4bc2e3f2766f2faada198f712e
--- 1/libavcodec/hevc_cabac.c
--- 2/libavcodec/hevc_cabac.c
+++ b/libavcodec/hevc_cabac.c
@@@ -25,6 -25,6 +25,7 @@@
  #include "libavutil/common.h"
  
  #include "cabac_functions.h"
++#include "hevc_data.h"
  #include "hevcdec.h"
  
  #define CABAC_MAX_BIN 31

diff --cc libavcodec/hevc_data.c
Simple merge

diff --cc libavcodec/hevc_data.h
index 0000000000000000000000000000000000000000,d1d2c33411649ecd519bb9b785f3ea79d60845d4..74558f0a989584ca9b4a10386787cd99395efd85
mode 000000,100644..100644
--- /dev/null
--- 2/libavcodec/hevc_data.h
+++ b/libavcodec/hevc_data.h
@@@ -1,0 -1,31 +1,31 @@@
 - * This file is part of Libav.
+ /*
+  * HEVC shared data tables
+  *
 - * Libav is free software; you can redistribute it and/or
++ * This file is part of FFmpeg.
+  *
 - * Libav is distributed in the hope that it will be useful,
++ * FFmpeg is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU Lesser General Public
+  * License as published by the Free Software Foundation; either
+  * version 2.1 of the License, or (at your option) any later version.
+  *
 - * License along with Libav; if not, write to the Free Software
++ * FFmpeg is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  * Lesser General Public License for more details.
+  *
+  * You should have received a copy of the GNU Lesser General Public
++ * License along with FFmpeg; if not, write to the Free Software
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+  */
+ 
+ #ifndef AVCODEC_HEVC_DATA_H
+ #define AVCODEC_HEVC_DATA_H
+ 
+ #include <stdint.h>
+ 
+ extern const uint8_t ff_hevc_diag_scan4x4_x[16];
+ extern const uint8_t ff_hevc_diag_scan4x4_y[16];
+ extern const uint8_t ff_hevc_diag_scan8x8_x[64];
+ extern const uint8_t ff_hevc_diag_scan8x8_y[64];
+ 
+ #endif /* AVCODEC_HEVC_DATA_H */

diff --cc libavcodec/hevc_ps.c
index f9f04a5388ecf8b0333ca18540ce53ad86a17d0f,44db326cf32d394ab046f192b572fbfaa6a655ac..53ff8b2278d421a53e4b6ee26458c1440555862d
--- 1/libavcodec/hevc_ps.c
--- 2/libavcodec/hevc_ps.c
+++ b/libavcodec/hevc_ps.c
@@@ -24,8 -24,10 +24,9 @@@
   */
  
  #include "libavutil/imgutils.h"
 -
  #include "golomb.h"
  #include "hevcdec.h"
+ #include "hevc_data.h"
  
  static const uint8_t default_scaling_list_intra[] = {
      16, 16, 16, 16, 17, 18, 21, 24,

diff --cc libavcodec/hevcdec.c
Simple merge

diff --cc libavcodec/hevcdec.h
Simple merge

diff --cc libavcodec/vdpau_hevc.c
index c00e3b105e217114375b7c22ee85d63295219e7e,829945614c9f458186eafbb4deed6003124b6bc5..fcdf4b2747f26135b8d4735b2c3467b52b533b7a
--- 1/libavcodec/vdpau_hevc.c
--- 2/libavcodec/vdpau_hevc.c
+++ b/libavcodec/vdpau_hevc.c
@@@ -24,8 -24,8 +24,9 @@@
  
  #include "avcodec.h"
  #include "internal.h"
+ #include "hevc_data.h"
  #include "hevcdec.h"
 +#include "hwaccel.h"
  #include "vdpau.h"
  #include "vdpau_internal.h"