summaryrefslogtreecommitdiff
path: root/src/xine-engine/audio_out.c
diff options
context:
space:
mode:
authorFrantišek Dvořák <valtri@users.sourceforge.net>2006-04-05 22:12:17 +0000
committerFrantišek Dvořák <valtri@users.sourceforge.net>2006-04-05 22:12:17 +0000
commit639bd610bfcb1a028b91a5c3d125045c8de6d8b7 (patch)
tree6247df0c3a36b4a8eb11e0a764ff3e99632a619b /src/xine-engine/audio_out.c
parent22924ef0924502e0d9b1652651d40270602ee7a0 (diff)
downloadxine-lib-639bd610bfcb1a028b91a5c3d125045c8de6d8b7.tar.gz
xine-lib-639bd610bfcb1a028b91a5c3d125045c8de6d8b7.tar.bz2
1) various warning fixes
2) [coverity] fixes: - 279 (w32): test should be on input parametr type, not typeW - 267 (aout): can be ignored but there was warning anyway - 234 (w32): missing free on error & exit - 152 (w32): missing free on error & exit - 148 (w32): fixed bound of static array in test - 101 (ffdec): defense code when avodec_encode_video will fail (just defense to the future, should never happen with current ffmpeg in xine) - 98, 99 (w32): check negative handle by _x_assert (it's used as index to array) - 90 (w32): negate pointer check (+added check for size) - 89 (w32): added NULL and size check CVS patchset: 7959 CVS date: 2006/04/05 22:12:17
Diffstat (limited to 'src/xine-engine/audio_out.c')
-rw-r--r--src/xine-engine/audio_out.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/xine-engine/audio_out.c b/src/xine-engine/audio_out.c
index 57f55ab56..cceccc980 100644
--- a/src/xine-engine/audio_out.c
+++ b/src/xine-engine/audio_out.c
@@ -17,7 +17,7 @@
* along with self program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: audio_out.c,v 1.200 2006/03/24 20:05:38 dsalt Exp $
+ * $Id: audio_out.c,v 1.201 2006/04/05 22:12:20 valtri Exp $
*
* 22-8-2001 James imported some useful AC3 sections from the previous alsa driver.
* (c) 2001 Andy Lo A Foe <andy@alsaplayer.org>
@@ -977,6 +977,7 @@ static void *ao_loop (void *this_gen) {
last_sync_time = bufs_since_sync = 0;
in_buf = NULL;
+ cur_time = -1;
while ((this->audio_loop_running) ||
(!this->audio_loop_running && this->out_fifo->first)) {
@@ -1034,6 +1035,7 @@ static void *ao_loop (void *this_gen) {
}
}
+ _x_assert(cur_time >= 0);
if ((in_buf->vpts - cur_time) > 2 * 90000)
xprintf (this->xine, XINE_VERBOSITY_DEBUG,
"audio_out: vpts/clock error, in_buf->vpts=%" PRId64 " cur_time=%" PRId64 "\n",