summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuergen Keil <jkeil@users.sourceforge.net>2002-10-12 17:14:41 +0000
committerJuergen Keil <jkeil@users.sourceforge.net>2002-10-12 17:14:41 +0000
commit06111f4d32c4dbfbc1186f1a75aa9352a5b037da (patch)
treea117f254cd569e8854c1d2f1daabbefa11b0391f
parent0314fd1631454084e823e94918edb79019b96e63 (diff)
downloadxine-lib-06111f4d32c4dbfbc1186f1a75aa9352a5b037da.tar.gz
xine-lib-06111f4d32c4dbfbc1186f1a75aa9352a5b037da.tar.bz2
Use the audio_fifo - whenever it's possible - to send the demuxed audio data.
CVS patchset: 2816 CVS date: 2002/10/12 17:14:41
-rw-r--r--src/demuxers/demux_avi.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/src/demuxers/demux_avi.c b/src/demuxers/demux_avi.c
index 091c8614d..b4ccec6ae 100644
--- a/src/demuxers/demux_avi.c
+++ b/src/demuxers/demux_avi.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: demux_avi.c,v 1.112 2002/10/12 17:11:58 jkeil Exp $
+ * $Id: demux_avi.c,v 1.113 2002/10/12 17:14:41 jkeil Exp $
*
* demultiplexer for avi streams
*
@@ -1046,7 +1046,15 @@ static int demux_avi_next (demux_avi_t *this) {
get_audio_pts (this, i, audio->audio_posc, aie->tot, audio->audio_posb);
if (!this->no_audio && (audio_pts < video_pts)) {
- buf = this->video_fifo->buffer_pool_alloc (this->video_fifo);
+ if (this->audio_fifo) {
+ buf = this->audio_fifo->buffer_pool_alloc (this->audio_fifo);
+ } else {
+ /*
+ * no audio:
+ * borrow a buffer from video fifo, it get immediately freed below
+ */
+ buf = this->video_fifo->buffer_pool_alloc (this->video_fifo);
+ }
/* read audio */