diff options
| author | Guenter Bartsch <guenter@users.sourceforge.net> | 2002-04-14 00:24:45 +0000 |
|---|---|---|
| committer | Guenter Bartsch <guenter@users.sourceforge.net> | 2002-04-14 00:24:45 +0000 |
| commit | 0b0bd2240fff3e6867cade8fba1c29bbebba0eb8 (patch) | |
| tree | 17135a3e4de5250482f85b8442f4826ec3272dd9 | |
| parent | 02f3b350c0369ca793f5736aadfec4050b3ea743 (diff) | |
| download | xine-lib-0b0bd2240fff3e6867cade8fba1c29bbebba0eb8.tar.gz xine-lib-0b0bd2240fff3e6867cade8fba1c29bbebba0eb8.tar.bz2 | |
xvid fourcc patch, small debug output fixes
CVS patchset: 1716
CVS date: 2002/04/14 00:24:45
| -rw-r--r-- | src/xine-engine/audio_decoder.c | 4 | ||||
| -rw-r--r-- | src/xine-engine/audio_out.c | 6 | ||||
| -rw-r--r-- | src/xine-engine/buffer_types.c | 5 |
3 files changed, 10 insertions, 5 deletions
diff --git a/src/xine-engine/audio_decoder.c b/src/xine-engine/audio_decoder.c index 04139231d..d499e30bd 100644 --- a/src/xine-engine/audio_decoder.c +++ b/src/xine-engine/audio_decoder.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: audio_decoder.c,v 1.70 2002/04/09 03:38:01 miguelfreitas Exp $ + * $Id: audio_decoder.c,v 1.71 2002/04/14 00:24:45 guenter Exp $ * * * functions that implement audio decoding @@ -61,7 +61,7 @@ void *audio_decoder_loop (void *this_gen) { #ifdef LOG - printf ("audio_loop: got package pts = %d, type = %08x\n", + printf ("audio_loop: got package pts = %lld, type = %08x\n", buf->pts, buf->type); #endif diff --git a/src/xine-engine/audio_out.c b/src/xine-engine/audio_out.c index 4326d598e..dec239ab3 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.51 2002/04/01 12:09:09 miguelfreitas Exp $ + * $Id: audio_out.c,v 1.52 2002/04/14 00:24:45 guenter Exp $ * * 22-8-2001 James imported some useful AC3 sections from the previous alsa driver. * (c) 2001 Andy Lo A Foe <andy@alsaplayer.org> @@ -277,6 +277,10 @@ static void *ao_loop (void *this_gen) { buf = fifo_remove (this->out_fifo); bufs_since_sync++; +#ifdef LOG + printf ("audio_out: got a buffer\n"); +#endif + do { delay = this->driver->delay(this->driver); diff --git a/src/xine-engine/buffer_types.c b/src/xine-engine/buffer_types.c index 7cdd19f06..8e917c4fc 100644 --- a/src/xine-engine/buffer_types.c +++ b/src/xine-engine/buffer_types.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: buffer_types.c,v 1.12 2002/03/12 11:04:07 guenter Exp $ + * $Id: buffer_types.c,v 1.13 2002/04/14 00:24:45 guenter Exp $ * * * contents: @@ -67,6 +67,7 @@ static video_db_t video_db[] = { }, { { + mmioFOURCC('X', 'V', 'I', 'D'), mmioFOURCC('D', 'X', '5', '0'), mmioFOURCC('D', 'I', 'V', 'X'), mmioFOURCC('d', 'i', 'v', 'x'), @@ -79,7 +80,7 @@ static video_db_t video_db[] = { 0 }, BUF_VIDEO_MPEG4, - "ISO-MPEG4 or OpenDivx format" + "ISO-MPEG4/XviD/OpenDivx format" }, { { |