| @@ -1,4504 +0,0 @@
-diff -uNr xine-lib.orig/configure.ac xine-lib/configure.ac
---- xine-lib.orig/configure.ac 2007-05-06 00:31:50.000000000 +0200
-+++ xine-lib/configure.ac 2007-05-08 20:26:17.269109466 +0200
-@@ -2695,6 +2695,7 @@
- src/video_out/vidix/drivers/Makefile
- src/xine-utils/Makefile
- src/xine-engine/Makefile
-+src/vdr/Makefile
- win32/Makefile
- win32/include/Makefile])
- AC_CONFIG_COMMANDS([default],[[chmod +x ./misc/SlackBuild ./misc/build_rpms.sh ./misc/relchk.sh]],[[]])
-@@ -2730,7 +2731,7 @@
- echo " - stdin_fifo - rtp"
- echo " - http - mms"
- echo " - pnm - rtsp"
--echo " - dvb"
-+echo " - dvb - vdr"
- if test "x$external_dvdnav" = "xyes"; then
- echo " - dvd (external libs)"
- else
-@@ -2930,6 +2931,7 @@
- echo " - eq - eq2"
- echo " - boxblur - denoise3d"
- echo " - unsharp - tvtime"
-+echo " - vdr"
- echo " * SFX:"
- echo " - goom - oscope"
- echo " - fftscope - mosaico"
-diff -uNr xine-lib.orig/src/libffmpeg/libavcodec/mjpeg.c xine-lib/src/libffmpeg/libavcodec/mjpeg.c
---- xine-lib.orig/src/libffmpeg/libavcodec/mjpeg.c 2007-04-17 20:46:43.000000000 +0200
-+++ xine-lib/src/libffmpeg/libavcodec/mjpeg.c 2007-05-08 20:26:17.297111216 +0200
-@@ -1050,7 +1050,7 @@
- /* only 8 bit precision handled */
- if (get_bits(&s->gb, 4) != 0)
- {
-- dprintf("dqt: 16bit precision\n");
-+ dprintf("dqt: 16bit precision\n%s", "");
- return -1;
- }
- index = get_bits(&s->gb, 4);
-@@ -1297,7 +1297,7 @@
- /* DC coef */
- val = mjpeg_decode_dc(s, dc_index);
- if (val == 0xffff) {
-- dprintf("error dc\n");
-+ dprintf("error dc\n%s", "");
- return -1;
- }
- val = val * quant_matrix[0] + s->last_dc[component];
-@@ -1752,7 +1752,7 @@
- emms_c();
- return 0;
- out_of_range:
-- dprintf("decode_sos: ac/dc index out of range\n");
-+ dprintf("decode_sos: ac/dc index out of range\n%s", "");
- return -1;
- }
-
-@@ -2258,7 +2258,7 @@
-
- if (get_bits_long(&hgb, 32) != be2me_32(ff_get_fourcc("mjpg")))
- {
-- dprintf("not mjpeg-b (bad fourcc)\n");
-+ dprintf("not mjpeg-b (bad fourcc)\n%s", "");
- return 0;
- }
-
-diff -uNr xine-lib.orig/src/libffmpeg/libavcodec/mpeg12.c xine-lib/src/libffmpeg/libavcodec/mpeg12.c
---- xine-lib.orig/src/libffmpeg/libavcodec/mpeg12.c 2007-04-17 20:46:43.000000000 +0200
-+++ xine-lib/src/libffmpeg/libavcodec/mpeg12.c 2007-05-08 20:26:17.325112966 +0200
-@@ -2284,7 +2284,7 @@
- s1->frame_rate_ext.num = get_bits(&s->gb, 2)+1;
- s1->frame_rate_ext.den = get_bits(&s->gb, 5)+1;
-
-- dprintf("sequence extension\n");
-+ dprintf("sequence extension\n%s", "");
- s->codec_id= s->avctx->codec_id= CODEC_ID_MPEG2VIDEO;
- s->avctx->sub_id = 2; /* indicates mpeg2 found */
-
-@@ -2356,7 +2356,7 @@
- {
- int i, v, j;
-
-- dprintf("matrix extension\n");
-+ dprintf("matrix extension\n%s", "");
-
- if (get_bits1(&s->gb)) {
- for(i=0;i<64;i++) {
-@@ -2833,10 +2833,10 @@
- s->chroma_intra_matrix[j] = v;
- }
- #ifdef DEBUG
-- dprintf("intra matrix present\n");
-+ dprintf("intra matrix present\n%s", "");
- for(i=0;i<64;i++)
- dprintf(" %d", s->intra_matrix[s->dsp.idct_permutation[i]]);
-- dprintf("\n");
-+ dprintf("\n%s", "");
- #endif
- } else {
- for(i=0;i<64;i++) {
-@@ -2858,10 +2858,10 @@
- s->chroma_inter_matrix[j] = v;
- }
- #ifdef DEBUG
-- dprintf("non intra matrix present\n");
-+ dprintf("non intra matrix present\n%s", "");
- for(i=0;i<64;i++)
- dprintf(" %d", s->inter_matrix[s->dsp.idct_permutation[i]]);
-- dprintf("\n");
-+ dprintf("\n%s", "");
- #endif
- } else {
- for(i=0;i<64;i++) {
-@@ -3061,7 +3061,7 @@
- int ret, input_size;
- AVFrame *picture = data;
- MpegEncContext *s2 = &s->mpeg_enc_ctx;
-- dprintf("fill_buffer\n");
-+ dprintf("fill_buffer\n%s", "");
-
- if (buf_size == 0) {
- /* special case for last picture */
-@@ -3309,7 +3309,7 @@
- if( !(avctx->slice_flags & SLICE_FLAG_CODED_ORDER) )
- return -1;
- if( !(avctx->slice_flags & SLICE_FLAG_ALLOW_FIELD) ){
-- dprintf("mpeg12.c: XvMC decoder will work better if SLICE_FLAG_ALLOW_FIELD is set\n");
-+ dprintf("mpeg12.c: XvMC decoder will work better if SLICE_FLAG_ALLOW_FIELD is set\n%s", "");
- }
- mpeg_decode_init(avctx);
- s = avctx->priv_data;
-diff -uNr xine-lib.orig/src/libffmpeg/libavcodec/mpegaudiodec.c xine-lib/src/libffmpeg/libavcodec/mpegaudiodec.c
---- xine-lib.orig/src/libffmpeg/libavcodec/mpegaudiodec.c 2007-04-17 20:46:43.000000000 +0200
-+++ xine-lib/src/libffmpeg/libavcodec/mpegaudiodec.c 2007-05-08 20:26:17.333113466 +0200
-@@ -1177,15 +1177,15 @@
- if (s->nb_channels == 2) {
- if (s->layer == 3) {
- if (s->mode_ext & MODE_EXT_MS_STEREO)
-- dprintf("ms-");
-+ dprintf("ms-%s", "");
- if (s->mode_ext & MODE_EXT_I_STEREO)
-- dprintf("i-");
-+ dprintf("i-%s", "");
- }
-- dprintf("stereo");
-+ dprintf("stereo%s", "");
- } else {
-- dprintf("mono");
-+ dprintf("mono%s", "");
- }
-- dprintf("\n");
-+ dprintf("\n%s", "");
- #endif
- return 0;
- }
-@@ -1363,7 +1363,7 @@
- for(ch=0;ch<s->nb_channels;ch++) {
- for(i=0;i<sblimit;i++)
- dprintf(" %d", bit_alloc[ch][i]);
-- dprintf("\n");
-+ dprintf("\n%s", "");
- }
- }
- #endif
-@@ -1415,10 +1415,10 @@
- sf = scale_factors[ch][i];
- dprintf(" %d %d %d", sf[0], sf[1], sf[2]);
- } else {
-- dprintf(" -");
-+ dprintf(" -%s", "");
- }
- }
-- dprintf("\n");
-+ dprintf("\n%s", "");
- }
- #endif
-
-@@ -2362,7 +2362,7 @@
- g->scfsi, gr, ch);
- for(i=0;i<j;i++)
- dprintf(" %d", g->scale_factors[i]);
-- dprintf("\n");
-+ dprintf("\n%s", "");
- }
- #endif
- } else {
-@@ -2424,7 +2424,7 @@
- gr, ch);
- for(i=0;i<40;i++)
- dprintf(" %d", g->scale_factors[i]);
-- dprintf("\n");
-+ dprintf("\n%s", "");
- }
- #endif
- }
-@@ -2521,7 +2521,7 @@
- dprintf("%d-%d:", i, ch);
- for(j=0;j<SBLIMIT;j++)
|
