From 661633b6890346474ed38b7e23a8f0cc9ef579c7 Mon Sep 17 00:00:00 2001 From: wm4 Date: Thu, 12 Jun 2014 01:04:53 +0200 Subject: 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. --- demux/demux.c | 12 ++++-------- demux/demux.h | 3 --- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/demux/demux.c b/demux/demux.c index 7e0fbac058..ce6dbe949c 100644 --- a/demux/demux.c +++ b/demux/demux.c @@ -44,10 +44,6 @@ #include -#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; @@ -143,12 +139,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; } @@ -175,12 +171,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 0ef84c0c5f..e1cefa5eff 100644 --- a/demux/demux.h +++ b/demux/demux.h @@ -80,9 +80,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; -- cgit v1.2.3