This is an automated email from the git hooks/post-receive script.
Git pushed a commit to branch master
in repository ffmpeg.
The following commit(s) were added to refs/heads/master by this push:
new 2797dad735 hevc: qualify libavcodec include paths
2797dad735 is described below
commit 2797dad73559c1597d3e69ddf9f5ed33467a95c3
Author: Andrew Kelley <[email protected]>
AuthorDate: Thu Jun 11 21:53:18 2026 -0700
Commit: Lynne <[email protected]>
CommitDate: Sat Jun 13 05:48:44 2026 +0000
hevc: qualify libavcodec include paths
Removes the special -I flag specified in the avcodec/hevc/ subdirectory.
This makes code copy-pastable to other parts of the ffmpeg codebase, as
well as simplifying the build script.
It also reduces ambiguity, since there are many instances of same-named
header files existing in both libavformat/ and libavcodec/
subdirectories.
Follows: b29bdd3715aee323783030dfa09c6e6836307720
---
libavcodec/hevc/Makefile | 3 ---
libavcodec/hevc/cabac.c | 2 +-
libavcodec/hevc/dsp_template.c | 10 +++++-----
libavcodec/hevc/filter.c | 2 +-
libavcodec/hevc/hevcdec.c | 31 ++++++++++++++++---------------
libavcodec/hevc/mvs.c | 2 +-
libavcodec/hevc/parse.c | 4 ++--
libavcodec/hevc/parser.c | 9 +++++----
libavcodec/hevc/pred.c | 8 ++++----
libavcodec/hevc/pred_template.c | 2 +-
libavcodec/hevc/ps.c | 9 +++++----
libavcodec/hevc/ps_enc.c | 4 ++--
libavcodec/hevc/refs.c | 6 +++---
libavcodec/hevc/sei.c | 4 ++--
14 files changed, 48 insertions(+), 48 deletions(-)
diff --git a/libavcodec/hevc/Makefile b/libavcodec/hevc/Makefile
index 93ed4213f6..87d6393747 100644
--- a/libavcodec/hevc/Makefile
+++ b/libavcodec/hevc/Makefile
@@ -23,6 +23,3 @@ OBJS-$(CONFIG_HEVCPARSE) += \
OBJS-$(CONFIG_HEVC_SEI) += \
hevc/sei.o \
-
-
-libavcodec/hevc/%.o: CPPFLAGS += -I$(SRC_PATH)/libavcodec/
diff --git a/libavcodec/hevc/cabac.c b/libavcodec/hevc/cabac.c
index 55d5741f87..f6bde3028f 100644
--- a/libavcodec/hevc/cabac.c
+++ b/libavcodec/hevc/cabac.c
@@ -24,7 +24,7 @@
#include "libavutil/attributes.h"
#include "libavutil/common.h"
-#include "cabac_functions.h"
+#include "libavcodec/cabac_functions.h"
#include "data.h"
#include "hevc.h"
#include "hevcdec.h"
diff --git a/libavcodec/hevc/dsp_template.c b/libavcodec/hevc/dsp_template.c
index e7b21127ba..d902a0ca6b 100644
--- a/libavcodec/hevc/dsp_template.c
+++ b/libavcodec/hevc/dsp_template.c
@@ -20,13 +20,13 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "get_bits.h"
+#include "libavcodec/get_bits.h"
#include "hevcdec.h"
-#include "bit_depth_template.c"
+#include "libavcodec/bit_depth_template.c"
#include "dsp.h"
-#include "h26x/h2656_sao_template.c"
-#include "h26x/h2656_inter_template.c"
+#include "libavcodec/h26x/h2656_sao_template.c"
+#include "libavcodec/h26x/h2656_inter_template.c"
static void FUNC(put_pcm)(uint8_t *_dst, ptrdiff_t stride, int width, int
height,
GetBitContext *gb, int pcm_bit_depth)
@@ -836,7 +836,7 @@ static void FUNC(put_hevc_epel_bi_w_hv)(uint8_t *_dst,
ptrdiff_t _dststride,
#define TQ2 pix[2 * xstride + 3 * ystride]
#define TQ3 pix[3 * xstride + 3 * ystride]
-#include "h26x/h2656_deblock_template.c"
+#include "libavcodec/h26x/h2656_deblock_template.c"
static void FUNC(hevc_loop_filter_luma)(uint8_t *_pix,
ptrdiff_t _xstride, ptrdiff_t _ystride,
diff --git a/libavcodec/hevc/filter.c b/libavcodec/hevc/filter.c
index 68ae0e9ef6..e897ad5d58 100644
--- a/libavcodec/hevc/filter.c
+++ b/libavcodec/hevc/filter.c
@@ -26,7 +26,7 @@
#include "libavutil/internal.h"
#include "hevcdec.h"
-#include "progressframe.h"
+#include "libavcodec/progressframe.h"
#define LUMA 0
#define CB 1
diff --git a/libavcodec/hevc/hevcdec.c b/libavcodec/hevc/hevcdec.c
index dfd6203dac..304c7447ca 100644
--- a/libavcodec/hevc/hevcdec.c
+++ b/libavcodec/hevc/hevcdec.c
@@ -38,25 +38,26 @@
#include "libavutil/stereo3d.h"
#include "libavutil/tdrdi.h"
#include "libavutil/timecode.h"
+#include "libavutil/refstruct.h"
+
+#include "libavcodec/aom_film_grain.h"
+#include "libavcodec/bswapdsp.h"
+#include "libavcodec/cabac_functions.h"
+#include "libavcodec/codec_internal.h"
+#include "libavcodec/decode.h"
+#include "libavcodec/golomb.h"
+#include "libavcodec/h274.h"
+#include "libavcodec/hwaccel_internal.h"
+#include "libavcodec/hwconfig.h"
+#include "libavcodec/internal.h"
+#include "libavcodec/profiles.h"
+#include "libavcodec/progressframe.h"
+#include "libavcodec/thread.h"
+#include "libavcodec/threadprogress.h"
-#include "aom_film_grain.h"
-#include "bswapdsp.h"
-#include "cabac_functions.h"
-#include "codec_internal.h"
-#include "decode.h"
-#include "golomb.h"
-#include "h274.h"
#include "hevc.h"
#include "parse.h"
#include "hevcdec.h"
-#include "hwaccel_internal.h"
-#include "hwconfig.h"
-#include "internal.h"
-#include "profiles.h"
-#include "progressframe.h"
-#include "libavutil/refstruct.h"
-#include "thread.h"
-#include "threadprogress.h"
static const uint8_t hevc_pel_weight[65] = { [2] = 0, [4] = 1, [6] = 2, [8] =
3, [12] = 4, [16] = 5, [24] = 6, [32] = 7, [48] = 8, [64] = 9 };
diff --git a/libavcodec/hevc/mvs.c b/libavcodec/hevc/mvs.c
index 55f115ad0c..61c9e4e086 100644
--- a/libavcodec/hevc/mvs.c
+++ b/libavcodec/hevc/mvs.c
@@ -23,7 +23,7 @@
#include "hevc.h"
#include "hevcdec.h"
-#include "progressframe.h"
+#include "libavcodec/progressframe.h"
static const uint8_t l0_l1_cand_idx[12][2] = {
{ 0, 1, },
diff --git a/libavcodec/hevc/parse.c b/libavcodec/hevc/parse.c
index 29f21a5966..2f519380fb 100644
--- a/libavcodec/hevc/parse.c
+++ b/libavcodec/hevc/parse.c
@@ -16,8 +16,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "bytestream.h"
-#include "h2645_parse.h"
+#include "libavcodec/bytestream.h"
+#include "libavcodec/h2645_parse.h"
#include "hevc.h"
#include "parse.h"
diff --git a/libavcodec/hevc/parser.c b/libavcodec/hevc/parser.c
index 62bcd91172..47a1ac70d0 100644
--- a/libavcodec/hevc/parser.c
+++ b/libavcodec/hevc/parser.c
@@ -23,14 +23,15 @@
#include "libavutil/common.h"
#include "libavutil/mem.h"
-#include "golomb.h"
+#include "libavcodec/golomb.h"
+#include "libavcodec/parser_internal.h"
+#include "libavcodec/h2645_parse.h"
+#include "libavcodec/parser.h"
+
#include "hevc.h"
-#include "parser_internal.h"
#include "parse.h"
#include "ps.h"
#include "sei.h"
-#include "h2645_parse.h"
-#include "parser.h"
#define START_CODE 0x000001 ///< start_code_prefix_one_3bytes
diff --git a/libavcodec/hevc/pred.c b/libavcodec/hevc/pred.c
index f8131b1e8c..037cbc413f 100644
--- a/libavcodec/hevc/pred.c
+++ b/libavcodec/hevc/pred.c
@@ -25,19 +25,19 @@
#include "pred.h"
#define BIT_DEPTH 8
-#include "pred_template.c"
+#include "libavcodec/hevc/pred_template.c"
#undef BIT_DEPTH
#define BIT_DEPTH 9
-#include "pred_template.c"
+#include "libavcodec/hevc/pred_template.c"
#undef BIT_DEPTH
#define BIT_DEPTH 10
-#include "pred_template.c"
+#include "libavcodec/hevc/pred_template.c"
#undef BIT_DEPTH
#define BIT_DEPTH 12
-#include "pred_template.c"
+#include "libavcodec/hevc/pred_template.c"
#undef BIT_DEPTH
void ff_hevc_pred_init(HEVCPredContext *hpc, int bit_depth)
diff --git a/libavcodec/hevc/pred_template.c b/libavcodec/hevc/pred_template.c
index 6f2d934a7b..9b27e53966 100644
--- a/libavcodec/hevc/pred_template.c
+++ b/libavcodec/hevc/pred_template.c
@@ -22,7 +22,7 @@
#include "libavutil/pixdesc.h"
-#include "bit_depth_template.c"
+#include "libavcodec/bit_depth_template.c"
#include "pred.h"
static void FUNC(ref_filter_3tap)(uint8_t *filtered_left,
diff --git a/libavcodec/hevc/ps.c b/libavcodec/hevc/ps.c
index 9875893ad0..8884192375 100644
--- a/libavcodec/hevc/ps.c
+++ b/libavcodec/hevc/ps.c
@@ -25,12 +25,13 @@
#include "libavutil/imgutils.h"
#include "libavutil/mem.h"
-#include "golomb.h"
-#include "h2645_vui.h"
+#include "libavutil/refstruct.h"
+
+#include "libavcodec/golomb.h"
+#include "libavcodec/h2645_vui.h"
#include "data.h"
#include "ps.h"
-#include "profiles.h"
-#include "libavutil/refstruct.h"
+#include "libavcodec/profiles.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 7fbcb3ba4e..4e44f849ba 100644
--- a/libavcodec/hevc/ps_enc.c
+++ b/libavcodec/hevc/ps_enc.c
@@ -18,9 +18,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "put_golomb.h"
+#include "libavcodec/put_golomb.h"
#include "ps.h"
-#include "put_bits.h"
+#include "libavcodec/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 653239c7bb..2acffd72d9 100644
--- a/libavcodec/hevc/refs.c
+++ b/libavcodec/hevc/refs.c
@@ -25,11 +25,11 @@
#include "libavutil/mem.h"
#include "libavutil/stereo3d.h"
-#include "decode.h"
+#include "libavcodec/decode.h"
#include "hevc.h"
#include "hevcdec.h"
-#include "progressframe.h"
-#include "thread.h"
+#include "libavcodec/progressframe.h"
+#include "libavcodec/thread.h"
#include "libavutil/refstruct.h"
void ff_hevc_unref_frame(HEVCFrame *frame, int flags)
diff --git a/libavcodec/hevc/sei.c b/libavcodec/hevc/sei.c
index e12803f1d3..83c726a217 100644
--- a/libavcodec/hevc/sei.c
+++ b/libavcodec/hevc/sei.c
@@ -22,8 +22,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "bytestream.h"
-#include "golomb.h"
+#include "libavcodec/bytestream.h"
+#include "libavcodec/golomb.h"
#include "ps.h"
#include "sei.h"
_______________________________________________
ffmpeg-cvslog mailing list -- [email protected]
To unsubscribe send an email to [email protected]
