diff options
author | Anton Khirnov <anton@khirnov.net> | 2016-10-12 11:21:35 +0300 |
---|---|---|
committer | Anton Khirnov <anton@khirnov.net> | 2016-10-16 21:26:40 +0300 |
commit | 150c896a9e46b23b97debb0a5f66fbaeaa32f153 (patch) | |
tree | 22901bd9e41dd42a8187e86c0550b76941f8b817 /libavcodec | |
parent | 645c6ff4231a75a71db58c8e6d06346068d2f949 (diff) |
hevcdec: split ff_hevc_diag_scan* declarations into a separate header
This will be useful in the following commits.
Diffstat (limited to 'libavcodec')
-rw-r--r-- | libavcodec/dxva2_hevc.c | 1 | ||||
-rw-r--r-- | libavcodec/hevc_data.c | 2 | ||||
-rw-r--r-- | libavcodec/hevc_data.h | 31 | ||||
-rw-r--r-- | libavcodec/hevc_ps.c | 1 | ||||
-rw-r--r-- | libavcodec/hevcdec.c | 1 | ||||
-rw-r--r-- | libavcodec/hevcdec.h | 5 | ||||
-rw-r--r-- | libavcodec/vdpau_hevc.c | 1 |
7 files changed, 36 insertions, 6 deletions
diff --git a/libavcodec/dxva2_hevc.c b/libavcodec/dxva2_hevc.c index 53fd638d10..673fada6e6 100644 --- a/libavcodec/dxva2_hevc.c +++ b/libavcodec/dxva2_hevc.c @@ -22,6 +22,7 @@ #include "libavutil/avassert.h" +#include "hevc_data.h" #include "hevcdec.h" // The headers above may include w32threads.h, which uses the original diff --git a/libavcodec/hevc_data.c b/libavcodec/hevc_data.c index 7976c34156..ff9548fc6b 100644 --- a/libavcodec/hevc_data.c +++ b/libavcodec/hevc_data.c @@ -20,7 +20,7 @@ #include <stdint.h> -#include "hevcdec.h" +#include "hevc_data.h" const uint8_t ff_hevc_diag_scan4x4_x[16] = { 0, 0, 1, 0, diff --git a/libavcodec/hevc_data.h b/libavcodec/hevc_data.h new file mode 100644 index 0000000000..d1d2c33411 --- /dev/null +++ b/libavcodec/hevc_data.h @@ -0,0 +1,31 @@ +/* + * HEVC shared data tables + * + * This file is part of Libav. + * + * Libav 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. + * + * Libav 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 Libav; 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 --git a/libavcodec/hevc_ps.c b/libavcodec/hevc_ps.c index 520017bc6e..44db326cf3 100644 --- a/libavcodec/hevc_ps.c +++ b/libavcodec/hevc_ps.c @@ -27,6 +27,7 @@ #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 --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c index 1da43344a4..93eb95a265 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -37,6 +37,7 @@ #include "cabac_functions.h" #include "golomb.h" #include "hevc.h" +#include "hevc_data.h" #include "hevcdec.h" #include "profiles.h" diff --git a/libavcodec/hevcdec.h b/libavcodec/hevcdec.h index 95662234c1..b4502c0ad8 100644 --- a/libavcodec/hevcdec.h +++ b/libavcodec/hevcdec.h @@ -966,9 +966,4 @@ extern const uint8_t ff_hevc_qpel_extra_before[4]; extern const uint8_t ff_hevc_qpel_extra_after[4]; extern const uint8_t ff_hevc_qpel_extra[4]; -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_HEVCDEC_H */ diff --git a/libavcodec/vdpau_hevc.c b/libavcodec/vdpau_hevc.c index 9f2baa75b1..829945614c 100644 --- a/libavcodec/vdpau_hevc.c +++ b/libavcodec/vdpau_hevc.c @@ -24,6 +24,7 @@ #include "avcodec.h" #include "internal.h" +#include "hevc_data.h" #include "hevcdec.h" #include "vdpau.h" #include "vdpau_internal.h" |