Mercurial > mplayer.hg
changeset 23456:1582297cc3d2
Use avcodec_decode_audio2 in ad_ffmpeg.c
| author | reimar |
|---|---|
| date | Tue, 05 Jun 2007 14:12:37 +0000 |
| parents | f6e21317b46b |
| children | a124f3abc1ec |
| files | libmpcodecs/ad_ffmpeg.c |
| diffstat | 1 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/libmpcodecs/ad_ffmpeg.c Tue Jun 05 13:40:10 2007 +0000 +++ b/libmpcodecs/ad_ffmpeg.c Tue Jun 05 14:12:37 2007 +0000 @@ -150,7 +150,7 @@ unsigned char *start=NULL; int y,len=-1; while(len<minlen){ - int len2=0; + int len2=maxlen; double pts; int x=ds_get_packet_pts(sh_audio->ds,&start, &pts); if(x<=0) break; // error @@ -158,7 +158,7 @@ sh_audio->pts = pts; sh_audio->pts_bytes = 0; } - y=avcodec_decode_audio(sh_audio->context,(int16_t*)buf,&len2,start,x); + y=avcodec_decode_audio2(sh_audio->context,(int16_t*)buf,&len2,start,x); //printf("return:%d samples_out:%d bitstream_in:%d sample_sum:%d\n", y, len2, x, len); fflush(stdout); if(y<0){ mp_msg(MSGT_DECAUDIO,MSGL_V,"lavc_audio: error\n");break; } if(y<x) sh_audio->ds->buffer_pos+=y-x; // put back data (HACK!) @@ -166,6 +166,7 @@ //len=len2;break; if(len<0) len=len2; else len+=len2; buf+=len2; + maxlen -= len2; sh_audio->pts_bytes += len2; } mp_dbg(MSGT_DECAUDIO,MSGL_DBG2,"Decoded %d -> %d \n",y,len2);