1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
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
|
