diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-11-22 13:14:39 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-11-22 13:14:39 +0000 |
| commit | dcd0dacccaa18af16e33d03d51062bef5eade67f (patch) | |
| tree | ba0eb8081b9dfb614c546612edb9a0c6fde79f69 | |
| parent | 65c2bae2b542a5157481ea8ca037da0583d85d50 (diff) | |
| download | mpv-dcd0dacccaa18af16e33d03d51062bef5eade67f.tar.bz2 mpv-dcd0dacccaa18af16e33d03d51062bef5eade67f.tar.xz | |
Switch ad_ffmpeg to avcodec_decode_audio3
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29955 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | libmpcodecs/ad_ffmpeg.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libmpcodecs/ad_ffmpeg.c b/libmpcodecs/ad_ffmpeg.c index 64b5e1a29a..4d091dd694 100644 --- a/libmpcodecs/ad_ffmpeg.c +++ b/libmpcodecs/ad_ffmpeg.c @@ -163,15 +163,19 @@ static int decode_audio(sh_audio_t *sh_audio,unsigned char *buf,int minlen,int m unsigned char *start=NULL; int y,len=-1; while(len<minlen){ + AVPacket pkt; int len2=maxlen; double pts; int x=ds_get_packet_pts(sh_audio->ds,&start, &pts); if(x<=0) break; // error + av_init_packet(&pkt); + pkt.data = start; + pkt.size = x; if (pts != MP_NOPTS_VALUE) { sh_audio->pts = pts; sh_audio->pts_bytes = 0; } - y=avcodec_decode_audio2(sh_audio->context,(int16_t*)buf,&len2,start,x); + y=avcodec_decode_audio3(sh_audio->context,(int16_t*)buf,&len2,&pkt); //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!) |