[SCM] mplayer2/master: Increase MP_INPUT_BUFFER_PADDING_SIZE to 32 to make ffmpeg happy.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Wed Oct 8 14:33:41 UTC 2014


The following commit has been merged in the master branch:
commit 1d36371d71666a7775155aa892c0acdee59fe5d5
Author: Alessio Treglia <alessio at debian.org>
Date:   Wed Oct 8 15:29:47 2014 +0100

    Increase MP_INPUT_BUFFER_PADDING_SIZE to 32 to make ffmpeg happy.

diff --git a/debian/patches/input_buffer_padding.patch b/debian/patches/input_buffer_padding.patch
new file mode 100644
index 0000000..f66d51e
--- /dev/null
+++ b/debian/patches/input_buffer_padding.patch
@@ -0,0 +1,20 @@
+Description: Increase FFMPEG_INPUT_BUFFER_PADDING_SIZE to 32
+ This is needed to be able to build with FFmpeg 2.3.
+Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
+Last-Update: 2014-07-20
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=758359
+---
+ libmpdemux/demuxer.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- mplayer2.orig/libmpdemux/demuxer.h
++++ mplayer2/libmpdemux/demuxer.h
+@@ -121,7 +121,7 @@ enum timestamp_type {
+ #define SEEK_BACKWARD (1 << 3)
+ 
+ // demux_lavf can pass lavf buffers using FF_INPUT_BUFFER_PADDING_SIZE instead
+-#define MP_INPUT_BUFFER_PADDING_SIZE 16
++#define MP_INPUT_BUFFER_PADDING_SIZE 32
+ 
+ typedef struct demux_stream {
+     int buffer_pos;        // current buffer position
diff --git a/debian/patches/series b/debian/patches/series
index 00619b1..7ed4233 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ ftbfs-libav10.patch
 samba4.patch
 aarch64.patch
 ppc64el.patch
+input_buffer_padding.patch

-- 
mplayer2 packaging



More information about the pkg-multimedia-commits mailing list