[MPlayer-cvslog] r30314 - trunk/libmpcodecs/ad_ffmpeg.c

[reimar]

Author: reimar
Date: Fri Jan 15 22:01:31 2010
New Revision: 30314

Log:
We only need to disable seeking back in ad_ffmpeg when we actually _use_
a parser, not when just needs_parsing is set.
Fixes playback of e.g. ADPCM in AVI like http://samples.mplayerhq.hu/avi/imaadpcm.avi

Modified:
   trunk/libmpcodecs/ad_ffmpeg.c

Modified: trunk/libmpcodecs/ad_ffmpeg.c
==============================================================================
--- trunk/libmpcodecs/ad_ffmpeg.c	Fri Jan 15 20:50:59 2010	(r30313)
+++ trunk/libmpcodecs/ad_ffmpeg.c	Fri Jan 15 22:01:31 2010	(r30314)
@@ -188,7 +188,7 @@ static int decode_audio(sh_audio_t *sh_a
 	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) {