summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-06-12 01:04:53 +0200
committerwm4 <wm4@nowhere>2014-06-12 01:04:53 +0200
commitd69e068fda13288c8040b83bd1aa67699a2dddd3 (patch)
tree6f572a6687861b9d788360611182af89f50914fa
parent598245a80fa74455b71372b569a21f88a11e732b (diff)
downloadmpv-d69e068fda13288c8040b83bd1aa67699a2dddd3.tar.bz2
mpv-d69e068fda13288c8040b83bd1aa67699a2dddd3.tar.xz
demux: fix compilation with FFmpeg git
FFmpeg requires a bullshit padding after each input buffer, and they just increased that padding without warning and without ABI or API bump. We need this only in one file (although mp_image hardcodes something similar, for which no FFmpeg API define is available), so drop our own define.
-rw-r--r--demux/demux.c12
-rw-r--r--demux/demux.h3
2 files changed, 4 insertions, 11 deletions
diff --git a/demux/demux.c b/demux/demux.c
index f4baa5a5fa..b9236832ce 100644
--- a/demux/demux.c
+++ b/demux/demux.c
@@ -46,10 +46,6 @@
#include <libavcodec/avcodec.h>
-#if MP_INPUT_BUFFER_PADDING_SIZE < FF_INPUT_BUFFER_PADDING_SIZE
-#error MP_INPUT_BUFFER_PADDING_SIZE is too small!
-#endif
-
// Demuxer list
extern const struct demuxer_desc demuxer_desc_edl;
extern const struct demuxer_desc demuxer_desc_cue;
@@ -146,12 +142,12 @@ static struct demux_packet *create_packet(size_t len)
struct demux_packet *new_demux_packet(size_t len)
{
struct demux_packet *dp = create_packet(len);
- dp->buffer = malloc(len + MP_INPUT_BUFFER_PADDING_SIZE);
+ dp->buffer = malloc(len + FF_INPUT_BUFFER_PADDING_SIZE);
if (!dp->buffer) {
fprintf(stderr, "Memory allocation failure!\n");
abort();
}
- memset(dp->buffer + len, 0, MP_INPUT_BUFFER_PADDING_SIZE);
+ memset(dp->buffer + len, 0, FF_INPUT_BUFFER_PADDING_SIZE);
dp->allocation = dp->buffer;
return dp;
}
@@ -178,12 +174,12 @@ void resize_demux_packet(struct demux_packet *dp, size_t len)
abort();
}
assert(dp->allocation);
- dp->buffer = realloc(dp->buffer, len + MP_INPUT_BUFFER_PADDING_SIZE);
+ dp->buffer = realloc(dp->buffer, len + FF_INPUT_BUFFER_PADDING_SIZE);
if (!dp->buffer) {
fprintf(stderr, "Memory allocation failure!\n");
abort();
}
- memset(dp->buffer + len, 0, MP_INPUT_BUFFER_PADDING_SIZE);
+ memset(dp->buffer + len, 0, FF_INPUT_BUFFER_PADDING_SIZE);
dp->len = len;
dp->allocation = dp->buffer;
}
diff --git a/demux/demux.h b/demux/demux.h
index 2bcfc241c1..d477bb45a9 100644
--- a/demux/demux.h
+++ b/demux/demux.h
@@ -87,9 +87,6 @@ enum demux_check {
DEMUX_CHECK_NORMAL, // normal, safe detection
};
-// demux_lavf can pass lavf buffers using FF_INPUT_BUFFER_PADDING_SIZE instead
-#define MP_INPUT_BUFFER_PADDING_SIZE 16
-
#define MAX_SH_STREAMS 256
struct demuxer;