Merge from 1.2 main branch.

--HG--
rename : src/xine-utils/xineutils.h => include/xine/xineutils.h
rename : src/libxineadec/Makefile.am => src/audio_dec/Makefile.am
rename : src/libxineadec/xine_a52_decoder.c => src/audio_dec/xine_a52_decoder.c
rename : src/libffmpeg/Makefile.am => src/combined/ffmpeg/Makefile.am
rename : src/libffmpeg/ff_audio_decoder.c => src/combined/ffmpeg/ff_audio_decoder.c
rename : src/libffmpeg/ff_dvaudio_decoder.c => src/combined/ffmpeg/ff_dvaudio_decoder.c
rename : src/libffmpeg/ff_dvdata.h => src/combined/ffmpeg/ff_dvdata.h
rename : src/libffmpeg/ff_video_decoder.c => src/combined/ffmpeg/ff_video_decoder.c
rename : src/libffmpeg/ffmpeg_encoder.c => src/combined/ffmpeg/ffmpeg_encoder.c
rename : src/libmpeg2/Makefile.am => src/video_dec/libmpeg2/Makefile.am
rename : src/libmpeg2/decode.c => src/video_dec/libmpeg2/decode.c

1 files changed, 56 insertions, 0 deletions

diff --git a/include/xine/scratch.h b/include/xine/scratch.h
new file mode 100644
index 000000000..c0e591d31
--- /dev/null
+++ b/include/xine/scratch.h
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2000-2006 the xine project
+ * 
+ * This file is part of xine, a free video player.
+ * 
+ * xine is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * xine is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
+ *
+ * scratch buffer for log output
+ */
+
+#ifndef HAVE_SCRATCH_H
+#define HAVE_SCRATCH_H
+
+#include <stdarg.h>
+#include <pthread.h>
+
+typedef struct scratch_buffer_s scratch_buffer_t;
+
+#define SCRATCH_LINE_LEN_MAX  1024
+
+struct scratch_buffer_s {
+
+  void
+#if __GNUC__ >= 3
+               __attribute__((__format__(__printf__, 2, 0)))
+#endif
+               (*scratch_printf) (scratch_buffer_t *this, const char *format, va_list ap);
+
+  char       **(*get_content) (scratch_buffer_t *this);
+
+  void         (*dispose) (scratch_buffer_t *this);
+
+  char         **lines;
+  char         **ordered;
+
+  int            num_lines;
+  int            cur;
+
+  pthread_mutex_t lock;
+};
+
+scratch_buffer_t *_x_new_scratch_buffer (int num_lines) XINE_PROTECTED;
+
+#endif