[XviD-devel] missing motion/smp_motion_est.h in encoder.c
Rick Foos
xvid-devel@xvid.org
Wed, 27 Nov 2002 11:19:12 -0600
This is a multi-part message in MIME format.
------=_NextPart_000_024C_01C29606.CFF8BB70
Content-Type: multipart/alternative;
boundary="----=_NextPart_001_024D_01C29606.CFF8BB70"
------=_NextPart_001_024D_01C29606.CFF8BB70
Content-Type: text/plain;
charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
Yes, it's not a compile problem, but before I forget, here's a proposed =
code change (cvs diff -u) to encoder.c and encoder.h to remove _SMP.
Can you put this one in?
rick
----- Original Message -----=20
From: Christoph Lampert=20
To: XviD-devel=20
Sent: Wednesday, November 27, 2002 10:52 AM
Subject: Re: [XviD-devel] missing motion/smp_motion_est.h in encoder.c
On Wed, 27 Nov 2002, Rick Foos wrote:
> Hi,
>=20
> I noticed a missing header file when building dependencies.
>=20
> ** Can't Find include file 'motion/smp_motion_est.h' from =
'xvidcore/src/encoder.c'
>=20
> I found a reference to it in a branch version 1.6.2
> http://umaniac.leffe.dnsalias.com/alpha/changes_full.txt
>=20
> Should it be added to the tree, or should the reference in encoder.c =
be removed?
It should definitely be removed, since there is no SMP in the current
version.=20
Btw. the lines in question are=20
#ifdef _SMP
#include "motion/smp_motion_est.h"
#endif
and _SMP should never be defined, so it isn't really a problem for
compiling.
gruel=20
_______________________________________________
XviD-devel mailing list
XviD-devel@xvid.org
http://list.xvid.org/mailman/listinfo/xvid-devel
------=_NextPart_001_024D_01C29606.CFF8BB70
Content-Type: text/html;
charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<HTML><HEAD>
<META http-equiv=3DContent-Type content=3D"text/html; =
charset=3Diso-8859-1">
<META content=3D"MSHTML 6.00.2800.1126" name=3DGENERATOR>
<STYLE></STYLE>
</HEAD>
<BODY bgColor=3D#ffffff>
<DIV><FONT face=3DArial size=3D2>Yes, it's not a compile problem, but =
before I=20
forget, here's a proposed code change (cvs diff -u) to encoder.c and =
encoder.h=20
to remove _SMP.</FONT></DIV>
<DIV><FONT face=3DArial size=3D2></FONT> </DIV>
<DIV><FONT face=3DArial size=3D2>Can you put this one in?</FONT></DIV>
<DIV> </DIV>
<DIV><FONT face=3DArial size=3D2>rick</FONT></DIV>
<BLOCKQUOTE=20
style=3D"PADDING-RIGHT: 0px; PADDING-LEFT: 5px; MARGIN-LEFT: 5px; =
BORDER-LEFT: #000000 2px solid; MARGIN-RIGHT: 0px">
<DIV style=3D"FONT: 10pt arial">----- Original Message ----- </DIV>
<DIV=20
style=3D"BACKGROUND: #e4e4e4; FONT: 10pt arial; font-color: =
black"><B>From:</B>=20
<A title=3Dchl@math.uni-bonn.de =
href=3D"mailto:chl@math.uni-bonn.de">Christoph=20
Lampert</A> </DIV>
<DIV style=3D"FONT: 10pt arial"><B>To:</B> <A =
title=3Dxvid-devel@xvid.org=20
href=3D"mailto:xvid-devel@xvid.org">XviD-devel</A> </DIV>
<DIV style=3D"FONT: 10pt arial"><B>Sent:</B> Wednesday, November 27, =
2002 10:52=20
AM</DIV>
<DIV style=3D"FONT: 10pt arial"><B>Subject:</B> Re: [XviD-devel] =
missing=20
motion/smp_motion_est.h in encoder.c</DIV>
<DIV><BR></DIV>On Wed, 27 Nov 2002, Rick Foos wrote:<BR><BR>> =
Hi,<BR>>=20
<BR>> I noticed a missing header file when building =
dependencies.<BR>>=20
<BR>> ** Can't Find include file 'motion/smp_motion_est.h' from=20
'xvidcore/src/encoder.c'<BR>> <BR>> I found a reference to it in =
a=20
branch version 1.6.2<BR>> <A=20
=
href=3D"http://umaniac.leffe.dnsalias.com/alpha/changes_full.txt">http://=
umaniac.leffe.dnsalias.com/alpha/changes_full.txt</A><BR>>=20
<BR>> Should it be added to the tree, or should the reference in =
encoder.c=20
be removed?<BR><BR>It should definitely be removed, since there is no =
SMP in=20
the current<BR>version. <BR><BR>Btw. the lines in question are =
<BR><BR>#ifdef=20
_SMP<BR>#include "motion/smp_motion_est.h"<BR>#endif<BR><BR>and _SMP =
should=20
never be defined, so it isn't really a problem=20
for<BR>compiling.<BR><BR><BR><BR>gruel=20
=
<BR><BR><BR><BR>_______________________________________________<BR>XviD-d=
evel=20
mailing list<BR><A=20
href=3D"mailto:XviD-devel@xvid.org">XviD-devel@xvid.org</A><BR><A=20
=
href=3D"http://list.xvid.org/mailman/listinfo/xvid-devel">http://list.xvi=
d.org/mailman/listinfo/xvid-devel</A></BLOCKQUOTE></BODY></HTML>
------=_NextPart_001_024D_01C29606.CFF8BB70--
------=_NextPart_000_024C_01C29606.CFF8BB70
Content-Type: text/plain;
name="diff.txt"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
filename="diff.txt"
Index: src/encoder.c=0A=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=0A=
RCS file: /xvid/xvidcore/src/encoder.c,v=0A=
retrieving revision 1.88=0A=
diff -u -r1.88 encoder.c=0A=
--- src/encoder.c 26 Nov 2002 23:44:09 -0000 1.88=0A=
+++ src/encoder.c 27 Nov 2002 17:11:17 -0000=0A=
@@ -78,9 +78,6 @@=0A=
#include "quant/quant_matrix.h"=0A=
#include "utils/mem_align.h"=0A=
=0A=
-#ifdef _SMP=0A=
-#include "motion/smp_motion_est.h"=0A=
-#endif =0A=
=
/************************************************************************=
*****=0A=
* Local macros=0A=
=
*************************************************************************=
***/=0A=
Index: src/encoder.h=0A=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=0A=
RCS file: /xvid/xvidcore/src/encoder.h,v=0A=
retrieving revision 1.25=0A=
diff -u -r1.25 encoder.h=0A=
--- src/encoder.h 26 Nov 2002 23:44:10 -0000 1.25=0A=
+++ src/encoder.h 27 Nov 2002 17:11:17 -0000=0A=
@@ -106,10 +106,6 @@=0A=
uint32_t fincr;=0A=
uint32_t fbase;=0A=
=0A=
-#ifdef _SMP=0A=
- int num_threads;=0A=
-#endif=0A=
-=0A=
/* rounding type; alternate 0-1 after each interframe */=0A=
/* 1 <=3D fixed_code <=3D 4=0A=
automatically adjusted using motion vector statistics inside=0A=
------=_NextPart_000_024C_01C29606.CFF8BB70--