| @@ -1,5124 +0,0 @@
-diff -uNr xine-lib.orig/configure.ac xine-lib/configure.ac
---- xine-lib.orig/configure.ac 2007-09-07 20:50:12.000000000 +0200
-+++ xine-lib/configure.ac 2007-10-21 09:39:06.000000000 +0200
-@@ -2692,6 +2692,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]],[[]])
-@@ -2727,7 +2728,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
-@@ -2927,6 +2928,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/include/xine.h.in xine-lib/include/xine.h.in
---- xine-lib.orig/include/xine.h.in 2007-08-17 19:11:39.000000000 +0200
-+++ xine-lib/include/xine.h.in 2007-10-21 09:39:06.000000000 +0200
-@@ -1663,6 +1663,7 @@
- #define XINE_EVENT_VDR_AUDIO 332
- #define XINE_EVENT_VDR_INFO 333
- #define XINE_EVENT_VDR_CHANNELPREVIOUS 334
-+#define XINE_EVENT_VDR_SUBTITLES 335
- /* some space for further keys */
- #define XINE_EVENT_VDR_SETVIDEOWINDOW 350
- #define XINE_EVENT_VDR_FRAMESIZECHANGED 351
-diff -uNr xine-lib.orig/src/libffmpeg/libavcodec/h264.c xine-lib/src/libffmpeg/libavcodec/h264.c
---- xine-lib.orig/src/libffmpeg/libavcodec/h264.c 2007-04-17 20:46:43.000000000 +0200
-+++ xine-lib/src/libffmpeg/libavcodec/h264.c 2007-10-21 09:39:33.000000000 +0200
-@@ -4639,8 +4639,11 @@
- s->picture_structure= PICT_FRAME;
- }else{
- if(get_bits1(&s->gb)) { //field_pic_flag
-- s->picture_structure= PICT_TOP_FIELD + get_bits1(&s->gb); //bottom_field_flag
-+ //s->picture_structure= PICT_TOP_FIELD + get_bits1(&s->gb); //bottom_field_flag
- av_log(h->s.avctx, AV_LOG_ERROR, "PAFF interlacing is not implemented\n");
-+ s->avctx->release_buffer(s->avctx, (AVFrame*)s->current_picture_ptr);
-+ s->current_picture_ptr = 0;
-+ return -1;
- } else {
- s->picture_structure= PICT_FRAME;
- h->mb_aff_frame = h->sps.mb_aff;
-@@ -4696,8 +4699,12 @@
- if(h->slice_type == P_TYPE || h->slice_type == SP_TYPE || h->slice_type == B_TYPE){
- if(h->slice_type == B_TYPE){
- h->direct_spatial_mv_pred= get_bits1(&s->gb);
-- if(h->sps.mb_aff && h->direct_spatial_mv_pred)
-+ if(h->sps.mb_aff && h->direct_spatial_mv_pred){
- av_log(h->s.avctx, AV_LOG_ERROR, "MBAFF + spatial direct mode is not implemented\n");
-+ s->avctx->release_buffer(s->avctx, (AVFrame*)s->current_picture_ptr);
-+ s->current_picture_ptr = 0;
-+ return -1;
-+ }
- }
- num_ref_idx_active_override_flag= get_bits1(&s->gb);
-
-@@ -8110,10 +8117,10 @@
- }
-
- ptr= decode_nal(h, buf + buf_index, &dst_length, &consumed, h->is_avc ? nalsize : buf_size - buf_index);
-- if (ptr==NULL || dst_length <= 0){
-+ if (ptr==NULL || dst_length < 0){
- return -1;
- }
-- while(ptr[dst_length - 1] == 0 && dst_length > 1)
-+ while(ptr[dst_length - 1] == 0 && dst_length > 0)
- dst_length--;
- bit_length= 8*dst_length - decode_rbsp_trailing(ptr + dst_length - 1);
-
-diff -uNr xine-lib.orig/src/libffmpeg/libavcodec/mpegvideo.c xine-lib/src/libffmpeg/libavcodec/mpegvideo.c
---- xine-lib.orig/src/libffmpeg/libavcodec/mpegvideo.c 2007-06-14 19:59:48.000000000 +0200
-+++ xine-lib/src/libffmpeg/libavcodec/mpegvideo.c 2007-10-21 09:39:33.000000000 +0200
-@@ -1544,7 +1544,7 @@
- AVFrame *pic;
- s->mb_skipped = 0;
-
-- assert(s->last_picture_ptr==NULL || s->out_format != FMT_H264 || s->codec_id == CODEC_ID_SVQ3);
-+// assert(s->last_picture_ptr==NULL || s->out_format != FMT_H264 || s->codec_id == CODEC_ID_SVQ3);
-
- /* mark&release old frames */
- if (s->pict_type != B_TYPE && s->last_picture_ptr && s->last_picture_ptr != s->next_picture_ptr && s->last_picture_ptr->data[0]) {
-@@ -1619,7 +1619,7 @@
- goto alloc;
- }
-
-- assert(s->pict_type == I_TYPE || (s->last_picture_ptr && s->last_picture_ptr->data[0]));
-+// assert(s->pict_type == I_TYPE || (s->last_picture_ptr && s->last_picture_ptr->data[0]));
-
- if(s->picture_structure!=PICT_FRAME){
- int i;
-diff -uNr xine-lib.orig/src/Makefile.am xine-lib/src/Makefile.am
---- xine-lib.orig/src/Makefile.am 2007-04-17 20:46:41.000000000 +0200
-+++ xine-lib/src/Makefile.am 2007-10-21 09:39:06.000000000 +0200
-@@ -26,4 +26,5 @@
- libfaad \
- libmusepack \
- post \
-- combined
-+ combined \
-+ vdr
-diff -uNr xine-lib.orig/src/vdr/input_vdr.c xine-lib/src/vdr/input_vdr.c
---- xine-lib.orig/src/vdr/input_vdr.c 1970-01-01 01:00:00.000000000 +0100
-+++ xine-lib/src/vdr/input_vdr.c 2007-10-21 09:39:33.000000000 +0200
-@@ -0,0 +1,2546 @@
-+/*
-+ * Copyright (C) 2003-2004 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
-+ *
-+ * $Id: input_vdr.c,v 1.51 2003/05/02 15:02:11 miguelfreitas Exp $
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <fcntl.h>
-+#include <unistd.h>
-+#include <sys/stat.h>
-+#include <sys/poll.h>
-+#include <errno.h>
-+#include <pthread.h>
-+
-+#define LOG_MODULE "input_vdr"
-+#define LOG_VERBOSE
-+/*
-+#define LOG
-+*/
-+#include "xine_internal.h"
-+#include "xineutils.h"
-+#include "input_plugin.h"
-+
-+#include "input_vdr.h"
-+#include "post_vdr.h"
-+
-+
-+
-+#define VDR_MAX_NUM_WINDOWS 16
-+#define VDR_ABS_FIFO_DIR "/tmp/vdr-xine"
-+
-+
-+
-+#define BUF_SIZE 1024
-+
-+#define LOG_OSD(x)
-+/*
-+#define LOG_OSD(x) x
-+*/
-+
-+
-+typedef struct
-+{
-+ input_plugin_t input_plugin;
-+
-+ xine_stream_t *stream;
-+ xine_stream_t *stream_external;
-+
-+ int fh;
-+ int fh_control;
-+ int fh_result;
-+ int fh_event;
-+
-+ char *mrl;
-+
-+ off_t curpos;
-+ char seek_buf[ BUF_SIZE ];
-+
-+ char *preview;
-+ off_t preview_size;
|
