Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

lavc: Mark all AVHWAccel structures as const

Browse Source
pull/272/head
Mark Thompson 7 years ago
parent da4e02b196
commit 3a71bcc213
29 changed files with 104 additions and 101 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      doc/APIchanges
  2. 2
      libavcodec/avcodec.h
  3. 2
      libavcodec/decode.c
  4. 6
      libavcodec/dxva2_h264.c
  5. 6
      libavcodec/dxva2_hevc.c
  6. 6
      libavcodec/dxva2_mpeg2.c
  7. 12
      libavcodec/dxva2_vc1.c
  8. 6
      libavcodec/dxva2_vp9.c
  9. 98
      libavcodec/hwaccels.h
  10. 4
      libavcodec/mpegvideo_xvmc.c
  11. 2
      libavcodec/nvdec_h264.c
  12. 2
      libavcodec/nvdec_hevc.c
  13. 4
      libavcodec/nvdec_mpeg12.c
  14. 2
      libavcodec/nvdec_mpeg4.c
  15. 4
      libavcodec/nvdec_vc1.c
  16. 2
      libavcodec/nvdec_vp9.c
  17. 2
      libavcodec/vaapi_h264.c
  18. 2
      libavcodec/vaapi_hevc.c
  19. 2
      libavcodec/vaapi_mpeg2.c
  20. 4
      libavcodec/vaapi_mpeg4.c
  21. 4
      libavcodec/vaapi_vc1.c
  22. 2
      libavcodec/vaapi_vp9.c
  23. 2
      libavcodec/vdpau_h264.c
  24. 2
      libavcodec/vdpau_hevc.c
  25. 4
      libavcodec/vdpau_mpeg12.c
  26. 2
      libavcodec/vdpau_mpeg4.c
  27. 4
      libavcodec/vdpau_vc1.c
  28. 2
      libavcodec/version.h
  29. 12
      libavcodec/videotoolbox.c

3
doc/APIchanges
Unescape View File

@ -15,6 +15,9 @@ libavutil: 2017-10-21
API changes, most recent first: API changes, most recent first:
2017-xx-xx - xxxxxxx - lavc 58.6.100 - avcodec.h
Add const to AVCodecContext.hwaccel.
2017-11-xx - xxxxxxx - lavc 58.5.100 - avcodec.h 2017-11-xx - xxxxxxx - lavc 58.5.100 - avcodec.h
Deprecate user visibility of the AVHWAccel structure and the functions Deprecate user visibility of the AVHWAccel structure and the functions
av_register_hwaccel() and av_hwaccel_next(). av_register_hwaccel() and av_hwaccel_next().

2
libavcodec/avcodec.h
Unescape View File

@ -2635,7 +2635,7 @@ typedef struct AVCodecContext {
* - encoding: unused. * - encoding: unused.
* - decoding: Set by libavcodec * - decoding: Set by libavcodec
*/ */
struct AVHWAccel *hwaccel; const struct AVHWAccel *hwaccel;
/** /**
* Hardware accelerator context. * Hardware accelerator context.

2
libavcodec/decode.c
Unescape View File

@ -1252,7 +1252,7 @@ static int hwaccel_init(AVCodecContext *avctx,
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} }
avctx->hwaccel = (AVHWAccel*)hwaccel; avctx->hwaccel = hwaccel;
if (hwaccel->init) { if (hwaccel->init) {
err = hwaccel->init(avctx); err = hwaccel->init(avctx);
if (err < 0) { if (err < 0) {

6
libavcodec/dxva2_h264.c
Unescape View File

@ -518,7 +518,7 @@ static int dxva2_h264_end_frame(AVCodecContext *avctx)
} }
#if CONFIG_H264_DXVA2_HWACCEL #if CONFIG_H264_DXVA2_HWACCEL
AVHWAccel ff_h264_dxva2_hwaccel = { const AVHWAccel ff_h264_dxva2_hwaccel = {
.name = "h264_dxva2", .name = "h264_dxva2",
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_H264, .id = AV_CODEC_ID_H264,
@ -535,7 +535,7 @@ AVHWAccel ff_h264_dxva2_hwaccel = {
#endif #endif
#if CONFIG_H264_D3D11VA_HWACCEL #if CONFIG_H264_D3D11VA_HWACCEL
AVHWAccel ff_h264_d3d11va_hwaccel = { const AVHWAccel ff_h264_d3d11va_hwaccel = {
.name = "h264_d3d11va", .name = "h264_d3d11va",
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_H264, .id = AV_CODEC_ID_H264,
@ -552,7 +552,7 @@ AVHWAccel ff_h264_d3d11va_hwaccel = {
#endif #endif
#if CONFIG_H264_D3D11VA2_HWACCEL #if CONFIG_H264_D3D11VA2_HWACCEL
AVHWAccel ff_h264_d3d11va2_hwaccel = { const AVHWAccel ff_h264_d3d11va2_hwaccel = {
.name = "h264_d3d11va2", .name = "h264_d3d11va2",
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_H264, .id = AV_CODEC_ID_H264,

6
libavcodec/dxva2_hevc.c
Unescape View File

@ -422,7 +422,7 @@ static int dxva2_hevc_end_frame(AVCodecContext *avctx)
} }
#if CONFIG_HEVC_DXVA2_HWACCEL #if CONFIG_HEVC_DXVA2_HWACCEL
AVHWAccel ff_hevc_dxva2_hwaccel = { const AVHWAccel ff_hevc_dxva2_hwaccel = {
.name = "hevc_dxva2", .name = "hevc_dxva2",
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_HEVC, .id = AV_CODEC_ID_HEVC,
@ -439,7 +439,7 @@ AVHWAccel ff_hevc_dxva2_hwaccel = {
#endif #endif
#if CONFIG_HEVC_D3D11VA_HWACCEL #if CONFIG_HEVC_D3D11VA_HWACCEL
AVHWAccel ff_hevc_d3d11va_hwaccel = { const AVHWAccel ff_hevc_d3d11va_hwaccel = {
.name = "hevc_d3d11va", .name = "hevc_d3d11va",
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_HEVC, .id = AV_CODEC_ID_HEVC,
@ -456,7 +456,7 @@ AVHWAccel ff_hevc_d3d11va_hwaccel = {
#endif #endif
#if CONFIG_HEVC_D3D11VA2_HWACCEL #if CONFIG_HEVC_D3D11VA2_HWACCEL
AVHWAccel ff_hevc_d3d11va2_hwaccel = { const AVHWAccel ff_hevc_d3d11va2_hwaccel = {
.name = "hevc_d3d11va2", .name = "hevc_d3d11va2",
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_HEVC, .id = AV_CODEC_ID_HEVC,

6
libavcodec/dxva2_mpeg2.c
Unescape View File

@ -317,7 +317,7 @@ static int dxva2_mpeg2_end_frame(AVCodecContext *avctx)
} }
#if CONFIG_MPEG2_DXVA2_HWACCEL #if CONFIG_MPEG2_DXVA2_HWACCEL
AVHWAccel ff_mpeg2_dxva2_hwaccel = { const AVHWAccel ff_mpeg2_dxva2_hwaccel = {
.name = "mpeg2_dxva2", .name = "mpeg2_dxva2",
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_MPEG2VIDEO, .id = AV_CODEC_ID_MPEG2VIDEO,
@ -334,7 +334,7 @@ AVHWAccel ff_mpeg2_dxva2_hwaccel = {
#endif #endif
#if CONFIG_MPEG2_D3D11VA_HWACCEL #if CONFIG_MPEG2_D3D11VA_HWACCEL
AVHWAccel ff_mpeg2_d3d11va_hwaccel = { const AVHWAccel ff_mpeg2_d3d11va_hwaccel = {
.name = "mpeg2_d3d11va", .name = "mpeg2_d3d11va",
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_MPEG2VIDEO, .id = AV_CODEC_ID_MPEG2VIDEO,
@ -351,7 +351,7 @@ AVHWAccel ff_mpeg2_d3d11va_hwaccel = {
#endif #endif
#if CONFIG_MPEG2_D3D11VA2_HWACCEL #if CONFIG_MPEG2_D3D11VA2_HWACCEL
AVHWAccel ff_mpeg2_d3d11va2_hwaccel = { const AVHWAccel ff_mpeg2_d3d11va2_hwaccel = {
.name = "mpeg2_d3d11va2", .name = "mpeg2_d3d11va2",
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_MPEG2VIDEO, .id = AV_CODEC_ID_MPEG2VIDEO,

12
libavcodec/dxva2_vc1.c
Unescape View File

@ -378,7 +378,7 @@ static int dxva2_vc1_end_frame(AVCodecContext *avctx)
} }
#if CONFIG_WMV3_DXVA2_HWACCEL #if CONFIG_WMV3_DXVA2_HWACCEL
AVHWAccel ff_wmv3_dxva2_hwaccel = { const AVHWAccel ff_wmv3_dxva2_hwaccel = {
.name = "wmv3_dxva2", .name = "wmv3_dxva2",
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_WMV3, .id = AV_CODEC_ID_WMV3,
@ -395,7 +395,7 @@ AVHWAccel ff_wmv3_dxva2_hwaccel = {
#endif #endif
#if CONFIG_VC1_DXVA2_HWACCEL #if CONFIG_VC1_DXVA2_HWACCEL
AVHWAccel ff_vc1_dxva2_hwaccel = { const AVHWAccel ff_vc1_dxva2_hwaccel = {
.name = "vc1_dxva2", .name = "vc1_dxva2",
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_VC1, .id = AV_CODEC_ID_VC1,
@ -412,7 +412,7 @@ AVHWAccel ff_vc1_dxva2_hwaccel = {
#endif #endif
#if CONFIG_WMV3_D3D11VA_HWACCEL #if CONFIG_WMV3_D3D11VA_HWACCEL
AVHWAccel ff_wmv3_d3d11va_hwaccel = { const AVHWAccel ff_wmv3_d3d11va_hwaccel = {
.name = "wmv3_d3d11va", .name = "wmv3_d3d11va",
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_WMV3, .id = AV_CODEC_ID_WMV3,
@ -429,7 +429,7 @@ AVHWAccel ff_wmv3_d3d11va_hwaccel = {
#endif #endif
#if CONFIG_WMV3_D3D11VA2_HWACCEL #if CONFIG_WMV3_D3D11VA2_HWACCEL
AVHWAccel ff_wmv3_d3d11va2_hwaccel = { const AVHWAccel ff_wmv3_d3d11va2_hwaccel = {
.name = "wmv3_d3d11va2", .name = "wmv3_d3d11va2",
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_WMV3, .id = AV_CODEC_ID_WMV3,
@ -446,7 +446,7 @@ AVHWAccel ff_wmv3_d3d11va2_hwaccel = {
#endif #endif
#if CONFIG_VC1_D3D11VA_HWACCEL #if CONFIG_VC1_D3D11VA_HWACCEL
AVHWAccel ff_vc1_d3d11va_hwaccel = { const AVHWAccel ff_vc1_d3d11va_hwaccel = {
.name = "vc1_d3d11va", .name = "vc1_d3d11va",
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_VC1, .id = AV_CODEC_ID_VC1,
@ -463,7 +463,7 @@ AVHWAccel ff_vc1_d3d11va_hwaccel = {
#endif #endif
#if CONFIG_VC1_D3D11VA2_HWACCEL #if CONFIG_VC1_D3D11VA2_HWACCEL
AVHWAccel ff_vc1_d3d11va2_hwaccel = { const AVHWAccel ff_vc1_d3d11va2_hwaccel = {
.name = "vc1_d3d11va2", .name = "vc1_d3d11va2",
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_VC1, .id = AV_CODEC_ID_VC1,

6
libavcodec/dxva2_vp9.c
Unescape View File

@ -309,7 +309,7 @@ static int dxva2_vp9_end_frame(AVCodecContext *avctx)
} }
#if CONFIG_VP9_DXVA2_HWACCEL #if CONFIG_VP9_DXVA2_HWACCEL
AVHWAccel ff_vp9_dxva2_hwaccel = { const AVHWAccel ff_vp9_dxva2_hwaccel = {
.name = "vp9_dxva2", .name = "vp9_dxva2",
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_VP9, .id = AV_CODEC_ID_VP9,
@ -326,7 +326,7 @@ AVHWAccel ff_vp9_dxva2_hwaccel = {
#endif #endif
#if CONFIG_VP9_D3D11VA_HWACCEL #if CONFIG_VP9_D3D11VA_HWACCEL
AVHWAccel ff_vp9_d3d11va_hwaccel = { const AVHWAccel ff_vp9_d3d11va_hwaccel = {
.name = "vp9_d3d11va", .name = "vp9_d3d11va",
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_VP9, .id = AV_CODEC_ID_VP9,
@ -343,7 +343,7 @@ AVHWAccel ff_vp9_d3d11va_hwaccel = {
#endif #endif
#if CONFIG_VP9_D3D11VA2_HWACCEL #if CONFIG_VP9_D3D11VA2_HWACCEL
AVHWAccel ff_vp9_d3d11va2_hwaccel = { const AVHWAccel ff_vp9_d3d11va2_hwaccel = {
.name = "vp9_d3d11va2", .name = "vp9_d3d11va2",
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_VP9, .id = AV_CODEC_ID_VP9,

98
libavcodec/hwaccels.h
Unescape View File

@ -21,54 +21,54 @@
#include "avcodec.h" #include "avcodec.h"
extern AVHWAccel ff_h263_vaapi_hwaccel; extern const AVHWAccel ff_h263_vaapi_hwaccel;
extern AVHWAccel ff_h263_videotoolbox_hwaccel; extern const AVHWAccel ff_h263_videotoolbox_hwaccel;
extern AVHWAccel ff_h264_d3d11va_hwaccel; extern const AVHWAccel ff_h264_d3d11va_hwaccel;
extern AVHWAccel ff_h264_d3d11va2_hwaccel; extern const AVHWAccel ff_h264_d3d11va2_hwaccel;
extern AVHWAccel ff_h264_dxva2_hwaccel; extern const AVHWAccel ff_h264_dxva2_hwaccel;
extern AVHWAccel ff_h264_nvdec_hwaccel; extern const AVHWAccel ff_h264_nvdec_hwaccel;
extern AVHWAccel ff_h264_vaapi_hwaccel; extern const AVHWAccel ff_h264_vaapi_hwaccel;
extern AVHWAccel ff_h264_vdpau_hwaccel; extern const AVHWAccel ff_h264_vdpau_hwaccel;
extern AVHWAccel ff_h264_videotoolbox_hwaccel; extern const AVHWAccel ff_h264_videotoolbox_hwaccel;
extern AVHWAccel ff_hevc_d3d11va_hwaccel; extern const AVHWAccel ff_hevc_d3d11va_hwaccel;
extern AVHWAccel ff_hevc_d3d11va2_hwaccel; extern const AVHWAccel ff_hevc_d3d11va2_hwaccel;
extern AVHWAccel ff_hevc_dxva2_hwaccel; extern const AVHWAccel ff_hevc_dxva2_hwaccel;
extern AVHWAccel ff_hevc_nvdec_hwaccel; extern const AVHWAccel ff_hevc_nvdec_hwaccel;
extern AVHWAccel ff_hevc_vaapi_hwaccel; extern const AVHWAccel ff_hevc_vaapi_hwaccel;
extern AVHWAccel ff_hevc_vdpau_hwaccel; extern const AVHWAccel ff_hevc_vdpau_hwaccel;
extern AVHWAccel ff_hevc_videotoolbox_hwaccel; extern const AVHWAccel ff_hevc_videotoolbox_hwaccel;
extern AVHWAccel ff_mpeg1_nvdec_hwaccel; extern const AVHWAccel ff_mpeg1_nvdec_hwaccel;
extern AVHWAccel ff_mpeg1_vdpau_hwaccel; extern const AVHWAccel ff_mpeg1_vdpau_hwaccel;
extern AVHWAccel ff_mpeg1_videotoolbox_hwaccel; extern const AVHWAccel ff_mpeg1_videotoolbox_hwaccel;
extern AVHWAccel ff_mpeg1_xvmc_hwaccel; extern const AVHWAccel ff_mpeg1_xvmc_hwaccel;
extern AVHWAccel ff_mpeg2_d3d11va_hwaccel; extern const AVHWAccel ff_mpeg2_d3d11va_hwaccel;
extern AVHWAccel ff_mpeg2_d3d11va2_hwaccel; extern const AVHWAccel ff_mpeg2_d3d11va2_hwaccel;
extern AVHWAccel ff_mpeg2_nvdec_hwaccel; extern const AVHWAccel ff_mpeg2_nvdec_hwaccel;
extern AVHWAccel ff_mpeg2_dxva2_hwaccel; extern const AVHWAccel ff_mpeg2_dxva2_hwaccel;
extern AVHWAccel ff_mpeg2_vaapi_hwaccel; extern const AVHWAccel ff_mpeg2_vaapi_hwaccel;
extern AVHWAccel ff_mpeg2_vdpau_hwaccel; extern const AVHWAccel ff_mpeg2_vdpau_hwaccel;
extern AVHWAccel ff_mpeg2_videotoolbox_hwaccel; extern const AVHWAccel ff_mpeg2_videotoolbox_hwaccel;
extern AVHWAccel ff_mpeg2_xvmc_hwaccel; extern const AVHWAccel ff_mpeg2_xvmc_hwaccel;
extern AVHWAccel ff_mpeg4_nvdec_hwaccel; extern const AVHWAccel ff_mpeg4_nvdec_hwaccel;
extern AVHWAccel ff_mpeg4_vaapi_hwaccel; extern const AVHWAccel ff_mpeg4_vaapi_hwaccel;
extern AVHWAccel ff_mpeg4_vdpau_hwaccel; extern const AVHWAccel ff_mpeg4_vdpau_hwaccel;
extern AVHWAccel ff_mpeg4_videotoolbox_hwaccel; extern const AVHWAccel ff_mpeg4_videotoolbox_hwaccel;
extern AVHWAccel ff_vc1_d3d11va_hwaccel; extern const AVHWAccel ff_vc1_d3d11va_hwaccel;
extern AVHWAccel ff_vc1_d3d11va2_hwaccel; extern const AVHWAccel ff_vc1_d3d11va2_hwaccel;
extern AVHWAccel ff_vc1_dxva2_hwaccel; extern const AVHWAccel ff_vc1_dxva2_hwaccel;
extern AVHWAccel ff_vc1_nvdec_hwaccel; extern const AVHWAccel ff_vc1_nvdec_hwaccel;
extern AVHWAccel ff_vc1_vaapi_hwaccel; extern const AVHWAccel ff_vc1_vaapi_hwaccel;
extern AVHWAccel ff_vc1_vdpau_hwaccel; extern const AVHWAccel ff_vc1_vdpau_hwaccel;
extern AVHWAccel ff_vp9_d3d11va_hwaccel; extern const AVHWAccel ff_vp9_d3d11va_hwaccel;
extern AVHWAccel ff_vp9_d3d11va2_hwaccel; extern const AVHWAccel ff_vp9_d3d11va2_hwaccel;
extern AVHWAccel ff_vp9_dxva2_hwaccel; extern const AVHWAccel ff_vp9_dxva2_hwaccel;
extern AVHWAccel ff_vp9_nvdec_hwaccel; extern const AVHWAccel ff_vp9_nvdec_hwaccel;
extern AVHWAccel ff_vp9_vaapi_hwaccel; extern const AVHWAccel ff_vp9_vaapi_hwaccel;
extern AVHWAccel ff_wmv3_d3d11va_hwaccel; extern const AVHWAccel ff_wmv3_d3d11va_hwaccel;
extern AVHWAccel ff_wmv3_d3d11va2_hwaccel; extern const AVHWAccel ff_wmv3_d3d11va2_hwaccel;
extern AVHWAccel ff_wmv3_dxva2_hwaccel; extern const AVHWAccel ff_wmv3_dxva2_hwaccel;
extern AVHWAccel ff_wmv3_nvdec_hwaccel; extern const AVHWAccel ff_wmv3_nvdec_hwaccel;
extern AVHWAccel ff_wmv3_vaapi_hwaccel; extern const AVHWAccel ff_wmv3_vaapi_hwaccel;
extern AVHWAccel ff_wmv3_vdpau_hwaccel; extern const AVHWAccel ff_wmv3_vdpau_hwaccel;
#endif /* AVCODEC_HWACCELS_H */ #endif /* AVCODEC_HWACCELS_H */

4
libavcodec/mpegvideo_xvmc.c
Unescape View File

@ -348,7 +348,7 @@ static void ff_xvmc_decode_mb(struct MpegEncContext *s)
} }
#if CONFIG_MPEG1_XVMC_HWACCEL #if CONFIG_MPEG1_XVMC_HWACCEL
AVHWAccel ff_mpeg1_xvmc_hwaccel = { const AVHWAccel ff_mpeg1_xvmc_hwaccel = {
.name = "mpeg1_xvmc", .name = "mpeg1_xvmc",
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_MPEG1VIDEO, .id = AV_CODEC_ID_MPEG1VIDEO,
@ -362,7 +362,7 @@ AVHWAccel ff_mpeg1_xvmc_hwaccel = {
#endif #endif
#if CONFIG_MPEG2_XVMC_HWACCEL #if CONFIG_MPEG2_XVMC_HWACCEL
AVHWAccel ff_mpeg2_xvmc_hwaccel = { const AVHWAccel ff_mpeg2_xvmc_hwaccel = {
.name = "mpeg2_xvmc", .name = "mpeg2_xvmc",
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_MPEG2VIDEO, .id = AV_CODEC_ID_MPEG2VIDEO,

2
libavcodec/nvdec_h264.c
Unescape View File

@ -163,7 +163,7 @@ static int nvdec_h264_frame_params(AVCodecContext *avctx,
return ff_nvdec_frame_params(avctx, hw_frames_ctx, sps->ref_frame_count + sps->num_reorder_frames); return ff_nvdec_frame_params(avctx, hw_frames_ctx, sps->ref_frame_count + sps->num_reorder_frames);
} }
AVHWAccel ff_h264_nvdec_hwaccel = { const AVHWAccel ff_h264_nvdec_hwaccel = {
.name = "h264_nvdec", .name = "h264_nvdec",
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_H264, .id = AV_CODEC_ID_H264,

2
libavcodec/nvdec_hevc.c
Unescape View File

@ -266,7 +266,7 @@ static int nvdec_hevc_frame_params(AVCodecContext *avctx,
return ff_nvdec_frame_params(avctx, hw_frames_ctx, sps->temporal_layer[sps->max_sub_layers - 1].max_dec_pic_buffering + 1); return ff_nvdec_frame_params(avctx, hw_frames_ctx, sps->temporal_layer[sps->max_sub_layers - 1].max_dec_pic_buffering + 1);
} }
AVHWAccel ff_hevc_nvdec_hwaccel = { const AVHWAccel ff_hevc_nvdec_hwaccel = {
.name = "hevc_nvdec", .name = "hevc_nvdec",
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_HEVC, .id = AV_CODEC_ID_HEVC,

4
libavcodec/nvdec_mpeg12.c
Unescape View File

@ -91,7 +91,7 @@ static int nvdec_mpeg12_frame_params(AVCodecContext *avctx,
} }
#if CONFIG_MPEG2_NVDEC_HWACCEL #if CONFIG_MPEG2_NVDEC_HWACCEL
AVHWAccel ff_mpeg2_nvdec_hwaccel = { const AVHWAccel ff_mpeg2_nvdec_hwaccel = {
.name = "mpeg2_nvdec", .name = "mpeg2_nvdec",
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_MPEG2VIDEO, .id = AV_CODEC_ID_MPEG2VIDEO,
@ -107,7 +107,7 @@ AVHWAccel ff_mpeg2_nvdec_hwaccel = {
#endif #endif
#if CONFIG_MPEG1_NVDEC_HWACCEL #if CONFIG_MPEG1_NVDEC_HWACCEL
AVHWAccel ff_mpeg1_nvdec_hwaccel = { const AVHWAccel ff_mpeg1_nvdec_hwaccel = {
.name = "mpeg1_nvdec", .name = "mpeg1_nvdec",
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_MPEG1VIDEO, .id = AV_CODEC_ID_MPEG1VIDEO,

2
libavcodec/nvdec_mpeg4.c
Unescape View File

@ -106,7 +106,7 @@ static int nvdec_mpeg4_frame_params(AVCodecContext *avctx,
return ff_nvdec_frame_params(avctx, hw_frames_ctx, 2); return ff_nvdec_frame_params(avctx, hw_frames_ctx, 2);
} }
AVHWAccel ff_mpeg4_nvdec_hwaccel = { const AVHWAccel ff_mpeg4_nvdec_hwaccel = {
.name = "mpeg4_nvdec", .name = "mpeg4_nvdec",
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_MPEG4, .id = AV_CODEC_ID_MPEG4,

4
libavcodec/nvdec_vc1.c
Unescape View File

@ -110,7 +110,7 @@ static int nvdec_vc1_frame_params(AVCodecContext *avctx,
return ff_nvdec_frame_params(avctx, hw_frames_ctx, 2); return ff_nvdec_frame_params(avctx, hw_frames_ctx, 2);
} }
AVHWAccel ff_vc1_nvdec_hwaccel = { const AVHWAccel ff_vc1_nvdec_hwaccel = {
.name = "vc1_nvdec", .name = "vc1_nvdec",
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_VC1, .id = AV_CODEC_ID_VC1,
@ -125,7 +125,7 @@ AVHWAccel ff_vc1_nvdec_hwaccel = {
}; };
#if CONFIG_WMV3_NVDEC_HWACCEL #if CONFIG_WMV3_NVDEC_HWACCEL
AVHWAccel ff_wmv3_nvdec_hwaccel = { const AVHWAccel ff_wmv3_nvdec_hwaccel = {
.name = "wmv3_nvdec", .name = "wmv3_nvdec",
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_WMV3, .id = AV_CODEC_ID_WMV3,

2
libavcodec/nvdec_vp9.c
Unescape View File

@ -169,7 +169,7 @@ static int nvdec_vp9_frame_params(AVCodecContext *avctx,
return ff_nvdec_frame_params(avctx, hw_frames_ctx, 8); return ff_nvdec_frame_params(avctx, hw_frames_ctx, 8);
} }
AVHWAccel ff_vp9_nvdec_hwaccel = { const AVHWAccel ff_vp9_nvdec_hwaccel = {
.name = "vp9_nvdec", .name = "vp9_nvdec",
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_VP9, .id = AV_CODEC_ID_VP9,

2
libavcodec/vaapi_h264.c
Unescape View File

@ -388,7 +388,7 @@ static int vaapi_h264_decode_slice(AVCodecContext *avctx,
return 0; return 0;
} }
AVHWAccel ff_h264_vaapi_hwaccel = { const AVHWAccel ff_h264_vaapi_hwaccel = {
.name = "h264_vaapi", .name = "h264_vaapi",
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_H264, .id = AV_CODEC_ID_H264,

2
libavcodec/vaapi_hevc.c
Unescape View File

@ -423,7 +423,7 @@ static int vaapi_hevc_decode_slice(AVCodecContext *avctx,
return 0; return 0;
} }
AVHWAccel ff_hevc_vaapi_hwaccel = { const AVHWAccel ff_hevc_vaapi_hwaccel = {
.name = "hevc_vaapi", .name = "hevc_vaapi",
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_HEVC, .id = AV_CODEC_ID_HEVC,

2
libavcodec/vaapi_mpeg2.c
Unescape View File

@ -172,7 +172,7 @@ static int vaapi_mpeg2_decode_slice(AVCodecContext *avctx, const uint8_t *buffer
return 0; return 0;
} }
AVHWAccel ff_mpeg2_vaapi_hwaccel = { const AVHWAccel ff_mpeg2_vaapi_hwaccel = {
.name = "mpeg2_vaapi", .name = "mpeg2_vaapi",
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_MPEG2VIDEO, .id = AV_CODEC_ID_MPEG2VIDEO,

4
libavcodec/vaapi_mpeg4.c
Unescape View File

@ -178,7 +178,7 @@ static int vaapi_mpeg4_decode_slice(AVCodecContext *avctx, const uint8_t *buffer
} }
#if CONFIG_MPEG4_VAAPI_HWACCEL #if CONFIG_MPEG4_VAAPI_HWACCEL
AVHWAccel ff_mpeg4_vaapi_hwaccel = { const AVHWAccel ff_mpeg4_vaapi_hwaccel = {
.name = "mpeg4_vaapi", .name = "mpeg4_vaapi",
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_MPEG4, .id = AV_CODEC_ID_MPEG4,
@ -196,7 +196,7 @@ AVHWAccel ff_mpeg4_vaapi_hwaccel = {
#endif #endif
#if CONFIG_H263_VAAPI_HWACCEL #if CONFIG_H263_VAAPI_HWACCEL
AVHWAccel ff_h263_vaapi_hwaccel = { const AVHWAccel ff_h263_vaapi_hwaccel = {
.name = "h263_vaapi", .name = "h263_vaapi",
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_H263, .id = AV_CODEC_ID_H263,

4
libavcodec/vaapi_vc1.c
Unescape View File

@ -388,7 +388,7 @@ static int vaapi_vc1_decode_slice(AVCodecContext *avctx, const uint8_t *buffer,
} }
#if CONFIG_WMV3_VAAPI_HWACCEL #if CONFIG_WMV3_VAAPI_HWACCEL
AVHWAccel ff_wmv3_vaapi_hwaccel = { const AVHWAccel ff_wmv3_vaapi_hwaccel = {
.name = "wmv3_vaapi", .name = "wmv3_vaapi",
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_WMV3, .id = AV_CODEC_ID_WMV3,
@ -405,7 +405,7 @@ AVHWAccel ff_wmv3_vaapi_hwaccel = {
}; };
#endif #endif
AVHWAccel ff_vc1_vaapi_hwaccel = { const AVHWAccel ff_vc1_vaapi_hwaccel = {
.name = "vc1_vaapi", .name = "vc1_vaapi",
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_VC1, .id = AV_CODEC_ID_VC1,

2
libavcodec/vaapi_vp9.c
Unescape View File

@ -168,7 +168,7 @@ static int vaapi_vp9_decode_slice(AVCodecContext *avctx,
return 0; return 0;
} }
AVHWAccel ff_vp9_vaapi_hwaccel = { const AVHWAccel ff_vp9_vaapi_hwaccel = {
.name = "vp9_vaapi", .name = "vp9_vaapi",
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_VP9, .id = AV_CODEC_ID_VP9,

2
libavcodec/vdpau_h264.c
Unescape View File

@ -262,7 +262,7 @@ static int vdpau_h264_init(AVCodecContext *avctx)
return ff_vdpau_common_init(avctx, profile, level); return ff_vdpau_common_init(avctx, profile, level);
} }
AVHWAccel ff_h264_vdpau_hwaccel = { const AVHWAccel ff_h264_vdpau_hwaccel = {
.name = "h264_vdpau", .name = "h264_vdpau",
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_H264, .id = AV_CODEC_ID_H264,

2
libavcodec/vdpau_hevc.c
Unescape View File

@ -413,7 +413,7 @@ static int vdpau_hevc_init(AVCodecContext *avctx)
return ff_vdpau_common_init(avctx, profile, level); return ff_vdpau_common_init(avctx, profile, level);
} }
AVHWAccel ff_hevc_vdpau_hwaccel = { const AVHWAccel ff_hevc_vdpau_hwaccel = {
.name = "hevc_vdpau", .name = "hevc_vdpau",
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_HEVC, .id = AV_CODEC_ID_HEVC,

4
libavcodec/vdpau_mpeg12.c
Unescape View File

@ -103,7 +103,7 @@ static int vdpau_mpeg1_init(AVCodecContext *avctx)
VDP_DECODER_LEVEL_MPEG1_NA); VDP_DECODER_LEVEL_MPEG1_NA);
} }
AVHWAccel ff_mpeg1_vdpau_hwaccel = { const AVHWAccel ff_mpeg1_vdpau_hwaccel = {
.name = "mpeg1_vdpau", .name = "mpeg1_vdpau",
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_MPEG1VIDEO, .id = AV_CODEC_ID_MPEG1VIDEO,
@ -138,7 +138,7 @@ static int vdpau_mpeg2_init(AVCodecContext *avctx)
return ff_vdpau_common_init(avctx, profile, VDP_DECODER_LEVEL_MPEG2_HL); return ff_vdpau_common_init(avctx, profile, VDP_DECODER_LEVEL_MPEG2_HL);
} }
AVHWAccel ff_mpeg2_vdpau_hwaccel = { const AVHWAccel ff_mpeg2_vdpau_hwaccel = {
.name = "mpeg2_vdpau", .name = "mpeg2_vdpau",
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_MPEG2VIDEO, .id = AV_CODEC_ID_MPEG2VIDEO,

2
libavcodec/vdpau_mpeg4.c
Unescape View File

@ -110,7 +110,7 @@ static int vdpau_mpeg4_init(AVCodecContext *avctx)
return ff_vdpau_common_init(avctx, profile, avctx->level); return ff_vdpau_common_init(avctx, profile, avctx->level);
} }
AVHWAccel ff_mpeg4_vdpau_hwaccel = { const AVHWAccel ff_mpeg4_vdpau_hwaccel = {
.name = "mpeg4_vdpau", .name = "mpeg4_vdpau",
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_MPEG4, .id = AV_CODEC_ID_MPEG4,

4
libavcodec/vdpau_vc1.c
Unescape View File

@ -136,7 +136,7 @@ static int vdpau_vc1_init(AVCodecContext *avctx)
} }
#if CONFIG_WMV3_VDPAU_HWACCEL #if CONFIG_WMV3_VDPAU_HWACCEL
AVHWAccel ff_wmv3_vdpau_hwaccel = { const AVHWAccel ff_wmv3_vdpau_hwaccel = {
.name = "wm3_vdpau", .name = "wm3_vdpau",
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_WMV3, .id = AV_CODEC_ID_WMV3,
@ -153,7 +153,7 @@ AVHWAccel ff_wmv3_vdpau_hwaccel = {
}; };
#endif #endif
AVHWAccel ff_vc1_vdpau_hwaccel = { const AVHWAccel ff_vc1_vdpau_hwaccel = {
.name = "vc1_vdpau", .name = "vc1_vdpau",
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_VC1, .id = AV_CODEC_ID_VC1,

2
libavcodec/version.h
Unescape View File

@ -28,7 +28,7 @@
#include "libavutil/version.h" #include "libavutil/version.h"
#define LIBAVCODEC_VERSION_MAJOR 58 #define LIBAVCODEC_VERSION_MAJOR 58
#define LIBAVCODEC_VERSION_MINOR 5 #define LIBAVCODEC_VERSION_MINOR 6
#define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_MICRO 100
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \

12
libavcodec/videotoolbox.c
Unescape View File

@ -1028,7 +1028,7 @@ static int videotoolbox_frame_params(AVCodecContext *avctx,
return 0; return 0;
} }
AVHWAccel ff_h263_videotoolbox_hwaccel = { const AVHWAccel ff_h263_videotoolbox_hwaccel = {
.name = "h263_videotoolbox", .name = "h263_videotoolbox",
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_H263, .id = AV_CODEC_ID_H263,
@ -1043,7 +1043,7 @@ AVHWAccel ff_h263_videotoolbox_hwaccel = {
.priv_data_size = sizeof(VTContext), .priv_data_size = sizeof(VTContext),
}; };
AVHWAccel ff_hevc_videotoolbox_hwaccel = { const AVHWAccel ff_hevc_videotoolbox_hwaccel = {
.name = "hevc_videotoolbox", .name = "hevc_videotoolbox",
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_HEVC, .id = AV_CODEC_ID_HEVC,
@ -1059,7 +1059,7 @@ AVHWAccel ff_hevc_videotoolbox_hwaccel = {
.priv_data_size = sizeof(VTContext), .priv_data_size = sizeof(VTContext),
}; };
AVHWAccel ff_h264_videotoolbox_hwaccel = { const AVHWAccel ff_h264_videotoolbox_hwaccel = {
.name = "h264_videotoolbox", .name = "h264_videotoolbox",
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_H264, .id = AV_CODEC_ID_H264,
@ -1075,7 +1075,7 @@ AVHWAccel ff_h264_videotoolbox_hwaccel = {
.priv_data_size = sizeof(VTContext), .priv_data_size = sizeof(VTContext),
}; };
AVHWAccel ff_mpeg1_videotoolbox_hwaccel = { const AVHWAccel ff_mpeg1_videotoolbox_hwaccel = {
.name = "mpeg1_videotoolbox", .name = "mpeg1_videotoolbox",
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_MPEG1VIDEO, .id = AV_CODEC_ID_MPEG1VIDEO,
@ -1090,7 +1090,7 @@ AVHWAccel ff_mpeg1_videotoolbox_hwaccel = {
.priv_data_size = sizeof(VTContext), .priv_data_size = sizeof(VTContext),
}; };
AVHWAccel ff_mpeg2_videotoolbox_hwaccel = { const AVHWAccel ff_mpeg2_videotoolbox_hwaccel = {
.name = "mpeg2_videotoolbox", .name = "mpeg2_videotoolbox",
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_MPEG2VIDEO, .id = AV_CODEC_ID_MPEG2VIDEO,
@ -1105,7 +1105,7 @@ AVHWAccel ff_mpeg2_videotoolbox_hwaccel = {
.priv_data_size = sizeof(VTContext), .priv_data_size = sizeof(VTContext),
}; };
AVHWAccel ff_mpeg4_videotoolbox_hwaccel = { const AVHWAccel ff_mpeg4_videotoolbox_hwaccel = {
.name = "mpeg4_videotoolbox", .name = "mpeg4_videotoolbox",
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_MPEG4, .id = AV_CODEC_ID_MPEG4,

Write Preview
Loading…
Cancel
Save