diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-07-21 15:03:49 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-07-21 15:03:49 +0300 |
| commit | 2d4656e070697cebe8cb66568b3e8dd8919b5eed (patch) | |
| tree | 39c927d18e0ab459c7ddf36dcb876d2d0621e2a6 /libmpdemux/demuxer.c | |
| parent | 92f0cba26b5c032f8b097f525862233d92a02a2d (diff) | |
| parent | 4993d0c46afa109c3deb8d818be712ec86e0230a (diff) | |
| download | mpv-2d4656e070697cebe8cb66568b3e8dd8919b5eed.tar.bz2 mpv-2d4656e070697cebe8cb66568b3e8dd8919b5eed.tar.xz | |
Merge svn changes up to r27332
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 5d51a30b50..e7234b14af 100644 --- a/libmpdemux/demuxer.c +++ b/libmpdemux/demuxer.c @@ -28,6 +28,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); |