diff options
| author | Michael Forney <mforney@mforney.org> | 2023-03-02 22:11:17 -0800 |
|---|---|---|
| committer | Michael Forney <mforney@mforney.org> | 2023-03-02 22:31:21 -0800 |
| commit | 197efbce151436d27ce2d2255b4e16b4e7f2bc41 (patch) | |
| tree | a2b61d43246931a5ed983837055a7e6b10216dca /pkg/ffmpeg/patch/0004-libavcodec-Use-if-to-prevent-some-unintended-depende.patch | |
| parent | 743341f40628814bdef949564e2cadbb94f9c09b (diff) | |
ffmpeg: Update to 6.0
Diffstat (limited to 'pkg/ffmpeg/patch/0004-libavcodec-Use-if-to-prevent-some-unintended-depende.patch')
| -rw-r--r-- | pkg/ffmpeg/patch/0004-libavcodec-Use-if-to-prevent-some-unintended-depende.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkg/ffmpeg/patch/0004-libavcodec-Use-if-to-prevent-some-unintended-depende.patch b/pkg/ffmpeg/patch/0004-libavcodec-Use-if-to-prevent-some-unintended-depende.patch index 6cad7e43..62bdc96f 100644 --- a/pkg/ffmpeg/patch/0004-libavcodec-Use-if-to-prevent-some-unintended-depende.patch +++ b/pkg/ffmpeg/patch/0004-libavcodec-Use-if-to-prevent-some-unintended-depende.patch @@ -1,4 +1,4 @@ -From a7dd6d3b3467b46ff767d68b488fd17a32b54c7f Mon Sep 17 00:00:00 2001 +From 423031475f19346601a913dd24ae5ace3d0d9739 Mon Sep 17 00:00:00 2001 From: Michael Forney <mforney@mforney.org> Date: Tue, 7 Sep 2021 01:44:53 -0700 Subject: [PATCH] libavcodec: Use #if to prevent some unintended dependencies @@ -8,10 +8,10 @@ Subject: [PATCH] libavcodec: Use #if to prevent some unintended dependencies 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/libavcodec/mpegvideo_motion.c b/libavcodec/mpegvideo_motion.c -index 9a450b7c8e..cc920c6067 100644 +index 8922f5b1a5..40c364a5cc 100644 --- a/libavcodec/mpegvideo_motion.c +++ b/libavcodec/mpegvideo_motion.c -@@ -361,10 +361,11 @@ void mpeg_motion_internal(MpegEncContext *s, +@@ -207,10 +207,11 @@ void mpeg_motion_internal(MpegEncContext *s, pix_op[s->chroma_x_shift][uvdxy] (dest_cr, ptr_cr, uvlinesize, h >> s->chroma_y_shift); } @@ -25,7 +25,7 @@ index 9a450b7c8e..cc920c6067 100644 } /* apply one mpeg motion vector to the three components */ static void mpeg_motion(MpegEncContext *s, -@@ -861,11 +862,12 @@ static av_always_inline void mpv_motion_internal(MpegEncContext *s, +@@ -702,11 +703,12 @@ static av_always_inline void mpv_motion_internal(MpegEncContext *s, 0, 0, 0, ref_picture, pix_op, qpix_op, s->mv[dir][0][0], s->mv[dir][0][1], 16); |