summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUoti Urpala <uau@mplayer2.org>2011-08-26 06:29:36 +0300
committerUoti Urpala <uau@mplayer2.org>2011-08-26 06:29:36 +0300
commit506ab685d4c789541a37947cd933fc47855e1b8a (patch)
treeff4b049c989000e408a5ecae31b659a06f2f8eda
parent9fe2fa599b0a8e9e1468b53ed025b76b55639af5 (diff)
downloadmpv-506ab685d4c789541a37947cd933fc47855e1b8a.tar.bz2
mpv-506ab685d4c789541a37947cd933fc47855e1b8a.tar.xz
demuxer.h: raise pad amount to allow compiling against FFmpeg
FFmpeg has increased FF_INPUT_BUFFER_PADDING_SIZE to 16 (unlike Libav which still has it at 8). Raise MP_INPUT_BUFFER_PADDING_SIZE to 16 to allow compilation against FFmpeg too (demuxer.c checks the padding size for packets is at least as much as libavcodec wants for its decoders, and this check failed with the previous value of 8).
-rw-r--r--libmpdemux/demuxer.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/libmpdemux/demuxer.h b/libmpdemux/demuxer.h
index 1b885f28d3..6cdad7911a 100644
--- a/libmpdemux/demuxer.h
+++ b/libmpdemux/demuxer.h
@@ -123,7 +123,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 8
+#define MP_INPUT_BUFFER_PADDING_SIZE 16
typedef struct demux_stream {
int buffer_pos; // current buffer position