Update of /cvsroot/libdv/libdv In directory usw-pr-cvs1:/tmp/cvs-serv9525 Modified Files: YUY2.c YUY2.h YV12.c YV12.h audio.c audio.h dct.c dct.h display.c display.h dovlc.c dv.c dv.h encode.c gasmoff.c idct_248.c idct_248.h oss.c oss.h parse.c parse.h place.c place.h playdv.c quant.c quant.h rgb.c rgb.h testbitstream.c testdct.c testvlc.c util.h vlc.c vlc.h weighting.c weighting.h Log Message: More #include fixups Index: YUY2.c =================================================================== RCS file: /cvsroot/libdv/libdv/YUY2.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** YUY2.c 2001/01/15 06:11:34 1.5 --- YUY2.c 2001/01/15 23:35:43 1.6 *************** *** 28,34 **** * Lucke <lu...@be...> */ #include <stdlib.h> - #include "dv_types.h" #include "YUY2.h" --- 28,35 ---- * Lucke <lu...@be...> */ + #include <dv_types.h> + #include <stdlib.h> #include "YUY2.h" Index: YUY2.h =================================================================== RCS file: /cvsroot/libdv/libdv/YUY2.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** YUY2.h 2001/01/15 06:11:34 1.5 --- YUY2.h 2001/01/15 23:35:43 1.6 *************** *** 28,32 **** #define DV_YUY2_H ! #include "dv_types.h" /* Convert output of decoder to YUY2 conforming layout. YUY2 is a --- 28,32 ---- #define DV_YUY2_H ! #include <dv_types.h> /* Convert output of decoder to YUY2 conforming layout. YUY2 is a Index: YV12.c =================================================================== RCS file: /cvsroot/libdv/libdv/YV12.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** YV12.c 2001/01/15 06:11:34 1.5 --- YV12.c 2001/01/15 23:35:43 1.6 *************** *** 25,31 **** */ #include <stdlib.h> - #include "dv_types.h" #include "YV12.h" --- 25,32 ---- */ + #include <dv_types.h> + #include <stdlib.h> #include "YV12.h" Index: YV12.h =================================================================== RCS file: /cvsroot/libdv/libdv/YV12.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** YV12.h 2001/01/15 06:11:34 1.5 --- YV12.h 2001/01/15 23:35:43 1.6 *************** *** 28,32 **** #define DV_YV12_H ! #include "dv_types.h" /* Convert output of decoder to YV12 conforming layout. YV12 is a --- 28,32 ---- #define DV_YV12_H ! #include <dv_types.h> /* Convert output of decoder to YV12 conforming layout. YV12 is a Index: audio.c =================================================================== RCS file: /cvsroot/libdv/libdv/audio.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** audio.c 2001/01/15 22:48:52 1.7 --- audio.c 2001/01/15 23:35:43 1.8 *************** *** 24,31 **** */ #include <stdio.h> #include <math.h> - #include "dv_types.h" #include "util.h" #include "audio.h" --- 24,32 ---- */ + #include <dv_types.h> + #include <stdio.h> #include <math.h> #include "util.h" #include "audio.h" Index: audio.h =================================================================== RCS file: /cvsroot/libdv/libdv/audio.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** audio.h 2001/01/15 02:05:26 1.4 --- audio.h 2001/01/15 23:35:43 1.5 *************** *** 27,31 **** #define DV_AUDIO_H ! #include "dv_types.h" #ifdef __cplusplus --- 27,31 ---- #define DV_AUDIO_H ! #include <dv_types.h> #ifdef __cplusplus Index: dct.c =================================================================== RCS file: /cvsroot/libdv/libdv/dct.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** dct.c 2001/01/08 21:59:28 1.8 --- dct.c 2001/01/15 23:35:43 1.9 *************** *** 25,34 **** */ ! #ifdef HAVE_CONFIG_H ! #include <config.h> ! #endif #include <math.h> #include <string.h> #include "dct.h" #include "weighting.h" --- 25,33 ---- */ ! #include <dv_types.h> #include <math.h> #include <string.h> + #include "dct.h" #include "weighting.h" Index: dct.h =================================================================== RCS file: /cvsroot/libdv/libdv/dct.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** dct.h 2001/01/15 06:11:34 1.5 --- dct.h 2001/01/15 23:35:43 1.6 *************** *** 28,32 **** #define DV_DCT_H ! #include "dv_types.h" #define DCT_YUV_PRECISION 2 /* means fixpoint with YUV_PRECISION bits --- 28,32 ---- #define DV_DCT_H ! #include <dv_types.h> #define DCT_YUV_PRECISION 2 /* means fixpoint with YUV_PRECISION bits Index: display.c =================================================================== RCS file: /cvsroot/libdv/libdv/display.c,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -r1.11 -r1.12 *** display.c 2001/01/15 06:11:34 1.11 --- display.c 2001/01/15 23:35:43 1.12 *************** *** 34,38 **** #include <math.h> ! #include "dv_types.h" #include "util.h" #include "display.h" --- 34,38 ---- #include <math.h> ! #include <dv_types.h> #include "util.h" #include "display.h" Index: display.h =================================================================== RCS file: /cvsroot/libdv/libdv/display.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** display.h 2001/01/15 02:05:26 1.9 --- display.h 2001/01/15 23:35:43 1.10 *************** *** 28,32 **** #define DV_DISPLAY_H ! #include "dv_types.h" #if HAVE_LIBXV --- 28,32 ---- #define DV_DISPLAY_H ! #include <dv_types.h> #if HAVE_LIBXV Index: dovlc.c =================================================================== RCS file: /cvsroot/libdv/libdv/dovlc.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** dovlc.c 2000/12/21 03:56:29 1.3 --- dovlc.c 2001/01/15 23:35:43 1.4 *************** *** 25,36 **** */ ! #ifdef HAVE_CONFIG_H ! #include <config.h> ! #endif - #include <glib.h> #include <stdio.h> ! #include <vlc.h> ! #include <bitstream.h> int main(int argc, char **argv) --- 25,34 ---- */ ! #include <dv_types.h> #include <stdio.h> ! ! #include "vlc.h" ! #include "bitstream.h" int main(int argc, char **argv) Index: dv.c =================================================================== RCS file: /cvsroot/libdv/libdv/dv.c,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -r1.13 -r1.14 *** dv.c 2001/01/15 06:58:01 1.13 --- dv.c 2001/01/15 23:35:43 1.14 *************** *** 1,9 **** - #ifdef HAVE_CONFIG_H - #include <config.h> - #endif - #include <stdio.h> #include <stdlib.h> #include "dv.h" #include "util.h" --- 1,6 ---- #include <stdio.h> #include <stdlib.h> + #include "dv_types.h" #include "dv.h" #include "util.h" Index: dv.h =================================================================== RCS file: /cvsroot/libdv/libdv/dv.h,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -r1.17 -r1.18 *** dv.h 2001/01/15 06:11:34 1.17 --- dv.h 2001/01/15 23:35:43 1.18 *************** *** 29,37 **** #include <stdlib.h> #include <stdio.h> #include <bitstream.h> - - #include "dv_types.h" #ifdef __cplusplus --- 29,37 ---- + #include <dv_types.h> + #include <stdlib.h> #include <stdio.h> #include <bitstream.h> #ifdef __cplusplus Index: encode.c =================================================================== RCS file: /cvsroot/libdv/libdv/encode.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** encode.c 2001/01/04 16:50:23 1.5 --- encode.c 2001/01/15 23:35:43 1.6 *************** *** 24,38 **** */ ! #ifdef HAVE_CONFIG_H ! #include <config.h> ! #endif - #include <math.h> #include <assert.h> - #include <glib.h> #include <stdio.h> #include <stdlib.h> - #include <gtk/gtk.h> --- 24,33 ---- */ ! #include <dv_types.h> #include <math.h> #include <assert.h> #include <stdio.h> #include <stdlib.h> #include <gtk/gtk.h> Index: gasmoff.c =================================================================== RCS file: /cvsroot/libdv/libdv/gasmoff.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** gasmoff.c 2001/01/15 06:11:34 1.6 --- gasmoff.c 2001/01/15 23:35:43 1.7 *************** *** 1,6 **** #include <stdio.h> - #include "dv_types.h" #include "bitstream.h" --- 1,6 ---- + #include <dv_types.h> #include <stdio.h> #include "bitstream.h" Index: idct_248.c =================================================================== RCS file: /cvsroot/libdv/libdv/idct_248.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** idct_248.c 2000/12/21 03:56:29 1.3 --- idct_248.c 2001/01/15 23:35:43 1.4 *************** *** 40,54 **** */ - #ifdef HAVE_CONFIG_H - #include <config.h> - #endif #include <stdio.h> #include <math.h> - #include <glib.h> #define IDCT_248_UNIT_TEST 0 - - typedef gint32 dv_248_coeff_t; static dv_248_coeff_t dv_idct_248_prescale[64]; --- 40,50 ---- */ + #include <dv_types.h> + #include <stdio.h> #include <math.h> #define IDCT_248_UNIT_TEST 0 static dv_248_coeff_t dv_idct_248_prescale[64]; Index: idct_248.h =================================================================== RCS file: /cvsroot/libdv/libdv/idct_248.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** idct_248.h 2001/01/15 06:11:34 1.3 --- idct_248.h 2001/01/15 23:35:43 1.4 *************** *** 28,32 **** #define IDCT_248_H ! #include "dv_types.h" #ifdef __cplusplus --- 28,32 ---- #define IDCT_248_H ! #include <dv_types.h> #ifdef __cplusplus Index: oss.c =================================================================== RCS file: /cvsroot/libdv/libdv/oss.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** oss.c 2001/01/15 02:05:26 1.3 --- oss.c 2001/01/15 23:35:43 1.4 *************** *** 24,35 **** */ ! #ifdef HAVE_CONFIG_H ! #include <config.h> ! #endif - #if HAVE_LIBPOPT - #include <popt.h> - #endif // HAVE_LIBPOPT - #include <unistd.h> #include <stdio.h> --- 24,29 ---- */ ! #include <dv_types.h> #include <unistd.h> #include <stdio.h> *************** *** 40,44 **** #include <fcntl.h> #include <sys/soundcard.h> ! #include <glib.h> #include "oss.h" --- 34,38 ---- #include <fcntl.h> #include <sys/soundcard.h> ! #include "oss.h" Index: oss.h =================================================================== RCS file: /cvsroot/libdv/libdv/oss.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** oss.h 2001/01/15 02:05:26 1.3 --- oss.h 2001/01/15 23:35:43 1.4 *************** *** 27,31 **** #define DV_OSS_H ! #include "dv_types.h" #ifdef __cplusplus --- 27,31 ---- #define DV_OSS_H ! #include <dv_types.h> #ifdef __cplusplus Index: parse.c =================================================================== RCS file: /cvsroot/libdv/libdv/parse.c,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -r1.15 -r1.16 *** parse.c 2001/01/15 06:11:34 1.15 --- parse.c 2001/01/15 23:35:43 1.16 *************** *** 25,31 **** */ #include <stdio.h> - #include "dv_types.h" #include "util.h" #include "bitstream.h" --- 25,32 ---- */ + #include <dv_types.h> + #include <stdio.h> #include "util.h" #include "bitstream.h" Index: parse.h =================================================================== RCS file: /cvsroot/libdv/libdv/parse.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** parse.h 2001/01/15 06:11:34 1.6 --- parse.h 2001/01/15 23:35:43 1.7 *************** *** 28,32 **** #define DV_PARSE_H ! #include "dv_types.h" #ifdef __cplusplus --- 28,32 ---- #define DV_PARSE_H ! #include <dv_types.h> #ifdef __cplusplus Index: place.c =================================================================== RCS file: /cvsroot/libdv/libdv/place.c,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -r1.10 -r1.11 *** place.c 2001/01/15 06:11:34 1.10 --- place.c 2001/01/15 23:35:43 1.11 *************** *** 25,29 **** */ ! #include "dv_types.h" #include "place.h" --- 25,30 ---- */ ! #include <dv_types.h> ! #include "place.h" Index: place.h =================================================================== RCS file: /cvsroot/libdv/libdv/place.h,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -r1.10 -r1.11 *** place.h 2001/01/15 06:11:34 1.10 --- place.h 2001/01/15 23:35:43 1.11 *************** *** 28,32 **** #define DV_PLACE_H ! #include "dv_types.h" #ifdef __cplusplus --- 28,32 ---- #define DV_PLACE_H ! #include <dv_types.h> #ifdef __cplusplus Index: playdv.c =================================================================== RCS file: /cvsroot/libdv/libdv/playdv.c,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -r1.22 -r1.23 *** playdv.c 2001/01/15 06:11:34 1.22 --- playdv.c 2001/01/15 23:35:43 1.23 *************** *** 25,28 **** --- 25,30 ---- */ + #include <dv_types.h> + #include <stdlib.h> #include <stdio.h> *************** *** 34,38 **** #include <fcntl.h> - #include "dv_types.h" #include "dv.h" #include "display.h" --- 36,39 ---- Index: quant.c =================================================================== RCS file: /cvsroot/libdv/libdv/quant.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** quant.c 2001/01/04 16:50:23 1.8 --- quant.c 2001/01/15 23:35:43 1.9 *************** *** 25,34 **** */ - #ifdef HAVE_CONFIG_H - #include <config.h> - #endif #include <math.h> ! #include <glib.h> #include "quant.h" --- 25,33 ---- */ + #include <dv_types.h> + #include <math.h> ! #include "quant.h" Index: quant.h =================================================================== RCS file: /cvsroot/libdv/libdv/quant.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** quant.h 2001/01/15 06:11:34 1.4 --- quant.h 2001/01/15 23:35:43 1.5 *************** *** 9,13 **** #define DV_QUANT_H ! #include "dv_types.h" #ifdef __cplusplus --- 9,13 ---- #define DV_QUANT_H ! #include <dv_types.h> #ifdef __cplusplus Index: rgb.c =================================================================== RCS file: /cvsroot/libdv/libdv/rgb.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** rgb.c 2001/01/15 06:58:01 1.7 --- rgb.c 2001/01/15 23:35:43 1.8 *************** *** 26,31 **** #include <math.h> - #include "dv_types.h" #define COLOR_FRACTION_BITS 10 --- 26,32 ---- + #include <dv_types.h> + #include <math.h> #define COLOR_FRACTION_BITS 10 Index: rgb.h =================================================================== RCS file: /cvsroot/libdv/libdv/rgb.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** rgb.h 2001/01/15 06:58:01 1.7 --- rgb.h 2001/01/15 23:35:43 1.8 *************** *** 28,32 **** #define DV_RGB_H ! #include "dv_types.h" /* Convert output of decoder to RGB layout. --- 28,32 ---- #define DV_RGB_H ! #include <dv_types.h> /* Convert output of decoder to RGB layout. Index: testbitstream.c =================================================================== RCS file: /cvsroot/libdv/libdv/testbitstream.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** testbitstream.c 2000/12/21 03:56:29 1.2 --- testbitstream.c 2001/01/15 23:35:43 1.3 *************** *** 1,11 **** ! #ifdef HAVE_CONFIG_H ! #include <config.h> ! #endif - #include <glib.h> #include <stdio.h> #include <assert.h> - - #include "bitstream.h" static guint8 buffer[10000] = "Deliberately buried, eh?"; --- 1,6 ---- ! #include <dv_types.h> #include <stdio.h> #include <assert.h> static guint8 buffer[10000] = "Deliberately buried, eh?"; Index: testdct.c =================================================================== RCS file: /cvsroot/libdv/libdv/testdct.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** testdct.c 2000/12/21 03:56:29 1.2 --- testdct.c 2001/01/15 23:35:43 1.3 *************** *** 25,34 **** */ ! #ifdef HAVE_CONFIG_H ! #include <config.h> ! #endif #include <stdio.h> #include <math.h> #include "dct.h" --- 25,33 ---- */ ! #include <dv_types.h> #include <stdio.h> #include <math.h> + #include "dct.h" Index: testvlc.c =================================================================== RCS file: /cvsroot/libdv/libdv/testvlc.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** testvlc.c 2000/12/21 03:56:29 1.4 --- testvlc.c 2001/01/15 23:35:43 1.5 *************** *** 25,34 **** */ - #ifdef HAVE_CONFIG_H - #include <config.h> - #endif #include <stdio.h> ! #include <glib.h> #include "vlc.h" --- 25,33 ---- */ + #include <dv_types.h> + #include <stdio.h> ! #include "vlc.h" Index: util.h =================================================================== RCS file: /cvsroot/libdv/libdv/util.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** util.h 2001/01/15 22:48:52 1.2 --- util.h 2001/01/15 23:35:43 1.3 *************** *** 27,31 **** #define DV_UTIL_H ! #include "dv_types.h" #ifdef __cplusplus --- 27,31 ---- #define DV_UTIL_H ! #include <dv_types.h> #ifdef __cplusplus Index: vlc.c =================================================================== RCS file: /cvsroot/libdv/libdv/vlc.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** vlc.c 2000/12/21 03:56:29 1.6 --- vlc.c 2001/01/15 23:35:43 1.7 *************** *** 25,31 **** */ ! #ifdef HAVE_CONFIG_H ! #include <config.h> ! #endif #include <stdio.h> --- 25,30 ---- */ ! ! #include <dv_types.h> #include <stdio.h> Index: vlc.h =================================================================== RCS file: /cvsroot/libdv/libdv/vlc.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** vlc.h 2001/01/15 06:11:34 1.6 --- vlc.h 2001/01/15 23:35:43 1.7 *************** *** 28,32 **** #define DV_VLC_H ! #include "dv_types.h" #include "bitstream.h" --- 28,33 ---- #define DV_VLC_H ! #include <dv_types.h> ! #include "bitstream.h" Index: weighting.c =================================================================== RCS file: /cvsroot/libdv/libdv/weighting.c,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -r1.10 -r1.11 *** weighting.c 2001/01/08 21:59:28 1.10 --- weighting.c 2001/01/15 23:35:43 1.11 *************** *** 25,33 **** */ - #ifdef HAVE_CONFIG_H - #include <config.h> - #endif #include <math.h> #include "weighting.h" --- 25,33 ---- */ + #include <dv_types.h> + #include <math.h> + #include "weighting.h" Index: weighting.h =================================================================== RCS file: /cvsroot/libdv/libdv/weighting.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** weighting.h 2001/01/15 06:11:34 1.5 --- weighting.h 2001/01/15 23:35:43 1.6 *************** *** 28,32 **** #define DV_WEIGHTING_H ! #include "dv_types.h" #ifdef __cplusplus --- 28,32 ---- #define DV_WEIGHTING_H ! #include <dv_types.h> #ifdef __cplusplus |