diff options
| author | Mitchm <Mitchm at vdrportal.de> | 2010-01-15 20:03:00 +0100 |
|---|---|---|
| committer | Mitchm <Mitchm at vdrportal.de> | 2010-01-15 20:03:00 +0100 |
| commit | 5fa74fe306770d90ce3b7e52a0c420397d4c9c83 (patch) | |
| tree | 8131bacf7b93b90642f55a4369f1ce0787617030 /patches | |
| parent | 15f8e9b463ac432693b114c9b9f40a2155ae9dfb (diff) | |
| download | vdr-plugin-osdpip-5fa74fe306770d90ce3b7e52a0c420397d4c9c83.tar.gz vdr-plugin-osdpip-5fa74fe306770d90ce3b7e52a0c420397d4c9c83.tar.bz2 | |
Release version 0.0.10av0.0.10a
- added support for VDR 1.7.x
- added PIP while replaying
- added italian translations (thanks to Diego Pierotto)
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/osdpip-0.0.10a-fedora.diff | 49 | ||||
| -rw-r--r-- | patches/osdpip__decoder_c.diff | 20 |
2 files changed, 69 insertions, 0 deletions
diff --git a/patches/osdpip-0.0.10a-fedora.diff b/patches/osdpip-0.0.10a-fedora.diff new file mode 100644 index 0000000..08672fb --- /dev/null +++ b/patches/osdpip-0.0.10a-fedora.diff @@ -0,0 +1,49 @@ +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 new file mode 100644 index 0000000..f116978 --- /dev/null +++ b/patches/osdpip__decoder_c.diff @@ -0,0 +1,20 @@ +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), |