diff options
| author | Thomas Günther <tom@toms-cafe.de> | 2010-03-27 10:29:31 +0100 |
|---|---|---|
| committer | Thomas Günther <tom@toms-cafe.de> | 2010-03-27 10:29:31 +0100 |
| commit | d3c158ea6f98bf300641ae1395c9bc6425a5f84c (patch) | |
| tree | 6d4878fdb7efb4eb78f7959f2539f3c79bfd9fb8 | |
| parent | 3f29c96c552f606eddc76aae6ed37f1d64f271c0 (diff) | |
| download | vdr-plugin-osdpip-d3c158ea6f98bf300641ae1395c9bc6425a5f84c.tar.gz vdr-plugin-osdpip-d3c158ea6f98bf300641ae1395c9bc6425a5f84c.tar.bz2 | |
Removed patches
| -rw-r--r-- | patches/osdpip-0.0.10a-fedora.diff | 49 | ||||
| -rw-r--r-- | patches/osdpip__decoder_c.diff | 20 |
2 files changed, 0 insertions, 69 deletions
diff --git a/patches/osdpip-0.0.10a-fedora.diff b/patches/osdpip-0.0.10a-fedora.diff deleted file mode 100644 index 08672fb..0000000 --- a/patches/osdpip-0.0.10a-fedora.diff +++ /dev/null @@ -1,49 +0,0 @@ -diff -Naur osdpip-0.0.10a/decoder.c osdpip-0.0.10a.new/decoder.c ---- osdpip-0.0.10a/decoder.c 2010-01-01 22:24:06.000000000 +0100 -+++ osdpip-0.0.10a.new/decoder.c 2010-01-02 14:11:31.914298872 +0100 -@@ -82,14 +82,14 @@ - context = sws_getContext(m_Context->width - (OsdPipSetup.CropLeft + OsdPipSetup.CropRight), - m_Context->height - (OsdPipSetup.CropTop + OsdPipSetup.CropBottom), - PIX_FMT_YUV420P, -- m_Width, m_Height, ConvertToRGB ? PIX_FMT_RGBA32 : PIX_FMT_YUV420P, -+ m_Width, m_Height, ConvertToRGB ? PIX_FMT_RGB32 : PIX_FMT_YUV420P, - SWS_LANCZOS, NULL, NULL, NULL); - if (!context) { - printf("Error initializing scale context.\n"); - return -1; - } - avpicture_fill((AVPicture *) m_PicResample, m_BufferResample, -- ConvertToRGB ? PIX_FMT_RGBA32 : PIX_FMT_YUV420P, -+ ConvertToRGB ? PIX_FMT_RGB32 : PIX_FMT_YUV420P, - m_Width, m_Height); - sws_scale(context, pic_crop.data, pic_crop.linesize, - 0, m_Context->height - (OsdPipSetup.CropTop + OsdPipSetup.CropBottom), -diff -Naur osdpip-0.0.10a/Makefile osdpip-0.0.10a.new/Makefile ---- osdpip-0.0.10a/Makefile 2010-01-01 22:24:06.000000000 +0100 -+++ osdpip-0.0.10a.new/Makefile 2010-01-02 14:12:36.561299250 +0100 -@@ -28,12 +28,12 @@ - ### The C++ compiler and options: - - CXX ?= g++ --CXXFLAGS ?= -g -O2 -Wall -Woverloaded-virtual -+CXXFLAGS ?= -g -O2 -Wall -Woverloaded-virtual -fPIC - - ### The directory environment: - - DVBDIR = ../../../../DVB --FFMDIR = ../../../../ffmpeg-0.4.8 -+FFMDIR = /usr/include/ffmpeg - VDRDIR = ../../.. - LIBDIR = ../../lib - TMPDIR = /tmp -@@ -53,8 +53,8 @@ - - ### Includes and Defines (add further entries here): - --INCLUDES += -I$(VDRDIR)/include -I$(DVBDIR)/include -I. -I$(FFMDIR)/libavcodec --LIBS = -L$(FFMDIR)/libavcodec -lavcodec -+INCLUDES += -I$(VDRDIR)/include -I$(DVBDIR)/include -I. -I$(FFMDIR) -+LIBS = -L$(FFMDIR) -lavcodec - DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"' - DEFINES += -D_GNU_SOURCE - diff --git a/patches/osdpip__decoder_c.diff b/patches/osdpip__decoder_c.diff deleted file mode 100644 index f116978..0000000 --- a/patches/osdpip__decoder_c.diff +++ /dev/null @@ -1,20 +0,0 @@ -diff -Nur /usr/local/src/vdr-1.7.10/PLUGINS/src/osdpip-0.0.10a/decoder.c.orig /usr/local/src/vdr-1.7.10/PLUGINS/src/osdpip-0.0.10a/decoder.c ---- /usr/local/src/vdr-1.7.10/PLUGINS/src/osdpip-0.0.10a/decoder.c.orig 2010-01-02 11:36:19.000000000 +0100 -+++ /usr/local/src/vdr-1.7.10/PLUGINS/src/osdpip-0.0.10a/decoder.c 2010-01-02 11:37:12.000000000 +0100 -@@ -82,14 +82,14 @@ - context = sws_getContext(m_Context->width - (OsdPipSetup.CropLeft + OsdPipSetup.CropRight), - m_Context->height - (OsdPipSetup.CropTop + OsdPipSetup.CropBottom), - PIX_FMT_YUV420P, -- m_Width, m_Height, ConvertToRGB ? PIX_FMT_RGBA32 : PIX_FMT_YUV420P, -+ m_Width, m_Height, ConvertToRGB ? PIX_FMT_RGB32 : PIX_FMT_YUV420P, - SWS_LANCZOS, NULL, NULL, NULL); - if (!context) { - printf("Error initializing scale context.\n"); - return -1; - } - avpicture_fill((AVPicture *) m_PicResample, m_BufferResample, -- ConvertToRGB ? PIX_FMT_RGBA32 : PIX_FMT_YUV420P, -+ ConvertToRGB ? PIX_FMT_RGB32 : PIX_FMT_YUV420P, - m_Width, m_Height); - sws_scale(context, pic_crop.data, pic_crop.linesize, - 0, m_Context->height - (OsdPipSetup.CropTop + OsdPipSetup.CropBottom), |