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

[reimar]

Author: reimar
Date: Sat Nov  6 16:48:21 2010
New Revision: 32583

Log:
Handle EAGAIN in ad_ffmpeg, this is necessary for LATM to work properly with
native TS demuxer.

Modified:
   trunk/libmpcodecs/ad_ffmpeg.c

Modified: trunk/libmpcodecs/ad_ffmpeg.c
==============================================================================
--- trunk/libmpcodecs/ad_ffmpeg.c	Sat Nov  6 16:41:44 2010	(r32582)
+++ trunk/libmpcodecs/ad_ffmpeg.c	Sat Nov  6 16:48:21 2010	(r32583)
@@ -234,6 +234,9 @@ 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);
+	// LATM may need many packets to find mux info
+	if (y == AVERROR(EAGAIN))
+	    continue;
 	if(y<0){ mp_msg(MSGT_DECAUDIO,MSGL_V,"lavc_audio: error\n");break; }
 	if(!sh_audio->parser && y<x)
 	    sh_audio->ds->buffer_pos+=y-x;  // put back data (HACK!)