Unified · Split
| @@ -13,6 +13,9 @@ libavutil: 2017-03-23 · 12 unmodified lines | |||
| 13 | 13 | ||
| 14 | API changes, most recent first: | 14 | API changes, most recent first: |
| 15 | 15 | ||
| 16 | 2017-xx-xx - xxxxxxx - lavc 58.8.0 - avcodec.h | ||
| 17 | Add const to AVCodecContext.hwaccel. | ||
| 18 | |||
| 16 | 2017-xx-xx - xxxxxxx - lavc 58.7.0 - avcodec.h | 19 | 2017-xx-xx - xxxxxxx - lavc 58.7.0 - avcodec.h |
| 17 | Deprecate user visibility of the AVHWAccel structure and the functions | 20 | Deprecate user visibility of the AVHWAccel structure and the functions |
| 18 | av_register_hwaccel() and av_hwaccel_next(). | 21 | av_register_hwaccel() and av_hwaccel_next(). |
| @@ -2307,7 +2307,7 @@ typedef struct AVCodecContext { · 2306 unmodified lines | |||
| 2307 | * - encoding: unused. | 2307 | * - encoding: unused. |
| 2308 | * - decoding: Set by libavcodec | 2308 | * - decoding: Set by libavcodec |
| 2309 | */ | 2309 | */ |
| 2310 | struct AVHWAccel *hwaccel; | 2310 | const struct AVHWAccel *hwaccel; |
| 2311 | 2311 | ||
| 2312 | /** | 2312 | /** |
| 2313 | * Hardware accelerator context. | 2313 | * Hardware accelerator context. |
| @@ -163,7 +163,7 @@ static int cuvid_h264_decode_init(AVCodecContext *avctx) · 162 unmodified lines | |||
| 163 | return ff_cuvid_decode_init(avctx, sps->ref_frame_count + sps->num_reorder_frames); | 163 | return ff_cuvid_decode_init(avctx, sps->ref_frame_count + sps->num_reorder_frames); |
| 164 | } | 164 | } |
| 165 | 165 | ||
| 166 | AVHWAccel ff_h264_cuvid_hwaccel = { | 166 | const AVHWAccel ff_h264_cuvid_hwaccel = { |
| 167 | .name = "h264_cuvid", | 167 | .name = "h264_cuvid", |
| 168 | .type = AVMEDIA_TYPE_VIDEO, | 168 | .type = AVMEDIA_TYPE_VIDEO, |
| 169 | .id = AV_CODEC_ID_H264, | 169 | .id = AV_CODEC_ID_H264, |
| @@ -266,7 +266,7 @@ static int cuvid_hevc_decode_init(AVCodecContext *avctx) · 265 unmodified lines | |||
| 266 | return ff_cuvid_decode_init(avctx, sps->temporal_layer[sps->max_sub_layers - 1].max_dec_pic_buffering + 1); | 266 | return ff_cuvid_decode_init(avctx, sps->temporal_layer[sps->max_sub_layers - 1].max_dec_pic_buffering + 1); |
| 267 | } | 267 | } |
| 268 | 268 | ||
| 269 | AVHWAccel ff_hevc_cuvid_hwaccel = { | 269 | const AVHWAccel ff_hevc_cuvid_hwaccel = { |
| 270 | .name = "hevc_cuvid", | 270 | .name = "hevc_cuvid", |
| 271 | .type = AVMEDIA_TYPE_VIDEO, | 271 | .type = AVMEDIA_TYPE_VIDEO, |
| 272 | .id = AV_CODEC_ID_HEVC, | 272 | .id = AV_CODEC_ID_HEVC, |
| @@ -812,7 +812,7 @@ static int hwaccel_init(AVCodecContext *avctx, · 811 unmodified lines | |||
| 812 | return AVERROR(ENOMEM); | 812 | return AVERROR(ENOMEM); |
| 813 | } | 813 | } |
| 814 | 814 | ||
| 815 | avctx->hwaccel = (AVHWAccel*)hwaccel; | 815 | avctx->hwaccel = hwaccel; |
| 816 | err = hwaccel->init(avctx); | 816 | err = hwaccel->init(avctx); |
| 817 | if (err < 0) { | 817 | if (err < 0) { |
| 818 | av_log(avctx, AV_LOG_ERROR, "Failed setup for format %s: " | 818 | av_log(avctx, AV_LOG_ERROR, "Failed setup for format %s: " |
| @@ -513,7 +513,7 @@ static int dxva2_h264_end_frame(AVCodecContext *avctx) · 512 unmodified lines | |||
| 513 | } | 513 | } |
| 514 | 514 | ||
| 515 | #if CONFIG_H264_DXVA2_HWACCEL | 515 | #if CONFIG_H264_DXVA2_HWACCEL |
| 516 | AVHWAccel ff_h264_dxva2_hwaccel = { | 516 | const AVHWAccel ff_h264_dxva2_hwaccel = { |
| 517 | .name = "h264_dxva2", | 517 | .name = "h264_dxva2", |
| 518 | .type = AVMEDIA_TYPE_VIDEO, | 518 | .type = AVMEDIA_TYPE_VIDEO, |
| 519 | .id = AV_CODEC_ID_H264, | 519 | .id = AV_CODEC_ID_H264, |
| @@ -530,7 +530,7 @@ AVHWAccel ff_h264_dxva2_hwaccel = { · 10 unmodified lines | |||
| 530 | #endif | 530 | #endif |
| 531 | 531 | ||
| 532 | #if CONFIG_H264_D3D11VA_HWACCEL | 532 | #if CONFIG_H264_D3D11VA_HWACCEL |
| 533 | AVHWAccel ff_h264_d3d11va_hwaccel = { | 533 | const AVHWAccel ff_h264_d3d11va_hwaccel = { |
| 534 | .name = "h264_d3d11va", | 534 | .name = "h264_d3d11va", |
| 535 | .type = AVMEDIA_TYPE_VIDEO, | 535 | .type = AVMEDIA_TYPE_VIDEO, |
| 536 | .id = AV_CODEC_ID_H264, | 536 | .id = AV_CODEC_ID_H264, |
| @@ -547,7 +547,7 @@ AVHWAccel ff_h264_d3d11va_hwaccel = { · 10 unmodified lines | |||
| 547 | #endif | 547 | #endif |
| 548 | 548 | ||
| 549 | #if CONFIG_H264_D3D11VA2_HWACCEL | 549 | #if CONFIG_H264_D3D11VA2_HWACCEL |
| 550 | AVHWAccel ff_h264_d3d11va2_hwaccel = { | 550 | const AVHWAccel ff_h264_d3d11va2_hwaccel = { |
| 551 | .name = "h264_d3d11va2", | 551 | .name = "h264_d3d11va2", |
| 552 | .type = AVMEDIA_TYPE_VIDEO, | 552 | .type = AVMEDIA_TYPE_VIDEO, |
| 553 | .id = AV_CODEC_ID_H264, | 553 | .id = AV_CODEC_ID_H264, |
| @@ -422,7 +422,7 @@ static int dxva2_hevc_end_frame(AVCodecContext *avctx) · 421 unmodified lines | |||
| 422 | } | 422 | } |
| 423 | 423 | ||
| 424 | #if CONFIG_HEVC_DXVA2_HWACCEL | 424 | #if CONFIG_HEVC_DXVA2_HWACCEL |
| 425 | AVHWAccel ff_hevc_dxva2_hwaccel = { | 425 | const AVHWAccel ff_hevc_dxva2_hwaccel = { |
| 426 | .name = "hevc_dxva2", | 426 | .name = "hevc_dxva2", |
| 427 | .type = AVMEDIA_TYPE_VIDEO, | 427 | .type = AVMEDIA_TYPE_VIDEO, |
| 428 | .id = AV_CODEC_ID_HEVC, | 428 | .id = AV_CODEC_ID_HEVC, |
| @@ -439,7 +439,7 @@ AVHWAccel ff_hevc_dxva2_hwaccel = { · 10 unmodified lines | |||
| 439 | #endif | 439 | #endif |
| 440 | 440 | ||
| 441 | #if CONFIG_HEVC_D3D11VA_HWACCEL | 441 | #if CONFIG_HEVC_D3D11VA_HWACCEL |
| 442 | AVHWAccel ff_hevc_d3d11va_hwaccel = { | 442 | const AVHWAccel ff_hevc_d3d11va_hwaccel = { |
| 443 | .name = "hevc_d3d11va", | 443 | .name = "hevc_d3d11va", |
| 444 | .type = AVMEDIA_TYPE_VIDEO, | 444 | .type = AVMEDIA_TYPE_VIDEO, |
| 445 | .id = AV_CODEC_ID_HEVC, | 445 | .id = AV_CODEC_ID_HEVC, |
| @@ -456,7 +456,7 @@ AVHWAccel ff_hevc_d3d11va_hwaccel = { · 10 unmodified lines | |||
| 456 | #endif | 456 | #endif |
| 457 | 457 | ||
| 458 | #if CONFIG_HEVC_D3D11VA2_HWACCEL | 458 | #if CONFIG_HEVC_D3D11VA2_HWACCEL |
| 459 | AVHWAccel ff_hevc_d3d11va2_hwaccel = { | 459 | const AVHWAccel ff_hevc_d3d11va2_hwaccel = { |
| 460 | .name = "hevc_d3d11va2", | 460 | .name = "hevc_d3d11va2", |
| 461 | .type = AVMEDIA_TYPE_VIDEO, | 461 | .type = AVMEDIA_TYPE_VIDEO, |
| 462 | .id = AV_CODEC_ID_HEVC, | 462 | .id = AV_CODEC_ID_HEVC, |
| @@ -318,7 +318,7 @@ static int dxva2_mpeg2_end_frame(AVCodecContext *avctx) · 317 unmodified lines | |||
| 318 | } | 318 | } |
| 319 | 319 | ||
| 320 | #if CONFIG_MPEG2_DXVA2_HWACCEL | 320 | #if CONFIG_MPEG2_DXVA2_HWACCEL |
| 321 | AVHWAccel ff_mpeg2_dxva2_hwaccel = { | 321 | const AVHWAccel ff_mpeg2_dxva2_hwaccel = { |
| 322 | .name = "mpeg2_dxva2", | 322 | .name = "mpeg2_dxva2", |
| 323 | .type = AVMEDIA_TYPE_VIDEO, | 323 | .type = AVMEDIA_TYPE_VIDEO, |
| 324 | .id = AV_CODEC_ID_MPEG2VIDEO, | 324 | .id = AV_CODEC_ID_MPEG2VIDEO, |
| @@ -335,7 +335,7 @@ AVHWAccel ff_mpeg2_dxva2_hwaccel = { · 10 unmodified lines | |||
| 335 | #endif | 335 | #endif |
| 336 | 336 | ||
| 337 | #if CONFIG_MPEG2_D3D11VA_HWACCEL | 337 | #if CONFIG_MPEG2_D3D11VA_HWACCEL |
| 338 | AVHWAccel ff_mpeg2_d3d11va_hwaccel = { | 338 | const AVHWAccel ff_mpeg2_d3d11va_hwaccel = { |
| 339 | .name = "mpeg2_d3d11va", | 339 | .name = "mpeg2_d3d11va", |
| 340 | .type = AVMEDIA_TYPE_VIDEO, | 340 | .type = AVMEDIA_TYPE_VIDEO, |
| 341 | .id = AV_CODEC_ID_MPEG2VIDEO, | 341 | .id = AV_CODEC_ID_MPEG2VIDEO, |
| @@ -352,7 +352,7 @@ AVHWAccel ff_mpeg2_d3d11va_hwaccel = { · 10 unmodified lines | |||
| 352 | #endif | 352 | #endif |
| 353 | 353 | ||
| 354 | #if CONFIG_MPEG2_D3D11VA2_HWACCEL | 354 | #if CONFIG_MPEG2_D3D11VA2_HWACCEL |
| 355 | AVHWAccel ff_mpeg2_d3d11va2_hwaccel = { | 355 | const AVHWAccel ff_mpeg2_d3d11va2_hwaccel = { |
| 356 | .name = "mpeg2_d3d11va2", | 356 | .name = "mpeg2_d3d11va2", |
| 357 | .type = AVMEDIA_TYPE_VIDEO, | 357 | .type = AVMEDIA_TYPE_VIDEO, |
| 358 | .id = AV_CODEC_ID_MPEG2VIDEO, | 358 | .id = AV_CODEC_ID_MPEG2VIDEO, |
| @@ -318,7 +318,7 @@ static int dxva2_vc1_end_frame(AVCodecContext *avctx) · 317 unmodified lines | |||
| 318 | } | 318 | } |
| 319 | 319 | ||
| 320 | #if CONFIG_WMV3_DXVA2_HWACCEL | 320 | #if CONFIG_WMV3_DXVA2_HWACCEL |
| 321 | AVHWAccel ff_wmv3_dxva2_hwaccel = { | 321 | const AVHWAccel ff_wmv3_dxva2_hwaccel = { |
| 322 | .name = "wmv3_dxva2", | 322 | .name = "wmv3_dxva2", |
| 323 | .type = AVMEDIA_TYPE_VIDEO, | 323 | .type = AVMEDIA_TYPE_VIDEO, |
| 324 | .id = AV_CODEC_ID_WMV3, | 324 | .id = AV_CODEC_ID_WMV3, |
| @@ -335,7 +335,7 @@ AVHWAccel ff_wmv3_dxva2_hwaccel = { · 10 unmodified lines | |||
| 335 | #endif | 335 | #endif |
| 336 | 336 | ||
| 337 | #if CONFIG_VC1_DXVA2_HWACCEL | 337 | #if CONFIG_VC1_DXVA2_HWACCEL |
| 338 | AVHWAccel ff_vc1_dxva2_hwaccel = { | 338 | const AVHWAccel ff_vc1_dxva2_hwaccel = { |
| 339 | .name = "vc1_dxva2", | 339 | .name = "vc1_dxva2", |
| 340 | .type = AVMEDIA_TYPE_VIDEO, | 340 | .type = AVMEDIA_TYPE_VIDEO, |
| 341 | .id = AV_CODEC_ID_VC1, | 341 | .id = AV_CODEC_ID_VC1, |
| @@ -352,7 +352,7 @@ AVHWAccel ff_vc1_dxva2_hwaccel = { · 10 unmodified lines | |||
| 352 | #endif | 352 | #endif |
| 353 | 353 | ||
| 354 | #if CONFIG_WMV3_D3D11VA_HWACCEL | 354 | #if CONFIG_WMV3_D3D11VA_HWACCEL |
| 355 | AVHWAccel ff_wmv3_d3d11va_hwaccel = { | 355 | const AVHWAccel ff_wmv3_d3d11va_hwaccel = { |
| 356 | .name = "wmv3_d3d11va", | 356 | .name = "wmv3_d3d11va", |
| 357 | .type = AVMEDIA_TYPE_VIDEO, | 357 | .type = AVMEDIA_TYPE_VIDEO, |
| 358 | .id = AV_CODEC_ID_WMV3, | 358 | .id = AV_CODEC_ID_WMV3, |
| @@ -369,7 +369,7 @@ AVHWAccel ff_wmv3_d3d11va_hwaccel = { · 10 unmodified lines | |||
| 369 | #endif | 369 | #endif |
| 370 | 370 | ||
| 371 | #if CONFIG_WMV3_D3D11VA2_HWACCEL | 371 | #if CONFIG_WMV3_D3D11VA2_HWACCEL |
| 372 | AVHWAccel ff_wmv3_d3d11va2_hwaccel = { | 372 | const AVHWAccel ff_wmv3_d3d11va2_hwaccel = { |
| 373 | .name = "wmv3_d3d11va2", | 373 | .name = "wmv3_d3d11va2", |
| 374 | .type = AVMEDIA_TYPE_VIDEO, | 374 | .type = AVMEDIA_TYPE_VIDEO, |
| 375 | .id = AV_CODEC_ID_WMV3, | 375 | .id = AV_CODEC_ID_WMV3, |
| @@ -386,7 +386,7 @@ AVHWAccel ff_wmv3_d3d11va2_hwaccel = { · 10 unmodified lines | |||
| 386 | #endif | 386 | #endif |
| 387 | 387 | ||
| 388 | #if CONFIG_VC1_D3D11VA_HWACCEL | 388 | #if CONFIG_VC1_D3D11VA_HWACCEL |
| 389 | AVHWAccel ff_vc1_d3d11va_hwaccel = { | 389 | const AVHWAccel ff_vc1_d3d11va_hwaccel = { |
| 390 | .name = "vc1_d3d11va", | 390 | .name = "vc1_d3d11va", |
| 391 | .type = AVMEDIA_TYPE_VIDEO, | 391 | .type = AVMEDIA_TYPE_VIDEO, |
| 392 | .id = AV_CODEC_ID_VC1, | 392 | .id = AV_CODEC_ID_VC1, |
| @@ -403,7 +403,7 @@ AVHWAccel ff_vc1_d3d11va_hwaccel = { · 10 unmodified lines | |||
| 403 | #endif | 403 | #endif |
| 404 | 404 | ||
| 405 | #if CONFIG_VC1_D3D11VA2_HWACCEL | 405 | #if CONFIG_VC1_D3D11VA2_HWACCEL |
| 406 | AVHWAccel ff_vc1_d3d11va2_hwaccel = { | 406 | const AVHWAccel ff_vc1_d3d11va2_hwaccel = { |
| 407 | .name = "vc1_d3d11va2", | 407 | .name = "vc1_d3d11va2", |
| 408 | .type = AVMEDIA_TYPE_VIDEO, | 408 | .type = AVMEDIA_TYPE_VIDEO, |
| 409 | .id = AV_CODEC_ID_VC1, | 409 | .id = AV_CODEC_ID_VC1, |
| @@ -21,39 +21,39 @@ · 20 unmodified lines | |||
| 21 | 21 | ||
| 22 | #include "avcodec.h" | 22 | #include "avcodec.h" |
| 23 | 23 | ||
| 24 | extern AVHWAccel ff_h263_vaapi_hwaccel; | 24 | extern const AVHWAccel ff_h263_vaapi_hwaccel; |
| 25 | extern AVHWAccel ff_h264_cuvid_hwaccel; | 25 | extern const AVHWAccel ff_h264_cuvid_hwaccel; |
| 26 | extern AVHWAccel ff_h264_d3d11va_hwaccel; | 26 | extern const AVHWAccel ff_h264_d3d11va_hwaccel; |
| 27 | extern AVHWAccel ff_h264_d3d11va2_hwaccel; | 27 | extern const AVHWAccel ff_h264_d3d11va2_hwaccel; |
| 28 | extern AVHWAccel ff_h264_dxva2_hwaccel; | 28 | extern const AVHWAccel ff_h264_dxva2_hwaccel; |
| 29 | extern AVHWAccel ff_h264_vaapi_hwaccel; | 29 | extern const AVHWAccel ff_h264_vaapi_hwaccel; |
| 30 | extern AVHWAccel ff_h264_vda_hwaccel; | 30 | extern const AVHWAccel ff_h264_vda_hwaccel; |
| 31 | extern AVHWAccel ff_h264_vda_old_hwaccel; | 31 | extern const AVHWAccel ff_h264_vda_old_hwaccel; |
| 32 | extern AVHWAccel ff_h264_vdpau_hwaccel; | 32 | extern const AVHWAccel ff_h264_vdpau_hwaccel; |
| 33 | extern AVHWAccel ff_hevc_cuvid_hwaccel; | 33 | extern const AVHWAccel ff_hevc_cuvid_hwaccel; |
| 34 | extern AVHWAccel ff_hevc_d3d11va_hwaccel; | 34 | extern const AVHWAccel ff_hevc_d3d11va_hwaccel; |
| 35 | extern AVHWAccel ff_hevc_d3d11va2_hwaccel; | 35 | extern const AVHWAccel ff_hevc_d3d11va2_hwaccel; |
| 36 | extern AVHWAccel ff_hevc_dxva2_hwaccel; | 36 | extern const AVHWAccel ff_hevc_dxva2_hwaccel; |
| 37 | extern AVHWAccel ff_hevc_vaapi_hwaccel; | 37 | extern const AVHWAccel ff_hevc_vaapi_hwaccel; |
| 38 | extern AVHWAccel ff_hevc_vdpau_hwaccel; | 38 | extern const AVHWAccel ff_hevc_vdpau_hwaccel; |
| 39 | extern AVHWAccel ff_mpeg1_vdpau_hwaccel; | 39 | extern const AVHWAccel ff_mpeg1_vdpau_hwaccel; |
| 40 | extern AVHWAccel ff_mpeg2_d3d11va_hwaccel; | 40 | extern const AVHWAccel ff_mpeg2_d3d11va_hwaccel; |
| 41 | extern AVHWAccel ff_mpeg2_d3d11va2_hwaccel; | 41 | extern const AVHWAccel ff_mpeg2_d3d11va2_hwaccel; |
| 42 | extern AVHWAccel ff_mpeg2_dxva2_hwaccel; | 42 | extern const AVHWAccel ff_mpeg2_dxva2_hwaccel; |
| 43 | extern AVHWAccel ff_mpeg2_vaapi_hwaccel; | 43 | extern const AVHWAccel ff_mpeg2_vaapi_hwaccel; |
| 44 | extern AVHWAccel ff_mpeg2_vdpau_hwaccel; | 44 | extern const AVHWAccel ff_mpeg2_vdpau_hwaccel; |
| 45 | extern AVHWAccel ff_mpeg4_vaapi_hwaccel; | 45 | extern const AVHWAccel ff_mpeg4_vaapi_hwaccel; |
| 46 | extern AVHWAccel ff_mpeg4_vdpau_hwaccel; | 46 | extern const AVHWAccel ff_mpeg4_vdpau_hwaccel; |
| 47 | extern AVHWAccel ff_vc1_d3d11va_hwaccel; | 47 | extern const AVHWAccel ff_vc1_d3d11va_hwaccel; |
| 48 | extern AVHWAccel ff_vc1_d3d11va2_hwaccel; | 48 | extern const AVHWAccel ff_vc1_d3d11va2_hwaccel; |
| 49 | extern AVHWAccel ff_vc1_dxva2_hwaccel; | 49 | extern const AVHWAccel ff_vc1_dxva2_hwaccel; |
| 50 | extern AVHWAccel ff_vc1_vaapi_hwaccel; | 50 | extern const AVHWAccel ff_vc1_vaapi_hwaccel; |
| 51 | extern AVHWAccel ff_vc1_vdpau_hwaccel; | 51 | extern const AVHWAccel ff_vc1_vdpau_hwaccel; |
| 52 | extern AVHWAccel ff_vp8_vaapi_hwaccel; | 52 | extern const AVHWAccel ff_vp8_vaapi_hwaccel; |
| 53 | extern AVHWAccel ff_wmv3_d3d11va_hwaccel; | 53 | extern const AVHWAccel ff_wmv3_d3d11va_hwaccel; |
| 54 | extern AVHWAccel ff_wmv3_d3d11va2_hwaccel; | 54 | extern const AVHWAccel ff_wmv3_d3d11va2_hwaccel; |
| 55 | extern AVHWAccel ff_wmv3_dxva2_hwaccel; | 55 | extern const AVHWAccel ff_wmv3_dxva2_hwaccel; |
| 56 | extern AVHWAccel ff_wmv3_vaapi_hwaccel; | 56 | extern const AVHWAccel ff_wmv3_vaapi_hwaccel; |
| 57 | extern AVHWAccel ff_wmv3_vdpau_hwaccel; | 57 | extern const AVHWAccel ff_wmv3_vdpau_hwaccel; |
| 58 | 58 | ||
| 59 | #endif /* AVCODEC_HWACCELS_H */ | 59 | #endif /* AVCODEC_HWACCELS_H */ |
| @@ -388,7 +388,7 @@ static int vaapi_h264_decode_slice(AVCodecContext *avctx, · 387 unmodified lines | |||
| 388 | return 0; | 388 | return 0; |
| 389 | } | 389 | } |
| 390 | 390 | ||
| 391 | AVHWAccel ff_h264_vaapi_hwaccel = { | 391 | const AVHWAccel ff_h264_vaapi_hwaccel = { |
| 392 | .name = "h264_vaapi", | 392 | .name = "h264_vaapi", |
| 393 | .type = AVMEDIA_TYPE_VIDEO, | 393 | .type = AVMEDIA_TYPE_VIDEO, |
| 394 | .id = AV_CODEC_ID_H264, | 394 | .id = AV_CODEC_ID_H264, |
| @@ -423,7 +423,7 @@ static int vaapi_hevc_decode_slice(AVCodecContext *avctx, · 422 unmodified lines | |||
| 423 | return 0; | 423 | return 0; |
| 424 | } | 424 | } |
| 425 | 425 | ||
| 426 | AVHWAccel ff_hevc_vaapi_hwaccel = { | 426 | const AVHWAccel ff_hevc_vaapi_hwaccel = { |
| 427 | .name = "hevc_vaapi", | 427 | .name = "hevc_vaapi", |
| 428 | .type = AVMEDIA_TYPE_VIDEO, | 428 | .type = AVMEDIA_TYPE_VIDEO, |
| 429 | .id = AV_CODEC_ID_HEVC, | 429 | .id = AV_CODEC_ID_HEVC, |
| @@ -173,7 +173,7 @@ static int vaapi_mpeg2_decode_slice(AVCodecContext *avctx, const uint8_t *buffer · 172 unmodified lines | |||
| 173 | return 0; | 173 | return 0; |
| 174 | } | 174 | } |
| 175 | 175 | ||
| 176 | AVHWAccel ff_mpeg2_vaapi_hwaccel = { | 176 | const AVHWAccel ff_mpeg2_vaapi_hwaccel = { |
| 177 | .name = "mpeg2_vaapi", | 177 | .name = "mpeg2_vaapi", |
| 178 | .type = AVMEDIA_TYPE_VIDEO, | 178 | .type = AVMEDIA_TYPE_VIDEO, |
| 179 | .id = AV_CODEC_ID_MPEG2VIDEO, | 179 | .id = AV_CODEC_ID_MPEG2VIDEO, |
| @@ -189,7 +189,7 @@ static int vaapi_mpeg4_decode_slice(AVCodecContext *avctx, const uint8_t *buffer · 188 unmodified lines | |||
| 189 | } | 189 | } |
| 190 | 190 | ||
| 191 | #if CONFIG_MPEG4_VAAPI_HWACCEL | 191 | #if CONFIG_MPEG4_VAAPI_HWACCEL |
| 192 | AVHWAccel ff_mpeg4_vaapi_hwaccel = { | 192 | const AVHWAccel ff_mpeg4_vaapi_hwaccel = { |
| 193 | .name = "mpeg4_vaapi", | 193 | .name = "mpeg4_vaapi", |
| 194 | .type = AVMEDIA_TYPE_VIDEO, | 194 | .type = AVMEDIA_TYPE_VIDEO, |
| 195 | .id = AV_CODEC_ID_MPEG4, | 195 | .id = AV_CODEC_ID_MPEG4, |
| @@ -207,7 +207,7 @@ AVHWAccel ff_mpeg4_vaapi_hwaccel = { · 11 unmodified lines | |||
| 207 | #endif | 207 | #endif |
| 208 | 208 | ||
| 209 | #if CONFIG_H263_VAAPI_HWACCEL | 209 | #if CONFIG_H263_VAAPI_HWACCEL |
| 210 | AVHWAccel ff_h263_vaapi_hwaccel = { | 210 | const AVHWAccel ff_h263_vaapi_hwaccel = { |
| 211 | .name = "h263_vaapi", | 211 | .name = "h263_vaapi", |
| 212 | .type = AVMEDIA_TYPE_VIDEO, | 212 | .type = AVMEDIA_TYPE_VIDEO, |
| 213 | .id = AV_CODEC_ID_H263, | 213 | .id = AV_CODEC_ID_H263, |
| @@ -388,7 +388,7 @@ static int vaapi_vc1_decode_slice(AVCodecContext *avctx, const uint8_t *buffer, · 387 unmodified lines | |||
| 388 | } | 388 | } |
| 389 | 389 | ||
| 390 | #if CONFIG_WMV3_VAAPI_HWACCEL | 390 | #if CONFIG_WMV3_VAAPI_HWACCEL |
| 391 | AVHWAccel ff_wmv3_vaapi_hwaccel = { | 391 | const AVHWAccel ff_wmv3_vaapi_hwaccel = { |
| 392 | .name = "wmv3_vaapi", | 392 | .name = "wmv3_vaapi", |
| 393 | .type = AVMEDIA_TYPE_VIDEO, | 393 | .type = AVMEDIA_TYPE_VIDEO, |
| 394 | .id = AV_CODEC_ID_WMV3, | 394 | .id = AV_CODEC_ID_WMV3, |
| @@ -405,7 +405,7 @@ AVHWAccel ff_wmv3_vaapi_hwaccel = { · 10 unmodified lines | |||
| 405 | }; | 405 | }; |
| 406 | #endif | 406 | #endif |
| 407 | 407 | ||
| 408 | AVHWAccel ff_vc1_vaapi_hwaccel = { | 408 | const AVHWAccel ff_vc1_vaapi_hwaccel = { |
| 409 | .name = "vc1_vaapi", | 409 | .name = "vc1_vaapi", |
| 410 | .type = AVMEDIA_TYPE_VIDEO, | 410 | .type = AVMEDIA_TYPE_VIDEO, |
| 411 | .id = AV_CODEC_ID_VC1, | 411 | .id = AV_CODEC_ID_VC1, |
| @@ -220,7 +220,7 @@ fail: · 219 unmodified lines | |||
| 220 | return err; | 220 | return err; |
| 221 | } | 221 | } |
| 222 | 222 | ||
| 223 | AVHWAccel ff_vp8_vaapi_hwaccel = { | 223 | const AVHWAccel ff_vp8_vaapi_hwaccel = { |
| 224 | .name = "vp8_vaapi", | 224 | .name = "vp8_vaapi", |
| 225 | .type = AVMEDIA_TYPE_VIDEO, | 225 | .type = AVMEDIA_TYPE_VIDEO, |
| 226 | .id = AV_CODEC_ID_VP8, | 226 | .id = AV_CODEC_ID_VP8, |
| @@ -247,7 +247,7 @@ static int vda_h264_uninit(AVCodecContext *avctx) · 246 unmodified lines | |||
| 247 | return 0; | 247 | return 0; |
| 248 | } | 248 | } |
| 249 | 249 | ||
| 250 | AVHWAccel ff_h264_vda_old_hwaccel = { | 250 | const AVHWAccel ff_h264_vda_old_hwaccel = { |
| 251 | .name = "h264_vda", | 251 | .name = "h264_vda", |
| 252 | .type = AVMEDIA_TYPE_VIDEO, | 252 | .type = AVMEDIA_TYPE_VIDEO, |
| 253 | .id = AV_CODEC_ID_H264, | 253 | .id = AV_CODEC_ID_H264, |
| @@ -483,7 +483,7 @@ static int vda_h264_alloc_frame(AVCodecContext *avctx, AVFrame *frame) · 229 unmodified lines | |||
| 483 | return 0; | 483 | return 0; |
| 484 | } | 484 | } |
| 485 | 485 | ||
| 486 | AVHWAccel ff_h264_vda_hwaccel = { | 486 | const AVHWAccel ff_h264_vda_hwaccel = { |
| 487 | .name = "h264_vda", | 487 | .name = "h264_vda", |
| 488 | .type = AVMEDIA_TYPE_VIDEO, | 488 | .type = AVMEDIA_TYPE_VIDEO, |
| 489 | .id = AV_CODEC_ID_H264, | 489 | .id = AV_CODEC_ID_H264, |
| @@ -262,7 +262,7 @@ static int vdpau_h264_init(AVCodecContext *avctx) · 261 unmodified lines | |||
| 262 | return ff_vdpau_common_init(avctx, profile, level); | 262 | return ff_vdpau_common_init(avctx, profile, level); |
| 263 | } | 263 | } |
| 264 | 264 | ||
| 265 | AVHWAccel ff_h264_vdpau_hwaccel = { | 265 | const AVHWAccel ff_h264_vdpau_hwaccel = { |
| 266 | .name = "h264_vdpau", | 266 | .name = "h264_vdpau", |
| 267 | .type = AVMEDIA_TYPE_VIDEO, | 267 | .type = AVMEDIA_TYPE_VIDEO, |
| 268 | .id = AV_CODEC_ID_H264, | 268 | .id = AV_CODEC_ID_H264, |
| @@ -413,7 +413,7 @@ static int vdpau_hevc_init(AVCodecContext *avctx) · 412 unmodified lines | |||
| 413 | return ff_vdpau_common_init(avctx, profile, level); | 413 | return ff_vdpau_common_init(avctx, profile, level); |
| 414 | } | 414 | } |
| 415 | 415 | ||
| 416 | AVHWAccel ff_hevc_vdpau_hwaccel = { | 416 | const AVHWAccel ff_hevc_vdpau_hwaccel = { |
| 417 | .name = "hevc_vdpau", | 417 | .name = "hevc_vdpau", |
| 418 | .type = AVMEDIA_TYPE_VIDEO, | 418 | .type = AVMEDIA_TYPE_VIDEO, |
| 419 | .id = AV_CODEC_ID_HEVC, | 419 | .id = AV_CODEC_ID_HEVC, |
| @@ -103,7 +103,7 @@ static int vdpau_mpeg1_init(AVCodecContext *avctx) · 102 unmodified lines | |||
| 103 | VDP_DECODER_LEVEL_MPEG1_NA); | 103 | VDP_DECODER_LEVEL_MPEG1_NA); |
| 104 | } | 104 | } |
| 105 | 105 | ||
| 106 | AVHWAccel ff_mpeg1_vdpau_hwaccel = { | 106 | const AVHWAccel ff_mpeg1_vdpau_hwaccel = { |
| 107 | .name = "mpeg1_vdpau", | 107 | .name = "mpeg1_vdpau", |
| 108 | .type = AVMEDIA_TYPE_VIDEO, | 108 | .type = AVMEDIA_TYPE_VIDEO, |
| 109 | .id = AV_CODEC_ID_MPEG1VIDEO, | 109 | .id = AV_CODEC_ID_MPEG1VIDEO, |
| @@ -138,7 +138,7 @@ static int vdpau_mpeg2_init(AVCodecContext *avctx) · 28 unmodified lines | |||
| 138 | return ff_vdpau_common_init(avctx, profile, VDP_DECODER_LEVEL_MPEG2_HL); | 138 | return ff_vdpau_common_init(avctx, profile, VDP_DECODER_LEVEL_MPEG2_HL); |
| 139 | } | 139 | } |
| 140 | 140 | ||
| 141 | AVHWAccel ff_mpeg2_vdpau_hwaccel = { | 141 | const AVHWAccel ff_mpeg2_vdpau_hwaccel = { |
| 142 | .name = "mpeg2_vdpau", | 142 | .name = "mpeg2_vdpau", |
| 143 | .type = AVMEDIA_TYPE_VIDEO, | 143 | .type = AVMEDIA_TYPE_VIDEO, |
| 144 | .id = AV_CODEC_ID_MPEG2VIDEO, | 144 | .id = AV_CODEC_ID_MPEG2VIDEO, |
| @@ -107,7 +107,7 @@ static int vdpau_mpeg4_init(AVCodecContext *avctx) · 106 unmodified lines | |||
| 107 | return ff_vdpau_common_init(avctx, profile, avctx->level); | 107 | return ff_vdpau_common_init(avctx, profile, avctx->level); |
| 108 | } | 108 | } |
| 109 | 109 | ||
| 110 | AVHWAccel ff_mpeg4_vdpau_hwaccel = { | 110 | const AVHWAccel ff_mpeg4_vdpau_hwaccel = { |
| 111 | .name = "mpeg4_vdpau", | 111 | .name = "mpeg4_vdpau", |
| 112 | .type = AVMEDIA_TYPE_VIDEO, | 112 | .type = AVMEDIA_TYPE_VIDEO, |
| 113 | .id = AV_CODEC_ID_MPEG4, | 113 | .id = AV_CODEC_ID_MPEG4, |
| @@ -132,7 +132,7 @@ static int vdpau_vc1_init(AVCodecContext *avctx) · 131 unmodified lines | |||
| 132 | } | 132 | } |
| 133 | 133 | ||
| 134 | #if CONFIG_WMV3_VDPAU_HWACCEL | 134 | #if CONFIG_WMV3_VDPAU_HWACCEL |
| 135 | AVHWAccel ff_wmv3_vdpau_hwaccel = { | 135 | const AVHWAccel ff_wmv3_vdpau_hwaccel = { |
| 136 | .name = "wm3_vdpau", | 136 | .name = "wm3_vdpau", |
| 137 | .type = AVMEDIA_TYPE_VIDEO, | 137 | .type = AVMEDIA_TYPE_VIDEO, |
| 138 | .id = AV_CODEC_ID_WMV3, | 138 | .id = AV_CODEC_ID_WMV3, |
| @@ -149,7 +149,7 @@ AVHWAccel ff_wmv3_vdpau_hwaccel = { · 10 unmodified lines | |||
| 149 | }; | 149 | }; |
| 150 | #endif | 150 | #endif |
| 151 | 151 | ||
| 152 | AVHWAccel ff_vc1_vdpau_hwaccel = { | 152 | const AVHWAccel ff_vc1_vdpau_hwaccel = { |
| 153 | .name = "vc1_vdpau", | 153 | .name = "vc1_vdpau", |
| 154 | .type = AVMEDIA_TYPE_VIDEO, | 154 | .type = AVMEDIA_TYPE_VIDEO, |
| 155 | .id = AV_CODEC_ID_VC1, | 155 | .id = AV_CODEC_ID_VC1, |
| @@ -28,7 +28,7 @@ · 27 unmodified lines | |||
| 28 | #include "libavutil/version.h" | 28 | #include "libavutil/version.h" |
| 29 | 29 | ||
| 30 | #define LIBAVCODEC_VERSION_MAJOR 58 | 30 | #define LIBAVCODEC_VERSION_MAJOR 58 |
| 31 | #define LIBAVCODEC_VERSION_MINOR 7 | 31 | #define LIBAVCODEC_VERSION_MINOR 8 |
| 32 | #define LIBAVCODEC_VERSION_MICRO 0 | 32 | #define LIBAVCODEC_VERSION_MICRO 0 |
| 33 | 33 | ||
| 34 | #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ | 34 | #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ |