diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-07-17 17:14:12 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-07-17 17:14:12 +0000 |
| commit | 4153f4e21c26703a6cc68ed33be9f90365788816 (patch) | |
| tree | b1b066a7530f29055506d8b06d60b53196c58faa /libmpdemux/demuxer.c | |
| parent | 6dfb85dc9ec79ec10e073e317566cfc0fbffb319 (diff) | |
| download | mpv-4153f4e21c26703a6cc68ed33be9f90365788816.tar.bz2 mpv-4153f4e21c26703a6cc68ed33be9f90365788816.tar.xz | |
Avoid including avcodec.h in demuxer.h (and thus many other files) just to get
FF_INPUT_BUFFER_PADDING_SIZE.
Instead use MP_INPUT_BUFFER_PADDING_SIZE and add a preprocessor check that it
is big enough.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27314 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demuxer.c')
| -rw-r--r-- | libmpdemux/demuxer.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c index afa9d4fdcc..6d51b434e8 100644 --- a/libmpdemux/demuxer.c +++ b/libmpdemux/demuxer.c @@ -27,6 +27,13 @@ #include "libass/ass_mp.h" #endif +#ifdef USE_LIBAVCODEC +#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 +#endif + extern void resync_video_stream(sh_video_t *sh_video); extern void resync_audio_stream(sh_audio_t *sh_audio); |