diff options
| author | wm4 <wm4@nowhere> | 2014-06-12 01:04:53 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2014-06-14 14:07:23 +0200 |
| commit | 661633b6890346474ed38b7e23a8f0cc9ef579c7 (patch) | |
| tree | 34e9ce83e8fc3c7a9031ff3e034c736e23707389 /demux/demux.h | |
| parent | a0eea7aba81a0c9f919618dd7c96e4df1aaacded (diff) | |
| download | mpv-661633b6890346474ed38b7e23a8f0cc9ef579c7.tar.bz2 mpv-661633b6890346474ed38b7e23a8f0cc9ef579c7.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 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; |