Mercurial > mplayer.hg
comparison libmpcodecs/ad_faad.c @ 15978:c8dc500e078e
memcpy and memmove both copy memory, but when using memcpy the source and destination must not overlap, but here, they did overlap.
Committed with the kind blessing of Richard, patch by uau
| author | gpoirier |
|---|---|
| date | Fri, 15 Jul 2005 22:09:30 +0000 |
| parents | bdb826438aa8 |
| children | 6a9283411dfe |
comparison
equal
deleted
inserted
replaced
| 15977:54f2deef4b68 | 15978:c8dc500e078e |
|---|---|
| 236 /* update buffer index after faacDecDecode */ | 236 /* update buffer index after faacDecDecode */ |
| 237 if(faac_finfo.bytesconsumed >= sh->a_in_buffer_len) { | 237 if(faac_finfo.bytesconsumed >= sh->a_in_buffer_len) { |
| 238 sh->a_in_buffer_len=0; | 238 sh->a_in_buffer_len=0; |
| 239 } else { | 239 } else { |
| 240 sh->a_in_buffer_len-=faac_finfo.bytesconsumed; | 240 sh->a_in_buffer_len-=faac_finfo.bytesconsumed; |
| 241 memcpy(sh->a_in_buffer,&sh->a_in_buffer[faac_finfo.bytesconsumed],sh->a_in_buffer_len); | 241 memmove(sh->a_in_buffer,&sh->a_in_buffer[faac_finfo.bytesconsumed],sh->a_in_buffer_len); |
| 242 } | 242 } |
| 243 | 243 |
| 244 if(faac_finfo.error > 0) { | 244 if(faac_finfo.error > 0) { |
| 245 mp_msg(MSGT_DECAUDIO,MSGL_WARN,"FAAD: error: %s, trying to resync!\n", | 245 mp_msg(MSGT_DECAUDIO,MSGL_WARN,"FAAD: error: %s, trying to resync!\n", |
| 246 faacDecGetErrorMessage(faac_finfo.error)); | 246 faacDecGetErrorMessage(faac_finfo.error)); |