diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-07-16 16:18:25 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-07-16 16:18:25 +0000 |
| commit | e870f84bfba4ba9830c78f347e72805cd227d068 (patch) | |
| tree | 1aab5e4b76ab0bd2905ade6f9eab34231086f94c /libmpdemux/demuxer.h | |
| parent | fad0b588c2824b84449f04b9b69acb50742d3519 (diff) | |
| download | mpv-e870f84bfba4ba9830c78f347e72805cd227d068.tar.bz2 mpv-e870f84bfba4ba9830c78f347e72805cd227d068.tar.xz | |
Move duplicate FF_INPUT_BUFFER_PADDING_SIZE handling into demuxer.h
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27301 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demuxer.h')
| -rw-r--r-- | libmpdemux/demuxer.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/libmpdemux/demuxer.h b/libmpdemux/demuxer.h index a2464c7390..76942a3aed 100644 --- a/libmpdemux/demuxer.h +++ b/libmpdemux/demuxer.h @@ -93,6 +93,12 @@ #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 + // Holds one packet/frame/whatever typedef struct demux_packet_st { int len; @@ -243,7 +249,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 + 8))) + if (len > 0 && (dp->buffer = (unsigned char *)malloc(len + FF_INPUT_BUFFER_PADDING_SIZE))) memset(dp->buffer + len, 0, 8); else dp->len = 0; |