Mercurial > mplayer.hg
comparison libmpdemux/demux_viv.c @ 27282:16beae919ff1
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.
| author | reimar |
|---|---|
| date | Thu, 17 Jul 2008 17:14:12 +0000 |
| parents | 21e634c01f9f |
| children | d643e4643313 |
comparison
equal
deleted
inserted
replaced
| 27281:e47193172586 | 27282:16beae919ff1 |
|---|---|
| 376 ds->asf_packet=NULL; | 376 ds->asf_packet=NULL; |
| 377 // printf("packet!\n"); | 377 // printf("packet!\n"); |
| 378 } else { | 378 } else { |
| 379 // append data to it! | 379 // append data to it! |
| 380 demux_packet_t* dp=ds->asf_packet; | 380 demux_packet_t* dp=ds->asf_packet; |
| 381 if(dp->len + len + FF_INPUT_BUFFER_PADDING_SIZE < 0) | 381 if(dp->len + len + MP_INPUT_BUFFER_PADDING_SIZE < 0) |
| 382 return 0; | 382 return 0; |
| 383 dp->buffer=realloc(dp->buffer,dp->len+len+FF_INPUT_BUFFER_PADDING_SIZE); | 383 dp->buffer=realloc(dp->buffer,dp->len+len+MP_INPUT_BUFFER_PADDING_SIZE); |
| 384 memset(dp->buffer+dp->len+len, 0, FF_INPUT_BUFFER_PADDING_SIZE); | 384 memset(dp->buffer+dp->len+len, 0, MP_INPUT_BUFFER_PADDING_SIZE); |
| 385 //memcpy(dp->buffer+dp->len,data,len); | 385 //memcpy(dp->buffer+dp->len,data,len); |
| 386 stream_read(demux->stream,dp->buffer+dp->len,len); | 386 stream_read(demux->stream,dp->buffer+dp->len,len); |
| 387 mp_dbg(MSGT_DEMUX,MSGL_DBG4,"data appended! %d+%d\n",dp->len,len); | 387 mp_dbg(MSGT_DEMUX,MSGL_DBG4,"data appended! %d+%d\n",dp->len,len); |
| 388 dp->len+=len; | 388 dp->len+=len; |
| 389 // we are ready now. | 389 // we are ready now. |