Commit 2594f6a3 authored by Mark Thompson's avatar Mark Thompson

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.
parent 588114ce
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
#include "avcodec.h" #include "avcodec.h"
#include "decode.h" #include "decode.h"
#include "hwaccel.h" #include "hwconfig.h"
#include "nvdec.h" #include "nvdec.h"
#include "internal.h" #include "internal.h"
......
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
#include "avcodec.h" #include "avcodec.h"
#include "bytestream.h" #include "bytestream.h"
#include "decode.h" #include "decode.h"
#include "hwaccel.h" #include "hwconfig.h"
#include "internal.h" #include "internal.h"
#include "thread.h" #include "thread.h"
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
#include "flv.h" #include "flv.h"
#include "h263.h" #include "h263.h"
#include "h263_parser.h" #include "h263_parser.h"
#include "hwaccel.h" #include "hwconfig.h"
#include "internal.h" #include "internal.h"
#include "mpeg_er.h" #include "mpeg_er.h"
#include "mpeg4video.h" #include "mpeg4video.h"
......
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
#include "h264_mvpred.h" #include "h264_mvpred.h"
#include "h264_ps.h" #include "h264_ps.h"
#include "golomb.h" #include "golomb.h"
#include "hwaccel.h" #include "hwconfig.h"
#include "mathops.h" #include "mathops.h"
#include "me_cmp.h" #include "me_cmp.h"
#include "mpegutils.h" #include "mpegutils.h"
......
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
#include "hevc_data.h" #include "hevc_data.h"
#include "hevc_parse.h" #include "hevc_parse.h"
#include "hevcdec.h" #include "hevcdec.h"
#include "hwaccel.h" #include "hwconfig.h"
#include "profiles.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 }; 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 };
......
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#ifndef AVCODEC_HWACCEL_H #ifndef AVCODEC_HWCONFIG_H
#define AVCODEC_HWACCEL_H #define AVCODEC_HWCONFIG_H
#include "avcodec.h" #include "avcodec.h"
#include "hwaccels.h" #include "hwaccels.h"
...@@ -81,4 +81,4 @@ typedef struct AVCodecHWConfigInternal { ...@@ -81,4 +81,4 @@ typedef struct AVCodecHWConfigInternal {
#define HWACCEL_XVMC(codec) \ #define HWACCEL_XVMC(codec) \
HW_CONFIG_HWACCEL(0, 0, 1, XVMC, NONE, ff_ ## codec ## _xvmc_hwaccel) HW_CONFIG_HWACCEL(0, 0, 1, XVMC, NONE, ff_ ## codec ## _xvmc_hwaccel)
#endif /* AVCODEC_HWACCEL_H */ #endif /* AVCODEC_HWCONFIG_H */
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
#include "decode.h" #include "decode.h"
#include "h264_parse.h" #include "h264_parse.h"
#include "hevc_parse.h" #include "hevc_parse.h"
#include "hwaccel.h" #include "hwconfig.h"
#include "internal.h" #include "internal.h"
#include "mediacodec_wrapper.h" #include "mediacodec_wrapper.h"
#include "mediacodecdec_common.h" #include "mediacodecdec_common.h"
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
#include "avcodec.h" #include "avcodec.h"
#include "blockdsp.h" #include "blockdsp.h"
#include "copy_block.h" #include "copy_block.h"
#include "hwaccel.h" #include "hwconfig.h"
#include "idctdsp.h" #include "idctdsp.h"
#include "internal.h" #include "internal.h"
#include "jpegtables.h" #include "jpegtables.h"
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
#include <stdatomic.h> #include <stdatomic.h>
#include "avcodec.h" #include "avcodec.h"
#include "hwaccel.h" #include "hwconfig.h"
#include "internal.h" #include "internal.h"
#include "libavutil/avassert.h" #include "libavutil/avassert.h"
#include "libavutil/buffer.h" #include "libavutil/buffer.h"
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
#include "avcodec.h" #include "avcodec.h"
#include "bytestream.h" #include "bytestream.h"
#include "error_resilience.h" #include "error_resilience.h"
#include "hwaccel.h" #include "hwconfig.h"
#include "idctdsp.h" #include "idctdsp.h"
#include "internal.h" #include "internal.h"
#include "mpeg_er.h" #include "mpeg_er.h"
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#include "libavutil/opt.h" #include "libavutil/opt.h"
#include "libavutil/pixdesc.h" #include "libavutil/pixdesc.h"
#include "error_resilience.h" #include "error_resilience.h"
#include "hwaccel.h" #include "hwconfig.h"
#include "idctdsp.h" #include "idctdsp.h"
#include "internal.h" #include "internal.h"
#include "mpegutils.h" #include "mpegutils.h"
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
#include <stdint.h> #include <stdint.h>
#include "avcodec.h" #include "avcodec.h"
#include "hwaccel.h" #include "hwconfig.h"
#include "internal.h" #include "internal.h"
#include "pthread_internal.h" #include "pthread_internal.h"
#include "thread.h" #include "thread.h"
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
#include "libavutil/pixfmt.h" #include "libavutil/pixfmt.h"
#include "avcodec.h" #include "avcodec.h"
#include "hwaccel.h" #include "hwconfig.h"
#include "qsv_internal.h" #include "qsv_internal.h"
typedef struct QSVContext { typedef struct QSVContext {
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
#include "avcodec.h" #include "avcodec.h"
#include "decode.h" #include "decode.h"
#include "hwaccel.h" #include "hwconfig.h"
#include "internal.h" #include "internal.h"
#include "libavutil/buffer.h" #include "libavutil/buffer.h"
#include "libavutil/common.h" #include "libavutil/common.h"
......
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
#include "libavutil/thread.h" #include "libavutil/thread.h"
#include "avcodec.h" #include "avcodec.h"
#include "decode.h" #include "decode.h"
#include "hwaccel.h" #include "hwconfig.h"
#include "libavutil/opt.h" #include "libavutil/opt.h"
#include "mpegvideo.h" #include "mpegvideo.h"
#include "thread.h" #include "thread.h"
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#include "h264dec.h" #include "h264dec.h"
#include "h264_ps.h" #include "h264_ps.h"
#include "hwaccel.h" #include "hwconfig.h"
#include "vaapi_decode.h" #include "vaapi_decode.h"
/** /**
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#include "avcodec.h" #include "avcodec.h"
#include "hevcdec.h" #include "hevcdec.h"
#include "hwaccel.h" #include "hwconfig.h"
#include "vaapi_decode.h" #include "vaapi_decode.h"
#include "vaapi_hevc.h" #include "vaapi_hevc.h"
#include "h265_profile_level.h" #include "h265_profile_level.h"
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#include <va/va.h> #include <va/va.h>
#include <va/va_dec_jpeg.h> #include <va/va_dec_jpeg.h>
#include "hwaccel.h" #include "hwconfig.h"
#include "vaapi_decode.h" #include "vaapi_decode.h"
#include "mjpegdec.h" #include "mjpegdec.h"
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "hwaccel.h" #include "hwconfig.h"
#include "mpegutils.h" #include "mpegutils.h"
#include "mpegvideo.h" #include "mpegvideo.h"
#include "internal.h" #include "internal.h"
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
*/ */
#include "h263.h" #include "h263.h"
#include "hwaccel.h" #include "hwconfig.h"
#include "internal.h" #include "internal.h"
#include "mpeg4video.h" #include "mpeg4video.h"
#include "mpegvideo.h" #include "mpegvideo.h"
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "hwaccel.h" #include "hwconfig.h"
#include "internal.h" #include "internal.h"
#include "vaapi_decode.h" #include "vaapi_decode.h"
#include "vc1.h" #include "vc1.h"
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#include <va/va.h> #include <va/va.h>
#include <va/va_dec_vp8.h> #include <va/va_dec_vp8.h>
#include "hwaccel.h" #include "hwconfig.h"
#include "vaapi_decode.h" #include "vaapi_decode.h"
#include "vp8.h" #include "vp8.h"
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#include "libavutil/pixdesc.h" #include "libavutil/pixdesc.h"
#include "hwaccel.h" #include "hwconfig.h"
#include "vaapi_decode.h" #include "vaapi_decode.h"
#include "vp9shared.h" #include "vp9shared.h"
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#include "avcodec.h" #include "avcodec.h"
#include "blockdsp.h" #include "blockdsp.h"
#include "get_bits.h" #include "get_bits.h"
#include "hwaccel.h" #include "hwconfig.h"
#include "internal.h" #include "internal.h"
#include "mpeg_er.h" #include "mpeg_er.h"
#include "mpegvideo.h" #include "mpegvideo.h"
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
#include "internal.h" #include "internal.h"
#include "h264dec.h" #include "h264dec.h"
#include "h264_ps.h" #include "h264_ps.h"
#include "hwaccel.h" #include "hwconfig.h"
#include "mpegutils.h" #include "mpegutils.h"
#include "vdpau.h" #include "vdpau.h"
#include "vdpau_internal.h" #include "vdpau_internal.h"
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#include "internal.h" #include "internal.h"
#include "hevc_data.h" #include "hevc_data.h"
#include "hevcdec.h" #include "hevcdec.h"
#include "hwaccel.h" #include "hwconfig.h"
#include "vdpau.h" #include "vdpau.h"
#include "vdpau_internal.h" #include "vdpau_internal.h"
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#include <vdpau/vdpau.h> #include <vdpau/vdpau.h>
#include "avcodec.h" #include "avcodec.h"
#include "hwaccel.h" #include "hwconfig.h"
#include "mpegvideo.h" #include "mpegvideo.h"
#include "vdpau.h" #include "vdpau.h"
#include "vdpau_internal.h" #include "vdpau_internal.h"
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#include <vdpau/vdpau.h> #include <vdpau/vdpau.h>
#include "avcodec.h" #include "avcodec.h"
#include "hwaccel.h" #include "hwconfig.h"
#include "mpeg4video.h" #include "mpeg4video.h"
#include "vdpau.h" #include "vdpau.h"
#include "vdpau_internal.h" #include "vdpau_internal.h"
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#include <vdpau/vdpau.h> #include <vdpau/vdpau.h>
#include "avcodec.h" #include "avcodec.h"
#include "hwaccel.h" #include "hwconfig.h"
#include "vc1.h" #include "vc1.h"
#include "vdpau.h" #include "vdpau.h"
#include "vdpau_internal.h" #include "vdpau_internal.h"
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#include "internal.h" #include "internal.h"
#include "vp9data.h" #include "vp9data.h"
#include "vp9dec.h" #include "vp9dec.h"
#include "hwaccel.h" #include "hwconfig.h"
#include "vdpau.h" #include "vdpau.h"
#include "vdpau_internal.h" #include "vdpau_internal.h"
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
#include "libavutil/imgutils.h" #include "libavutil/imgutils.h"
#include "avcodec.h" #include "avcodec.h"
#include "hwaccel.h" #include "hwconfig.h"
#include "internal.h" #include "internal.h"
#include "mathops.h" #include "mathops.h"
#include "rectangle.h" #include "rectangle.h"
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
#include "avcodec.h" #include "avcodec.h"
#include "get_bits.h" #include "get_bits.h"
#include "hwaccel.h" #include "hwconfig.h"
#include "internal.h" #include "internal.h"
#include "profiles.h" #include "profiles.h"
#include "thread.h" #include "thread.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment