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
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
|
--- avidemux-2.0.42/avidemux/ADM_gui2/GUI_accelRender.h.orig 2006-03-20 20:45:07.000000000 +0100
+++ avidemux-2.0.42/avidemux/ADM_gui2/GUI_accelRender.h 2006-03-20 20:45:23.000000000 +0100
@@ -12,7 +12,7 @@
class AccelRender
{
public:
- AccelRender::AccelRender( void);
+ AccelRender( void);
virtual uint8_t init(GtkWidget * window, uint32_t w, uint32_t h)=0;
virtual uint8_t end(void)=0;
virtual uint8_t display(uint8_t *ptr, uint32_t w, uint32_t h)=0;
--- avidemux-2.0.42/avidemux/ADM_inpics/ADM_pics.h.orig 2006-03-20 20:37:14.000000000 +0100
+++ avidemux-2.0.42/avidemux/ADM_inpics/ADM_pics.h 2006-03-20 20:37:36.000000000 +0100
@@ -38,9 +38,9 @@
uint32_t _type;
- uint32_t picHeader::read32(FILE *fd);
- uint16_t picHeader::read16(FILE *fd);
- uint8_t picHeader::read8(FILE *fd);
+ uint32_t read32(FILE *fd);
+ uint16_t read16(FILE *fd);
+ uint8_t read8(FILE *fd);
public:
// static int checkFourCC(uint8_t *in, uint8_t *fourcc);
--- avidemux-2.0.42/avidemux/ADM_video/ADM_vidDGbob.cpp.orig 2006-03-20 20:43:19.000000000 +0100
+++ avidemux-2.0.42/avidemux/ADM_video/ADM_vidDGbob.cpp 2006-03-20 20:43:40.000000000 +0100
@@ -55,8 +55,8 @@
void update(void);
public:
- DGbob::DGbob(AVDMGenericVideoStream *in,CONFcouple *couples);
- DGbob::~DGbob(void);
+ DGbob(AVDMGenericVideoStream *in,CONFcouple *couples);
+ ~DGbob(void);
uint8_t getFrameNumberNoAlloc(uint32_t frame, uint32_t *len,
ADMImage *data,uint32_t *flags);
--- avidemux-2.0.42/avidemux/ADM_video/ADM_vidDecDec.cpp.orig 2006-03-20 20:42:14.000000000 +0100
+++ avidemux-2.0.42/avidemux/ADM_video/ADM_vidDecDec.cpp 2006-03-20 20:42:31.000000000 +0100
@@ -147,8 +147,8 @@
public:
- Decimate::Decimate(AVDMGenericVideoStream *in,CONFcouple *couples);
- Decimate::~Decimate(void);
+ Decimate(AVDMGenericVideoStream *in,CONFcouple *couples);
+ ~Decimate(void);
uint8_t getFrameNumberNoAlloc(uint32_t frame, uint32_t *len,
ADMImage *data,uint32_t *flags);
--- avidemux-2.0.42/avidemux/ADM_video/ADM_vidDecTelecide.h.orig 2006-03-20 20:39:18.000000000 +0100
+++ avidemux-2.0.42/avidemux/ADM_video/ADM_vidDecTelecide.h 2006-03-20 20:40:49.000000000 +0100
@@ -112,32 +112,32 @@
public:
- void Telecide::CalculateMetrics(int n, unsigned char *crp, unsigned char *crpU, unsigned char *crpV,
+ void CalculateMetrics(int n, unsigned char *crp, unsigned char *crpU, unsigned char *crpV,
unsigned char *prp, unsigned char *prpU, unsigned char *prpV);
- void Telecide::Show(ADMImage *dst, int frame);
- void Telecide::Debug(int frame);
+ void Show(ADMImage *dst, int frame);
+ void Debug(int frame);
- Telecide::Telecide(AVDMGenericVideoStream *in,CONFcouple *couples);
+ Telecide(AVDMGenericVideoStream *in,CONFcouple *couples);
- Telecide::~Telecide();
+ ~Telecide();
- void Telecide::PutChosen(int frame, unsigned int chosen);
+ void PutChosen(int frame, unsigned int chosen);
- void Telecide::CacheInsert(int frame, unsigned int p, unsigned int pblock,
+ void CacheInsert(int frame, unsigned int p, unsigned int pblock,
unsigned int c, unsigned int cblock);
- bool Telecide::CacheQuery(int frame, unsigned int *p, unsigned int *pblock,
+ bool CacheQuery(int frame, unsigned int *p, unsigned int *pblock,
unsigned int *c, unsigned int *cblock);
- bool Telecide::PredictHardYUY2(int frame, unsigned int *predicted, unsigned int *predicted_metric) ;
+ bool PredictHardYUY2(int frame, unsigned int *predicted, unsigned int *predicted_metric) ;
- struct PREDICTION *Telecide::PredictSoftYUY2(int frame);
+ struct PREDICTION *PredictSoftYUY2(int frame);
- void Telecide::WriteHints(unsigned char *dst, bool film, bool inpattern);
- virtual uint8_t Telecide::getFrameNumberNoAlloc(uint32_t frame, uint32_t *len,
+ void WriteHints(unsigned char *dst, bool film, bool inpattern);
+ virtual uint8_t getFrameNumberNoAlloc(uint32_t frame, uint32_t *len,
ADMImage *data,uint32_t *flags);
- char *Telecide::printConf( void );
- uint8_t Telecide::configure(AVDMGenericVideoStream *in);
- uint8_t Telecide::getCoupledConf( CONFcouple **couples);
+ char *printConf( void );
+ uint8_t configure(AVDMGenericVideoStream *in);
+ uint8_t getCoupledConf( CONFcouple **couples);
};
|
GitWeb