diff options
| author | wm4 <wm4@nowhere> | 2014-06-12 01:04:53 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2014-06-12 01:04:53 +0200 |
| commit | d69e068fda13288c8040b83bd1aa67699a2dddd3 (patch) | |
| tree | 6f572a6687861b9d788360611182af89f50914fa /demux/demux.h | |
| parent | 598245a80fa74455b71372b569a21f88a11e732b (diff) | |
| download | mpv-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.
Diffstat (limited to 'demux/demux.h')
| -rw-r--r-- | demux/demux.h | 3 |
1 files changed, 0 insertions, 3 deletions
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; |