diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-11-14 21:55:11 +0100 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-11-14 21:55:11 +0100 |
| commit | 9aab0fa061a6c0ce3f83c28732a37fce7c6cb289 (patch) | |
| tree | d60295ef743a05e3239d802004a30469b8ce2deb /src/post/deinterlace | |
| parent | c813dd036abc7286138f62dc04dc9098c10ceede (diff) | |
| parent | 0ae296e7cb050cbc42f78feaccf3050e068cb152 (diff) | |
| download | xine-lib-9aab0fa061a6c0ce3f83c28732a37fce7c6cb289.tar.gz xine-lib-9aab0fa061a6c0ce3f83c28732a37fce7c6cb289.tar.bz2 | |
Merge changes.
Diffstat (limited to 'src/post/deinterlace')
| -rw-r--r-- | src/post/deinterlace/plugins/greedy2frame_template.c | 3 | ||||
| -rw-r--r-- | src/post/deinterlace/xine_plugin.c | 2 |
2 files changed, 0 insertions, 5 deletions
diff --git a/src/post/deinterlace/plugins/greedy2frame_template.c b/src/post/deinterlace/plugins/greedy2frame_template.c index 728bceed5..1067e2cb8 100644 --- a/src/post/deinterlace/plugins/greedy2frame_template.c +++ b/src/post/deinterlace/plugins/greedy2frame_template.c @@ -1,6 +1,4 @@ /***************************************************************************** -** $Id: greedy2frame_template.c,v 1.10 2006/12/21 09:54:45 dgp85 Exp $ -****************************************************************************** ** Copyright (c) 2000 John Adcock, Tom Barry, Steve Grimm All rights reserved. ** port copyright (c) 2003 Miguel Freitas ****************************************************************************** @@ -18,7 +16,6 @@ ****************************************************************************** ** CVS Log ** -** $Log: greedy2frame_template.c,v $ ** Revision 1.10 2006/12/21 09:54:45 dgp85 ** Apply the textrel patch from Gentoo, thanks to PaX team for providing it. The patch was applied and tested for a while in Gentoo and Pardus, and solves also Debian's problems with non-PIC code. If problems will arise, they'll be debugged. ** diff --git a/src/post/deinterlace/xine_plugin.c b/src/post/deinterlace/xine_plugin.c index de3d3a4e7..99bd597f6 100644 --- a/src/post/deinterlace/xine_plugin.c +++ b/src/post/deinterlace/xine_plugin.c @@ -17,8 +17,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * - * $Id: xine_plugin.c,v 1.52 2006/07/12 21:08:46 dsalt Exp $ - * * advanced video deinterlacer plugin * Jun/2003 by Miguel Freitas * |