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.h | |
| 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.h')
| -rw-r--r-- | libmpdemux/demuxer.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/libmpdemux/demuxer.h b/libmpdemux/demuxer.h index 76942a3aed..8cea2ace78 100644 --- a/libmpdemux/demuxer.h +++ b/libmpdemux/demuxer.h @@ -93,11 +93,7 @@ #define SEEK_ABSOLUTE (1 << 0) #define SEEK_FACTOR (1 << 1) -#ifdef USE_LIBAVCODEC -#include "libavcodec/avcodec.h" -#else -#define FF_INPUT_BUFFER_PADDING_SIZE 8 -#endif +#define MP_INPUT_BUFFER_PADDING_SIZE 8 // Holds one packet/frame/whatever typedef struct demux_packet_st { @@ -249,7 +245,7 @@ static inline demux_packet_t* new_demux_packet(int len){ dp->refcount=1; dp->master=NULL; dp->buffer=NULL; - if (len > 0 && (dp->buffer = (unsigned char *)malloc(len + FF_INPUT_BUFFER_PADDING_SIZE))) + if (len > 0 && (dp->buffer = (unsigned char *)malloc(len + MP_INPUT_BUFFER_PADDING_SIZE))) memset(dp->buffer + len, 0, 8); else dp->len = 0; |