diff options
Diffstat (limited to 'contrib/ffmpeg/old/A05-hevc10b-decode.patch')
-rw-r--r-- | contrib/ffmpeg/old/A05-hevc10b-decode.patch | 50 |
1 files changed, 0 insertions, 50 deletions
diff --git a/contrib/ffmpeg/old/A05-hevc10b-decode.patch b/contrib/ffmpeg/old/A05-hevc10b-decode.patch deleted file mode 100644 index 63b582641..000000000 --- a/contrib/ffmpeg/old/A05-hevc10b-decode.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff --git a/libavcodec/qsvdec.c b/libavcodec/qsvdec.c -index e19eba5..e9ad86c 100644 ---- a/libavcodec/qsvdec.c -+++ b/libavcodec/qsvdec.c -@@ -416,6 +416,7 @@ int ff_qsv_process_data(AVCodecContext *avctx, QSVContext *q, - uint8_t *dummy_data; - int dummy_size; - int ret; -+ const AVPixFmtDescriptor *desc; - - if (!q->avctx_internal) { - q->avctx_internal = avcodec_alloc_context3(NULL); -@@ -452,8 +453,8 @@ int ff_qsv_process_data(AVCodecContext *avctx, QSVContext *q, - - /* TODO: flush delayed frames on reinit */ - if (q->parser->format != q->orig_pix_fmt || -- q->parser->coded_width != avctx->coded_width || -- q->parser->coded_height != avctx->coded_height) { -+ FFALIGN(q->parser->coded_width, 16) != FFALIGN(avctx->coded_width, 16) || -+ FFALIGN(q->parser->coded_height, 16) != FFALIGN(avctx->coded_height, 16)) { - enum AVPixelFormat pix_fmts[3] = { AV_PIX_FMT_QSV, - AV_PIX_FMT_NONE, - AV_PIX_FMT_NONE }; -@@ -472,8 +473,8 @@ int ff_qsv_process_data(AVCodecContext *avctx, QSVContext *q, - avctx->pix_fmt = pix_fmts[1] = qsv_format; - avctx->width = q->parser->width; - avctx->height = q->parser->height; -- avctx->coded_width = q->parser->coded_width; -- avctx->coded_height = q->parser->coded_height; -+ avctx->coded_width = FFALIGN(q->parser->coded_width, 16); -+ avctx->coded_height = FFALIGN(q->parser->coded_height, 16); - avctx->level = q->avctx_internal->level; - avctx->profile = q->avctx_internal->profile; - -@@ -483,6 +484,15 @@ int ff_qsv_process_data(AVCodecContext *avctx, QSVContext *q, - - avctx->pix_fmt = ret; - -+ desc = av_pix_fmt_desc_get(avctx->pix_fmt); -+ if (!desc) -+ goto reinit_fail; -+ -+ if (desc->comp[0].depth > 8) { -+ avctx->coded_width = FFALIGN(q->parser->coded_width, 32); -+ avctx->coded_height = FFALIGN(q->parser->coded_height, 32); -+ } -+ - ret = qsv_decode_init(avctx, q); - if (ret < 0) - goto reinit_fail; |