Skip to content

Commit

Permalink
package/mediastreamer: fix patch fuzz
Browse files Browse the repository at this point in the history
Commit 8f88a64 ("support/scripts/apply-patches.sh: set the maximum
fuzz factor to 0") reduced the fuzz factor.

Due to this change, mediastreamer fails to build with output:

    Applying 0002-Use-AV_INPUT_BUFFER_PADDING_SIZE-to-determine-paddin.patch using patch:
    patching file src/utils/ffmpeg-priv.h
    Hunk #1 FAILED at 102.
    1 out of 1 hunk FAILED -- saving rejects to file src/utils/ffmpeg-priv.h.rej

This commit refreshes the package patch on the current package version.

Signed-off-by: Dario Binacchi <[email protected]>
Signed-off-by: Romain Naour <[email protected]>
  • Loading branch information
passgat authored and RomainNaour committed Jul 12, 2024
1 parent ceba36f commit e6d5cdc
Showing 1 changed file with 4 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=901735
Signed-off-by: Bernd Kuhls <[email protected]>
[Fabrice: updated for 4.3.1]
Signed-off-by: Fabrice Fontaine <[email protected]>
[Dario: make the patch to be applied with fuzz factor 0]
Signed-off-by: Dario Binacchi <[email protected]>
---
src/utils/ffmpeg-priv.h | 4 ++++
src/videofilters/nowebcam.c | 4 ++--
Expand All @@ -28,8 +30,8 @@ diff --git a/src/utils/ffmpeg-priv.h b/src/utils/ffmpeg-priv.h
index c0745a9a..d59ea0e1 100644
--- a/src/utils/ffmpeg-priv.h
+++ b/src/utils/ffmpeg-priv.h
@@ -102,6 +102,10 @@ static inline int avcodec_decode_video2(AVCodecContext *avctx, AVFrame *picture,
#endif
@@ -115,6 +115,10 @@
extern "C" {
#endif

+#ifndef AV_INPUT_BUFFER_PADDING_SIZE
Expand Down

0 comments on commit e6d5cdc

Please sign in to comment.