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/demux_viv.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/demux_viv.c')
| -rw-r--r-- | libmpdemux/demux_viv.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/libmpdemux/demux_viv.c b/libmpdemux/demux_viv.c index 46ff28841d..489ccaaf19 100644 --- a/libmpdemux/demux_viv.c +++ b/libmpdemux/demux_viv.c @@ -14,12 +14,6 @@ #include "demuxer.h" #include "stheader.h" -#ifdef USE_LIBAVCODEC -#include "libavcodec/avcodec.h" -#else -#define FF_INPUT_BUFFER_PADDING_SIZE 8 -#endif - /* parameters ! */ int vivo_param_version = -1; char *vivo_param_acodec = NULL; @@ -384,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); |