From f6314c2220413071a7f0692de3a34b2beecac7a4 Mon Sep 17 00:00:00 2001 From: nicodvb Date: Sun, 1 Apr 2007 12:25:31 +0000 Subject: in flush_buffers() removed code that required the presence of an amount of audio data >= video data in the temporal domain git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22879 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/muxer_mpeg.c | 27 +++------------------------ 1 file changed, 3 insertions(+), 24 deletions(-) (limited to 'libmpdemux') diff --git a/libmpdemux/muxer_mpeg.c b/libmpdemux/muxer_mpeg.c index 8dd4443b1a..272b939bce 100644 --- a/libmpdemux/muxer_mpeg.c +++ b/libmpdemux/muxer_mpeg.c @@ -1457,8 +1457,6 @@ static int flush_buffers(muxer_t *muxer, int finalize) muxer_stream_t *s, *vs, *as; muxer_headers_t *vpriv = NULL, *apriv = NULL; muxer_priv_t *priv = (muxer_priv_t *) muxer->priv; - double duration; - uint64_t iduration, iaduration; /* analyzes all streams and decides what to flush @@ -1494,30 +1492,11 @@ static int flush_buffers(muxer_t *muxer, int finalize) mp_msg(MSGT_MUXER, MSGL_DBG2, "\nVIDEO, FLUSH %d frames (of %d), 0 to %d\n", n, vpriv->framebuf_used, n-1); vpriv = (muxer_headers_t*) vs->priv; - - duration = 0; - iduration = 0; - for(i = 0; i < n; i++) - iduration += vpriv->framebuf[i].idur; - duration = (double) (iduration / 27000000.0); - - if(as != NULL) - { - apriv = (muxer_headers_t*) as->priv; - iaduration = 0; - for(i = 0; i < apriv->framebuf_used; i++) - { - iaduration += apriv->framebuf[i].idur; - } - if(iaduration < iduration) - { - mp_msg(MSGT_MUXER, MSGL_DBG2, "Not enough audio data exit\n"); - return 0; - } - } - + + if(as != NULL) apriv = (muxer_headers_t*) as->priv; if(as != NULL && (apriv->size == 0)) { + apriv = (muxer_headers_t*) as->priv; init_delay = vpriv->framebuf[0].pts - vpriv->framebuf[0].dts; for(i = 0; i < apriv->framebuf_cnt; i++) -- cgit v1.2.3