lavc: Rename hwaccel.h to hwconfig.h

This already applied to decoders as well as hwaccels, and adding encoder
support was going to make the name even more inaccurate.

diff --git a/libavcodec/cuviddec.c b/libavcodec/cuviddec.c
index 50dc8956c33698f8c4332f161f866f409ade3f4e..9477b8fd3a194c0535e92839c2ad40ae708e9147 100644 (file)
--- a/libavcodec/cuviddec.c
+++ b/libavcodec/cuviddec.c
@@ -33,7 +33,7 @@
 
 #include "avcodec.h"
 #include "decode.h"
-#include "hwaccel.h"
+#include "hwconfig.h"
 #include "nvdec.h"
 #include "internal.h"
 

diff --git a/libavcodec/decode.c b/libavcodec/decode.c
index d4bdb9b1c0acc8823ff833877caa41b261793800..2094095eca97290f6d52c1947b78df6e5c58aa63 100644 (file)
--- a/libavcodec/decode.c
+++ b/libavcodec/decode.c
@@ -41,7 +41,7 @@
 #include "avcodec.h"
 #include "bytestream.h"
 #include "decode.h"
-#include "hwaccel.h"
+#include "hwconfig.h"
 #include "internal.h"
 #include "thread.h"
 

diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c
index 8ee844e298e928d45abc21c87de96c97c8aeec29..31ac563f434258e42ea2a800537cccd3b5808234 100644 (file)
--- a/libavcodec/h263dec.c
+++ b/libavcodec/h263dec.c
@@ -33,7 +33,7 @@
 #include "flv.h"
 #include "h263.h"
 #include "h263_parser.h"
-#include "hwaccel.h"
+#include "hwconfig.h"
 #include "internal.h"
 #include "mpeg_er.h"
 #include "mpeg4video.h"

diff --git a/libavcodec/h264dec.c b/libavcodec/h264dec.c
index e374f32e91c45b71472314601cc65c1461869a33..4c355feb186834d65743c319bcda497e09eee3a2 100644 (file)
--- a/libavcodec/h264dec.c
+++ b/libavcodec/h264dec.c
@@ -46,7 +46,7 @@
 #include "h264_mvpred.h"
 #include "h264_ps.h"
 #include "golomb.h"
-#include "hwaccel.h"
+#include "hwconfig.h"
 #include "mathops.h"
 #include "me_cmp.h"
 #include "mpegutils.h"

diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c
index 36be83948ec3dd22370f9b2ed0dc9409d75f8173..78299f4b32a7c71423b3fab5e676af04bbfd5415 100644 (file)
--- a/libavcodec/hevcdec.c
+++ b/libavcodec/hevcdec.c
@@ -41,7 +41,7 @@
 #include "hevc_data.h"
 #include "hevc_parse.h"
 #include "hevcdec.h"
-#include "hwaccel.h"
+#include "hwconfig.h"
 #include "profiles.h"
 
 const uint8_t ff_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/hwaccel.h b/libavcodec/hwconfig.h
similarity index 97%
rename from libavcodec/hwaccel.h
rename to libavcodec/hwconfig.h
index 3aaa92571c4140634531b99d345f62ed9d9218f1..4199ffdd503b8d3fd2f52bde53b05540fcc0fd28 100644 (file)
--- a/libavcodec/hwaccel.h
+++ b/libavcodec/hwconfig.h
@@ -16,8 +16,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVCODEC_HWACCEL_H
-#define AVCODEC_HWACCEL_H
+#ifndef AVCODEC_HWCONFIG_H
+#define AVCODEC_HWCONFIG_H
 
 #include "avcodec.h"
 #include "hwaccels.h"
@@ -81,4 +81,4 @@ typedef struct AVCodecHWConfigInternal {
 #define HWACCEL_XVMC(codec) \
     HW_CONFIG_HWACCEL(0, 0, 1, XVMC,         NONE,         ff_ ## codec ## _xvmc_hwaccel)
 
-#endif /* AVCODEC_HWACCEL_H */
+#endif /* AVCODEC_HWCONFIG_H */

diff --git a/libavcodec/mediacodecdec.c b/libavcodec/mediacodecdec.c
index f5771bffb1f34140ae5bcfe96bb3fbb2683f74eb..25410021e83695492105fd1eedcce80fe610ea17 100644 (file)
--- a/libavcodec/mediacodecdec.c
+++ b/libavcodec/mediacodecdec.c
@@ -34,7 +34,7 @@
 #include "decode.h"
 #include "h264_parse.h"
 #include "hevc_parse.h"
-#include "hwaccel.h"
+#include "hwconfig.h"
 #include "internal.h"
 #include "mediacodec_wrapper.h"
 #include "mediacodecdec_common.h"

diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index d5e7c21610cc6f17847a7fdf9e434f82367d5e86..cb5e2a9b9b0b02ec62c847107efe9ba8808916fc 100644 (file)
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@@ -36,7 +36,7 @@
 #include "avcodec.h"
 #include "blockdsp.h"
 #include "copy_block.h"
-#include "hwaccel.h"
+#include "hwconfig.h"
 #include "idctdsp.h"
 #include "internal.h"
 #include "jpegtables.h"

diff --git a/libavcodec/mmaldec.c b/libavcodec/mmaldec.c
index 647a22ef7c07cc559de9f0d0ca2ad65d68cb7cf0..547bece5763fc62af433e0fe5fe1b29b4585fa44 100644 (file)
--- a/libavcodec/mmaldec.c
+++ b/libavcodec/mmaldec.c
@@ -34,7 +34,7 @@
 #include <stdatomic.h>
 
 #include "avcodec.h"
-#include "hwaccel.h"
+#include "hwconfig.h"
 #include "internal.h"
 #include "libavutil/avassert.h"
 #include "libavutil/buffer.h"

diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c
index 67ce59d451f5e4fb4878433cc064682348442b82..40d054def5b2c805ee3f8d7cd686f1f35a121a41 100644 (file)
--- a/libavcodec/mpeg12dec.c
+++ b/libavcodec/mpeg12dec.c
@@ -36,7 +36,7 @@
 #include "avcodec.h"
 #include "bytestream.h"
 #include "error_resilience.h"
-#include "hwaccel.h"
+#include "hwconfig.h"
 #include "idctdsp.h"
 #include "internal.h"
 #include "mpeg_er.h"

diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c
index bfb1f92b33455221f149eda3d300e5100ffce9b7..7e52bbef1b723b62f16e5244d101e304889888d0 100644 (file)
--- a/libavcodec/mpeg4videodec.c
+++ b/libavcodec/mpeg4videodec.c
@@ -26,7 +26,7 @@
 #include "libavutil/opt.h"
 #include "libavutil/pixdesc.h"
 #include "error_resilience.h"
-#include "hwaccel.h"
+#include "hwconfig.h"
 #include "idctdsp.h"
 #include "internal.h"
 #include "mpegutils.h"

diff --git a/libavcodec/pthread_frame.c b/libavcodec/pthread_frame.c
index 4cd890b2953b44e54848e08d0074472fd89e52d8..64121f5a9a58b5d73e692d86342429e8a39ba6f7 100644 (file)
--- a/libavcodec/pthread_frame.c
+++ b/libavcodec/pthread_frame.c
@@ -28,7 +28,7 @@
 #include <stdint.h>
 
 #include "avcodec.h"
-#include "hwaccel.h"
+#include "hwconfig.h"
 #include "internal.h"
 #include "pthread_internal.h"
 #include "thread.h"

diff --git a/libavcodec/qsvdec.h b/libavcodec/qsvdec.h
index dec1f61ceb0a0f029fbd42699737b983b0b5257e..cb948f516d1e25e559d60cde9649fb1da5772578 100644 (file)
--- a/libavcodec/qsvdec.h
+++ b/libavcodec/qsvdec.h
@@ -33,7 +33,7 @@
 #include "libavutil/pixfmt.h"
 
 #include "avcodec.h"
-#include "hwaccel.h"
+#include "hwconfig.h"
 #include "qsv_internal.h"
 
 typedef struct QSVContext {

diff --git a/libavcodec/rkmppdec.c b/libavcodec/rkmppdec.c
index 143d05bd51753253f52b564cf2b01f875aa5bee7..248020d5d6170b2eb824ed5aaf6a3f3aa6228b98 100644 (file)
--- a/libavcodec/rkmppdec.c
+++ b/libavcodec/rkmppdec.c
@@ -28,7 +28,7 @@
 
 #include "avcodec.h"
 #include "decode.h"
-#include "hwaccel.h"
+#include "hwconfig.h"
 #include "internal.h"
 #include "libavutil/buffer.h"
 #include "libavutil/common.h"

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 26c038dfd948bc62cd79ceacbd28f22e5520941f..e77090daefa99a450ffd8b14e4bd5064e49a5b61 100644 (file)
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -44,7 +44,7 @@
 #include "libavutil/thread.h"
 #include "avcodec.h"
 #include "decode.h"
-#include "hwaccel.h"
+#include "hwconfig.h"
 #include "libavutil/opt.h"
 #include "mpegvideo.h"
 #include "thread.h"

diff --git a/libavcodec/vaapi_h264.c b/libavcodec/vaapi_h264.c
index dd2a657160430e92327f7142ee06f2e713d27209..9332aa6f3106ad2446b88dc82852b1b5dd1ee172 100644 (file)
--- a/libavcodec/vaapi_h264.c
+++ b/libavcodec/vaapi_h264.c
@@ -22,7 +22,7 @@
 
 #include "h264dec.h"
 #include "h264_ps.h"
-#include "hwaccel.h"
+#include "hwconfig.h"
 #include "vaapi_decode.h"
 
 /**

diff --git a/libavcodec/vaapi_hevc.c b/libavcodec/vaapi_hevc.c
index d832b8cb0d87ad5de2fbd5ae782e98d848bcbae1..c83d481b905ab4a770f6a421f65bca2c2184f374 100644 (file)
--- a/libavcodec/vaapi_hevc.c
+++ b/libavcodec/vaapi_hevc.c
@@ -25,7 +25,7 @@
 
 #include "avcodec.h"
 #include "hevcdec.h"
-#include "hwaccel.h"
+#include "hwconfig.h"
 #include "vaapi_decode.h"
 #include "vaapi_hevc.h"
 #include "h265_profile_level.h"

diff --git a/libavcodec/vaapi_mjpeg.c b/libavcodec/vaapi_mjpeg.c
index 14e0206ae1fa3b4c02a5e64829230a68c18b5ab3..81582114b647fbeb9c8831c7b3821a652d0b054f 100644 (file)
--- a/libavcodec/vaapi_mjpeg.c
+++ b/libavcodec/vaapi_mjpeg.c
@@ -19,7 +19,7 @@
 #include <va/va.h>
 #include <va/va_dec_jpeg.h>
 
-#include "hwaccel.h"
+#include "hwconfig.h"
 #include "vaapi_decode.h"
 #include "mjpegdec.h"
 

diff --git a/libavcodec/vaapi_mpeg2.c b/libavcodec/vaapi_mpeg2.c
index aaed434c88372a8e4fdae934ec757bb9aadbae25..26e0cd827cb437c0838970a1309731665748b58e 100644 (file)
--- a/libavcodec/vaapi_mpeg2.c
+++ b/libavcodec/vaapi_mpeg2.c
@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "hwaccel.h"
+#include "hwconfig.h"
 #include "mpegutils.h"
 #include "mpegvideo.h"
 #include "internal.h"

diff --git a/libavcodec/vaapi_mpeg4.c b/libavcodec/vaapi_mpeg4.c
index 11860ff74742897115340017bfcc21c5c331c0f6..71e155154c1d8a84eea4a715961443dd6b1d14a1 100644 (file)
--- a/libavcodec/vaapi_mpeg4.c
+++ b/libavcodec/vaapi_mpeg4.c
@@ -21,7 +21,7 @@
  */
 
 #include "h263.h"
-#include "hwaccel.h"
+#include "hwconfig.h"
 #include "internal.h"
 #include "mpeg4video.h"
 #include "mpegvideo.h"

diff --git a/libavcodec/vaapi_vc1.c b/libavcodec/vaapi_vc1.c
index 921ca6391b67b2a0c2da4e80a853478e83cb1efa..4e9607d9be10a450d9ba4440b3a920fcb4d426b7 100644 (file)
--- a/libavcodec/vaapi_vc1.c
+++ b/libavcodec/vaapi_vc1.c
@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "hwaccel.h"
+#include "hwconfig.h"
 #include "internal.h"
 #include "vaapi_decode.h"
 #include "vc1.h"

diff --git a/libavcodec/vaapi_vp8.c b/libavcodec/vaapi_vp8.c
index 2426b30f13ca1898c188aa7d8362adb3dc10510b..06c23e760bfe0797f083416de97505651dd7efd9 100644 (file)
--- a/libavcodec/vaapi_vp8.c
+++ b/libavcodec/vaapi_vp8.c
@@ -19,7 +19,7 @@
 #include <va/va.h>
 #include <va/va_dec_vp8.h>
 
-#include "hwaccel.h"
+#include "hwconfig.h"
 #include "vaapi_decode.h"
 #include "vp8.h"
 

diff --git a/libavcodec/vaapi_vp9.c b/libavcodec/vaapi_vp9.c
index f384ba7873ad55f5bde8b2556f5bd39ce831f53e..776382f68378202abe62d10bcd36ce2de773f8f6 100644 (file)
--- a/libavcodec/vaapi_vp9.c
+++ b/libavcodec/vaapi_vp9.c
@@ -22,7 +22,7 @@
 
 #include "libavutil/pixdesc.h"
 
-#include "hwaccel.h"
+#include "hwconfig.h"
 #include "vaapi_decode.h"
 #include "vp9shared.h"
 

diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c
index 15783e3b8d557d4e4722a0f60a1f04c1256d715e..7809234ff79936061a08ce40b0fae190fa42ae19 100644 (file)
--- a/libavcodec/vc1dec.c
+++ b/libavcodec/vc1dec.c
@@ -29,7 +29,7 @@
 #include "avcodec.h"
 #include "blockdsp.h"
 #include "get_bits.h"
-#include "hwaccel.h"
+#include "hwconfig.h"
 #include "internal.h"
 #include "mpeg_er.h"
 #include "mpegvideo.h"

diff --git a/libavcodec/vdpau_h264.c b/libavcodec/vdpau_h264.c
index 2a260f76abae4b70d3ed3eec212f22b97b610519..5ba73dafd4d6ef8643ffb991918ad1b47bdb39cc 100644 (file)
--- a/libavcodec/vdpau_h264.c
+++ b/libavcodec/vdpau_h264.c
@@ -27,7 +27,7 @@
 #include "internal.h"
 #include "h264dec.h"
 #include "h264_ps.h"
-#include "hwaccel.h"
+#include "hwconfig.h"
 #include "mpegutils.h"
 #include "vdpau.h"
 #include "vdpau_internal.h"

diff --git a/libavcodec/vdpau_hevc.c b/libavcodec/vdpau_hevc.c
index 024ac6e2f22d661f494a5e46d4455c746b36e051..29cb2da0788fa4091cab7294c160b06557e38ba8 100644 (file)
--- a/libavcodec/vdpau_hevc.c
+++ b/libavcodec/vdpau_hevc.c
@@ -26,7 +26,7 @@
 #include "internal.h"
 #include "hevc_data.h"
 #include "hevcdec.h"
-#include "hwaccel.h"
+#include "hwconfig.h"
 #include "vdpau.h"
 #include "vdpau_internal.h"
 

diff --git a/libavcodec/vdpau_mpeg12.c b/libavcodec/vdpau_mpeg12.c
index d286e7e57da2d7549a085e067edb7aedf94c691b..72220ffb4ea9d995e5cfc019dc4ec70f7fe47555 100644 (file)
--- a/libavcodec/vdpau_mpeg12.c
+++ b/libavcodec/vdpau_mpeg12.c
@@ -24,7 +24,7 @@
 #include <vdpau/vdpau.h>
 
 #include "avcodec.h"
-#include "hwaccel.h"
+#include "hwconfig.h"
 #include "mpegvideo.h"
 #include "vdpau.h"
 #include "vdpau_internal.h"

diff --git a/libavcodec/vdpau_mpeg4.c b/libavcodec/vdpau_mpeg4.c
index 96f83026a8e4d2e719fa5a7ee5121b6cd8ba22f9..93b25beb1fe04dd9bafc86e74aa8a4917d1e15fe 100644 (file)
--- a/libavcodec/vdpau_mpeg4.c
+++ b/libavcodec/vdpau_mpeg4.c
@@ -24,7 +24,7 @@
 #include <vdpau/vdpau.h>
 
 #include "avcodec.h"
-#include "hwaccel.h"
+#include "hwconfig.h"
 #include "mpeg4video.h"
 #include "vdpau.h"
 #include "vdpau_internal.h"

diff --git a/libavcodec/vdpau_vc1.c b/libavcodec/vdpau_vc1.c
index 671baf96b4d7e1a489dbb192a029230b746f6597..96c91b58be0886e144800384e4a3665396981afc 100644 (file)
--- a/libavcodec/vdpau_vc1.c
+++ b/libavcodec/vdpau_vc1.c
@@ -24,7 +24,7 @@
 #include <vdpau/vdpau.h>
 
 #include "avcodec.h"
-#include "hwaccel.h"
+#include "hwconfig.h"
 #include "vc1.h"
 #include "vdpau.h"
 #include "vdpau_internal.h"

diff --git a/libavcodec/vdpau_vp9.c b/libavcodec/vdpau_vp9.c
index 54e060fad5d38d94c00a3d1b9b82acbe115f994e..a8609d647e39040d6d759d7bebf0de3f7960a5cd 100644 (file)
--- a/libavcodec/vdpau_vp9.c
+++ b/libavcodec/vdpau_vp9.c
@@ -26,7 +26,7 @@
 #include "internal.h"
 #include "vp9data.h"
 #include "vp9dec.h"
-#include "hwaccel.h"
+#include "hwconfig.h"
 #include "vdpau.h"
 #include "vdpau_internal.h"
 

diff --git a/libavcodec/vp8.c b/libavcodec/vp8.c
index 1794d6d0312cdccd700302058d4a245ada737795..bab4223aca112123498e65b201eb0a82142119ba 100644 (file)
--- a/libavcodec/vp8.c
+++ b/libavcodec/vp8.c
@@ -27,7 +27,7 @@
 #include "libavutil/imgutils.h"
 
 #include "avcodec.h"
-#include "hwaccel.h"
+#include "hwconfig.h"
 #include "internal.h"
 #include "mathops.h"
 #include "rectangle.h"

diff --git a/libavcodec/vp9.c b/libavcodec/vp9.c
index b356b24515ef435180508bb471fdd71ee5fcbfd0..d34cbf0040683bd275dc6aa4513f5b10f28ec18c 100644 (file)
--- a/libavcodec/vp9.c
+++ b/libavcodec/vp9.c
@@ -23,7 +23,7 @@
 
 #include "avcodec.h"
 #include "get_bits.h"
-#include "hwaccel.h"
+#include "hwconfig.h"
 #include "internal.h"
 #include "profiles.h"
 #include "thread.h"