* commit '5da51284937649a8ebb84fa951c235438fcbf8ae': cavs: Add a dependency on h264chroma lavc: Split out ff_hwaccel_pixfmt_list_420[] over individual codecs Conflicts: libavcodec/h263dec.c libavcodec/h264.c libavcodec/mpeg12.c
Unified · Split
| @@ -68,7 +68,7 @@ static const uint8_t div6[QP_MAX_NUM + 1] = { · 67 unmodified lines | |||
| 68 | 14,14,14,14, | 68 | 14,14,14,14, |
| 69 | }; | 69 | }; |
| 70 | 70 | ||
| 71 | static const enum AVPixelFormat hwaccel_pixfmt_list_h264_420[] = { | 71 | static const enum AVPixelFormat h264_hwaccel_pixfmt_list_420[] = { |
| 72 | #if CONFIG_H264_DXVA2_HWACCEL | 72 | #if CONFIG_H264_DXVA2_HWACCEL |
| 73 | AV_PIX_FMT_DXVA2_VLD, | 73 | AV_PIX_FMT_DXVA2_VLD, |
| 74 | #endif | 74 | #endif |
| @@ -85,7 +85,7 @@ static const enum AVPixelFormat hwaccel_pixfmt_list_h264_420[] = { · 10 unmodified lines | |||
| 85 | AV_PIX_FMT_NONE | 85 | AV_PIX_FMT_NONE |
| 86 | }; | 86 | }; |
| 87 | 87 | ||
| 88 | static const enum AVPixelFormat hwaccel_pixfmt_list_h264_jpeg_420[] = { | 88 | static const enum AVPixelFormat h264_hwaccel_pixfmt_list_jpeg_420[] = { |
| 89 | #if CONFIG_H264_DXVA2_HWACCEL | 89 | #if CONFIG_H264_DXVA2_HWACCEL |
| 90 | AV_PIX_FMT_DXVA2_VLD, | 90 | AV_PIX_FMT_DXVA2_VLD, |
| 91 | #endif | 91 | #endif |
| @@ -2972,8 +2972,8 @@ static enum PixelFormat get_pixel_format(H264Context *h, int force_callback) · 2880 unmodified lines | |||
| 2972 | const enum AVPixelFormat * fmt = h->avctx->codec->pix_fmts ? | 2972 | const enum AVPixelFormat * fmt = h->avctx->codec->pix_fmts ? |
| 2973 | h->avctx->codec->pix_fmts : | 2973 | h->avctx->codec->pix_fmts : |
| 2974 | h->avctx->color_range == AVCOL_RANGE_JPEG ? | 2974 | h->avctx->color_range == AVCOL_RANGE_JPEG ? |
| 2975 | hwaccel_pixfmt_list_h264_jpeg_420 : | 2975 | h264_hwaccel_pixfmt_list_jpeg_420 : |
| 2976 | hwaccel_pixfmt_list_h264_420; | 2976 | h264_hwaccel_pixfmt_list_420; |
| 2977 | 2977 | ||
| 2978 | for (i=0; fmt[i] != AV_PIX_FMT_NONE; i++) | 2978 | for (i=0; fmt[i] != AV_PIX_FMT_NONE; i++) |
| 2979 | if (fmt[i] == h->avctx->pix_fmt && !force_callback) | 2979 | if (fmt[i] == h->avctx->pix_fmt && !force_callback) |