diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-01-25 15:17:50 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-01-25 15:17:50 +0200 |
| commit | ff2df2ac545bb36ca4c1d2f872236cdf0a7218ab (patch) | |
| tree | df3c0f31373ac65f38df0061fc8ec180abde1993 /libmpcodecs | |
| parent | 8dd016c538340e4a50628eedae0561d45c95ef6b (diff) | |
| parent | 5f5462c0ec32348a0b370b1f9c11bd7d10b52de6 (diff) | |
| download | mpv-ff2df2ac545bb36ca4c1d2f872236cdf0a7218ab.tar.bz2 mpv-ff2df2ac545bb36ca4c1d2f872236cdf0a7218ab.tar.xz | |
Merge svn changes up to r30322
Diffstat (limited to 'libmpcodecs')
| -rw-r--r-- | libmpcodecs/ad_ffmpeg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libmpcodecs/ad_ffmpeg.c b/libmpcodecs/ad_ffmpeg.c index 217ec25ff1..dfcef61b2a 100644 --- a/libmpcodecs/ad_ffmpeg.c +++ b/libmpcodecs/ad_ffmpeg.c @@ -188,7 +188,7 @@ static int decode_audio(sh_audio_t *sh_audio,unsigned char *buf,int minlen,int m 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(!sh_audio->needs_parsing && y<x) + if(!sh_audio->parser && y<x) sh_audio->ds->buffer_pos+=y-x; // put back data (HACK!) if(len2>0){ if (((AVCodecContext *)sh_audio->context)->channels >= 5) { |