Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--libavcodec/Makefile2
-rw-r--r--libavcodec/dxva2_hevc.c2
-rw-r--r--libavcodec/hevc_cabac.c2
-rw-r--r--libavcodec/hevc_data.c2
-rw-r--r--libavcodec/hevc_filter.c2
-rw-r--r--libavcodec/hevc_mp4toannexb_bsf.c2
-rw-r--r--libavcodec/hevc_mvs.c2
-rw-r--r--libavcodec/hevc_parser.c2
-rw-r--r--libavcodec/hevc_ps.c2
-rw-r--r--libavcodec/hevc_ps_enc.c2
-rw-r--r--libavcodec/hevc_refs.c2
-rw-r--r--libavcodec/hevc_sei.c2
-rw-r--r--libavcodec/hevcdec.c (renamed from libavcodec/hevc.c)2
-rw-r--r--libavcodec/hevcdec.h (renamed from libavcodec/hevc.h)6
-rw-r--r--libavcodec/hevcdsp_template.c2
-rw-r--r--libavcodec/hevcpred.c2
-rw-r--r--libavcodec/hevcpred_template.c2
-rw-r--r--libavcodec/qsvenc_hevc.c2
-rw-r--r--libavcodec/vaapi_encode_h265.c2
-rw-r--r--libavcodec/vdpau_hevc.c2
-rw-r--r--libavformat/hevc.c2
-rw-r--r--libavformat/hevcdec.c2
22 files changed, 24 insertions, 24 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index bec461b80c..d4579f9b97 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -264,7 +264,7 @@ OBJS-$(CONFIG_H264_QSV_ENCODER) += qsvenc_h264.o
OBJS-$(CONFIG_H264_VAAPI_ENCODER) += vaapi_encode_h264.o vaapi_encode_h26x.o
OBJS-$(CONFIG_HAP_DECODER) += hapdec.o hap.o
OBJS-$(CONFIG_HAP_ENCODER) += hapenc.o hap.o
-OBJS-$(CONFIG_HEVC_DECODER) += hevc.o hevc_mvs.o hevc_ps.o hevc_sei.o \
+OBJS-$(CONFIG_HEVC_DECODER) += hevcdec.o hevc_mvs.o hevc_ps.o hevc_sei.o \
hevc_cabac.o hevc_refs.o hevcpred.o \
hevcdsp.o hevc_filter.o h2645_parse.o hevc_data.o
OBJS-$(CONFIG_HEVC_NVENC_ENCODER) += nvenc_hevc.o
diff --git a/libavcodec/dxva2_hevc.c b/libavcodec/dxva2_hevc.c
index 5bb10d6916..53fd638d10 100644
--- a/libavcodec/dxva2_hevc.c
+++ b/libavcodec/dxva2_hevc.c
@@ -22,7 +22,7 @@
#include "libavutil/avassert.h"
-#include "hevc.h"
+#include "hevcdec.h"
// The headers above may include w32threads.h, which uses the original
// _WIN32_WINNT define, while dxva2_internal.h redefines it to target a
diff --git a/libavcodec/hevc_cabac.c b/libavcodec/hevc_cabac.c
index b01808fd84..eb16f57cd8 100644
--- a/libavcodec/hevc_cabac.c
+++ b/libavcodec/hevc_cabac.c
@@ -25,7 +25,7 @@
#include "libavutil/common.h"
#include "cabac_functions.h"
-#include "hevc.h"
+#include "hevcdec.h"
#define CABAC_MAX_BIN 31
diff --git a/libavcodec/hevc_data.c b/libavcodec/hevc_data.c
index f4b6096aec..7976c34156 100644
--- a/libavcodec/hevc_data.c
+++ b/libavcodec/hevc_data.c
@@ -20,7 +20,7 @@
#include <stdint.h>
-#include "hevc.h"
+#include "hevcdec.h"
const uint8_t ff_hevc_diag_scan4x4_x[16] = {
0, 0, 1, 0,
diff --git a/libavcodec/hevc_filter.c b/libavcodec/hevc_filter.c
index 5037dae7cd..4b71a89212 100644
--- a/libavcodec/hevc_filter.c
+++ b/libavcodec/hevc_filter.c
@@ -26,7 +26,7 @@
#include "libavutil/internal.h"
#include "cabac_functions.h"
-#include "hevc.h"
+#include "hevcdec.h"
#define LUMA 0
#define CB 1
diff --git a/libavcodec/hevc_mp4toannexb_bsf.c b/libavcodec/hevc_mp4toannexb_bsf.c
index 8d7ac58f19..f364fbd161 100644
--- a/libavcodec/hevc_mp4toannexb_bsf.c
+++ b/libavcodec/hevc_mp4toannexb_bsf.c
@@ -27,7 +27,7 @@
#include "avcodec.h"
#include "bsf.h"
#include "bytestream.h"
-#include "hevc.h"
+#include "hevcdec.h"
#define MIN_HEVCC_LENGTH 23
diff --git a/libavcodec/hevc_mvs.c b/libavcodec/hevc_mvs.c
index 446b83a762..90aff9758e 100644
--- a/libavcodec/hevc_mvs.c
+++ b/libavcodec/hevc_mvs.c
@@ -21,7 +21,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "hevc.h"
+#include "hevcdec.h"
static const uint8_t l0_l1_cand_idx[12][2] = {
{ 0, 1, },
diff --git a/libavcodec/hevc_parser.c b/libavcodec/hevc_parser.c
index dc5fffcb0b..b68ceb985e 100644
--- a/libavcodec/hevc_parser.c
+++ b/libavcodec/hevc_parser.c
@@ -23,7 +23,7 @@
#include "libavutil/common.h"
#include "golomb.h"
-#include "hevc.h"
+#include "hevcdec.h"
#include "h2645_parse.h"
#include "parser.h"
diff --git a/libavcodec/hevc_ps.c b/libavcodec/hevc_ps.c
index 5c249d88fc..b7b2ea9251 100644
--- a/libavcodec/hevc_ps.c
+++ b/libavcodec/hevc_ps.c
@@ -26,7 +26,7 @@
#include "libavutil/imgutils.h"
#include "golomb.h"
-#include "hevc.h"
+#include "hevcdec.h"
static const uint8_t default_scaling_list_intra[] = {
16, 16, 16, 16, 17, 18, 21, 24,
diff --git a/libavcodec/hevc_ps_enc.c b/libavcodec/hevc_ps_enc.c
index 007a1321ed..fdf9fb7f40 100644
--- a/libavcodec/hevc_ps_enc.c
+++ b/libavcodec/hevc_ps_enc.c
@@ -19,7 +19,7 @@
*/
#include "golomb.h"
-#include "hevc.h"
+#include "hevcdec.h"
#include "put_bits.h"
static void write_ptl_layer(PutBitContext *pb, PTLCommon *ptl)
diff --git a/libavcodec/hevc_refs.c b/libavcodec/hevc_refs.c
index b51f2594a1..3e056da0a9 100644
--- a/libavcodec/hevc_refs.c
+++ b/libavcodec/hevc_refs.c
@@ -26,7 +26,7 @@
#include "internal.h"
#include "thread.h"
-#include "hevc.h"
+#include "hevcdec.h"
void ff_hevc_unref_frame(HEVCContext *s, HEVCFrame *frame, int flags)
{
diff --git a/libavcodec/hevc_sei.c b/libavcodec/hevc_sei.c
index 17cef6743d..37c80647d6 100644
--- a/libavcodec/hevc_sei.c
+++ b/libavcodec/hevc_sei.c
@@ -23,7 +23,7 @@
*/
#include "golomb.h"
-#include "hevc.h"
+#include "hevcdec.h"
enum HEVC_SEI_TYPE {
SEI_TYPE_BUFFERING_PERIOD = 0,
diff --git a/libavcodec/hevc.c b/libavcodec/hevcdec.c
index e38d36711e..2afd638723 100644
--- a/libavcodec/hevc.c
+++ b/libavcodec/hevcdec.c
@@ -36,7 +36,7 @@
#include "bytestream.h"
#include "cabac_functions.h"
#include "golomb.h"
-#include "hevc.h"
+#include "hevcdec.h"
#include "profiles.h"
const uint8_t ff_hevc_qpel_extra_before[4] = { 0, 3, 3, 3 };
diff --git a/libavcodec/hevc.h b/libavcodec/hevcdec.h
index d15af71986..ba261e6fec 100644
--- a/libavcodec/hevc.h
+++ b/libavcodec/hevcdec.h
@@ -20,8 +20,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef AVCODEC_HEVC_H
-#define AVCODEC_HEVC_H
+#ifndef AVCODEC_HEVCDEC_H
+#define AVCODEC_HEVCDEC_H
#include <stddef.h>
#include <stdint.h>
@@ -1013,4 +1013,4 @@ 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_H */
+#endif /* AVCODEC_HEVCDEC_H */
diff --git a/libavcodec/hevcdsp_template.c b/libavcodec/hevcdsp_template.c
index cd55571290..97ce34a0ad 100644
--- a/libavcodec/hevcdsp_template.c
+++ b/libavcodec/hevcdsp_template.c
@@ -21,7 +21,7 @@
*/
#include "get_bits.h"
-#include "hevc.h"
+#include "hevcdec.h"
#include "bit_depth_template.c"
diff --git a/libavcodec/hevcpred.c b/libavcodec/hevcpred.c
index 1ba2487a62..7342b7e2ef 100644
--- a/libavcodec/hevcpred.c
+++ b/libavcodec/hevcpred.c
@@ -20,7 +20,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "hevc.h"
+#include "hevcdec.h"
#define BIT_DEPTH 8
#include "hevcpred_template.c"
diff --git a/libavcodec/hevcpred_template.c b/libavcodec/hevcpred_template.c
index 039882bb52..5fe3ea39ca 100644
--- a/libavcodec/hevcpred_template.c
+++ b/libavcodec/hevcpred_template.c
@@ -22,7 +22,7 @@
#include "libavutil/pixdesc.h"
-#include "hevc.h"
+#include "hevcdec.h"
#include "bit_depth_template.c"
diff --git a/libavcodec/qsvenc_hevc.c b/libavcodec/qsvenc_hevc.c
index ddb2a42ed6..24af82c8c5 100644
--- a/libavcodec/qsvenc_hevc.c
+++ b/libavcodec/qsvenc_hevc.c
@@ -30,7 +30,7 @@
#include "avcodec.h"
#include "bytestream.h"
#include "get_bits.h"
-#include "hevc.h"
+#include "hevcdec.h"
#include "h2645_parse.h"
#include "internal.h"
#include "qsv.h"
diff --git a/libavcodec/vaapi_encode_h265.c b/libavcodec/vaapi_encode_h265.c
index 8715d307dc..4853a5bbeb 100644
--- a/libavcodec/vaapi_encode_h265.c
+++ b/libavcodec/vaapi_encode_h265.c
@@ -25,7 +25,7 @@
#include "libavutil/pixfmt.h"
#include "avcodec.h"
-#include "hevc.h"
+#include "hevcdec.h"
#include "internal.h"
#include "put_bits.h"
#include "vaapi_encode.h"
diff --git a/libavcodec/vdpau_hevc.c b/libavcodec/vdpau_hevc.c
index 1e5fb71cce..9f2baa75b1 100644
--- a/libavcodec/vdpau_hevc.c
+++ b/libavcodec/vdpau_hevc.c
@@ -24,7 +24,7 @@
#include "avcodec.h"
#include "internal.h"
-#include "hevc.h"
+#include "hevcdec.h"
#include "vdpau.h"
#include "vdpau_internal.h"
diff --git a/libavformat/hevc.c b/libavformat/hevc.c
index c835f2243e..b3a3603c0e 100644
--- a/libavformat/hevc.c
+++ b/libavformat/hevc.c
@@ -20,7 +20,7 @@
#include "libavcodec/get_bits.h"
#include "libavcodec/golomb.h"
-#include "libavcodec/hevc.h"
+#include "libavcodec/hevcdec.h"
#include "libavutil/intreadwrite.h"
#include "avc.h"
#include "avio.h"
diff --git a/libavformat/hevcdec.c b/libavformat/hevcdec.c
index 65a3cdfb3c..75b2cd3916 100644
--- a/libavformat/hevcdec.c
+++ b/libavformat/hevcdec.c
@@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "libavcodec/hevc.h"
+#include "libavcodec/hevcdec.h"
#include "avformat.h"
#include "rawdec.h"
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-18 16:37:10 +0300