[FFmpeg-cvslog] hevc: rename hevc.[ch] to hevcdec.[ch]
Anton Khirnov
git at videolan.org
Thu Mar 23 17:50:11 EET 2017
ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Sun Aug 21 17:14:24 2016 +0200| [4abe3b049d987420eb891f74a35af2cebbf52144] | committer: Anton Khirnov
hevc: rename hevc.[ch] to hevcdec.[ch]
This is more consistent with the rest of libav and frees up the hevc.h
name for decoder-independent shared declarations.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4abe3b049d987420eb891f74a35af2cebbf52144
---
libavcodec/Makefile | 2 +-
libavcodec/dxva2_hevc.c | 2 +-
libavcodec/hevc_cabac.c | 2 +-
libavcodec/hevc_data.c | 2 +-
libavcodec/hevc_filter.c | 2 +-
libavcodec/hevc_mp4toannexb_bsf.c | 2 +-
libavcodec/hevc_mvs.c | 2 +-
libavcodec/hevc_parser.c | 2 +-
libavcodec/hevc_ps.c | 2 +-
libavcodec/hevc_ps_enc.c | 2 +-
libavcodec/hevc_refs.c | 2 +-
libavcodec/hevc_sei.c | 2 +-
libavcodec/{hevc.c => hevcdec.c} | 2 +-
libavcodec/{hevc.h => hevcdec.h} | 6 +++---
libavcodec/hevcdsp_template.c | 2 +-
libavcodec/hevcpred.c | 2 +-
libavcodec/hevcpred_template.c | 2 +-
libavcodec/qsvenc_hevc.c | 2 +-
libavcodec/vaapi_encode_h265.c | 2 +-
libavcodec/vdpau_hevc.c | 2 +-
libavformat/hevc.c | 2 +-
libavformat/hevcdec.c | 2 +-
22 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index bec461b..d4579f9 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 5bb10d6..53fd638 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 b01808f..eb16f57 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 f4b6096..7976c34 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 5037dae..4b71a89 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 8d7ac58..f364fbd 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 446b83a..90aff97 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 dc5fffc..b68ceb9 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 5c249d8..b7b2ea9 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 007a132..fdf9fb7 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 b51f259..3e056da 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 17cef67..37c8064 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
similarity index 99%
rename from libavcodec/hevc.c
rename to libavcodec/hevcdec.c
index e38d367..2afd638 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
similarity index 99%
rename from libavcodec/hevc.h
rename to libavcodec/hevcdec.h
index d15af71..ba261e6 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 cd55571..97ce34a 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 1ba2487..7342b7e 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 039882b..5fe3ea3 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 ddb2a42..24af82c 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 8715d30..4853a5b 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 1e5fb71..9f2baa7 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 c835f22..b3a3603 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 65a3cdf..75b2cd3 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"
More information about the ffmpeg-cvslog
mailing list