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/demux_viv.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/demux_viv.c')
-rw-r--r-- | libmpdemux/demux_viv.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libmpdemux/demux_viv.c b/libmpdemux/demux_viv.c index 7ee2332e27..489ccaaf19 100644 --- a/libmpdemux/demux_viv.c +++ b/libmpdemux/demux_viv.c @@ -378,10 +378,10 @@ static int demux_vivo_fill_buffer(demuxer_t *demux, demux_stream_t *dsds){ } else { // append data to it! demux_packet_t* dp=ds->asf_packet; - if(dp->len + len + FF_INPUT_BUFFER_PADDING_SIZE < 0) + if(dp->len + len + MP_INPUT_BUFFER_PADDING_SIZE < 0) return 0; - dp->buffer=realloc(dp->buffer,dp->len+len+FF_INPUT_BUFFER_PADDING_SIZE); - memset(dp->buffer+dp->len+len, 0, FF_INPUT_BUFFER_PADDING_SIZE); + dp->buffer=realloc(dp->buffer,dp->len+len+MP_INPUT_BUFFER_PADDING_SIZE); + memset(dp->buffer+dp->len+len, 0, MP_INPUT_BUFFER_PADDING_SIZE); //memcpy(dp->buffer+dp->len,data,len); stream_read(demux->stream,dp->buffer+dp->len,len); mp_dbg(MSGT_DEMUX,MSGL_DBG4,"data appended! %d+%d\n",dp->len,len); |