From: Good Guy Date: Sat, 27 Aug 2022 20:21:08 +0000 (-0600) Subject: delete 2 of ffmpeg.git patches X-Git-Tag: 2022-08~2 X-Git-Url: https://git.cinelerra-gg.org/git/?a=commitdiff_plain;h=8a5c77cd787cd083c94a8f538dbbc0d548460646;p=goodguy%2Fcinelerra.git delete 2 of ffmpeg.git patches --- diff --git a/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch6 b/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch6 deleted file mode 100644 index e59a17cc..00000000 --- a/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch6 +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/libavcodec/vdpau_mpeg12.c b/libavcodec/vdpau_mpeg12.c -index 72220ffb4e..5687c416c9 100644 ---- a/libavcodec/vdpau_mpeg12.c -+++ b/libavcodec/vdpau_mpeg12.c -@@ -114,6 +114,7 @@ const AVHWAccel ff_mpeg1_vdpau_hwaccel = { - .frame_priv_data_size = sizeof(struct vdpau_picture_context), - .init = vdpau_mpeg1_init, - .uninit = ff_vdpau_common_uninit, -+ .frame_params = ff_vdpau_common_frame_params, - .priv_data_size = sizeof(VDPAUContext), - .caps_internal = HWACCEL_CAP_ASYNC_SAFE, - }; diff --git a/cinelerra-5.1/thirdparty/src/ffmpeg.git.patchA b/cinelerra-5.1/thirdparty/src/ffmpeg.git.patchA deleted file mode 100644 index 6d181e3c..00000000 --- a/cinelerra-5.1/thirdparty/src/ffmpeg.git.patchA +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/libavutil/hwcontext_vdpau.c b/libavutil/hwcontext_vdpau.c -index dbef5495af..fba06d8ccf 100644 ---- a/libavutil/hwcontext_vdpau.c -+++ b/libavutil/hwcontext_vdpau.c -@@ -68,6 +68,11 @@ static const VDPAUPixFmtMap pix_fmts_420[] = { - { 0, AV_PIX_FMT_NONE, }, - }; - -+static const VDPAUPixFmtMap pix_fmts_420j[] = { -+ { VDP_YCBCR_FORMAT_YV12, AV_PIX_FMT_YUVJ420P }, -+ { 0, AV_PIX_FMT_NONE, }, -+}; -+ - static const VDPAUPixFmtMap pix_fmts_422[] = { - { VDP_YCBCR_FORMAT_NV12, AV_PIX_FMT_NV16 }, - { VDP_YCBCR_FORMAT_YV12, AV_PIX_FMT_YUV422P }, -@@ -92,6 +97,7 @@ static const struct { - const VDPAUPixFmtMap *map; - } vdpau_pix_fmts[] = { - { VDP_CHROMA_TYPE_420, AV_PIX_FMT_YUV420P, pix_fmts_420 }, -+ { VDP_CHROMA_TYPE_420, AV_PIX_FMT_YUVJ420P, pix_fmts_420j }, - { VDP_CHROMA_TYPE_422, AV_PIX_FMT_YUV422P, pix_fmts_422 }, - { VDP_CHROMA_TYPE_444, AV_PIX_FMT_YUV444P, pix_fmts_444 }, - #ifdef VDP_YCBCR_FORMAT_P016