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.
5 years ago · 2594f6a362
parent 588114cea4
commit 2594f6a362
32 changed files with 34 additions and 34 deletions
--- 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"

--- 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"

--- 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"
--- 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"
--- 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 };
--- a/libavcodec/hwconfig.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 */
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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 {
--- 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"
--- 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"
--- 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"

 /**
--- 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"
--- 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"

--- 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"
--- 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"
--- 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"
--- 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"

--- 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"

--- 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"
--- 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"
--- 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"

--- 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"
--- 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"
--- 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"
--- 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"

--- 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"
--- 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"