Mercurial > mplayer.hg
comparison libfaad2/local_changes.diff @ 17181:53c3eaaf8b49
Unify paths in patch and fix recent breakage, no -ko keyword expansion
flag was set on this file.
| author | diego |
|---|---|
| date | Sun, 11 Dec 2005 23:55:12 +0000 |
| parents | 5234ca38792e |
| children | 59b6fa5b4201 |
comparison
equal
deleted
inserted
replaced
| 17180:73c137e89522 | 17181:53c3eaaf8b49 |
|---|---|
| 119 - #include <math.h> | 119 - #include <math.h> |
| 120 - | 120 - |
| 121 #ifdef HAVE_SINF | 121 #ifdef HAVE_SINF |
| 122 # define sin sinf | 122 # define sin sinf |
| 123 #error | 123 #error |
| 124 --- main/libfaad2/output.c 2005/02/19 01:21:19 1.7 | 124 --- libfaad2/output.c 2005/02/19 01:21:19 1.7 |
| 125 +++ main/libfaad2/output.c 2005/03/29 18:14:24 1.8 | 125 +++ libfaad2/output.c 2005/03/29 18:14:24 1.8 |
| 126 @@ -19,10 +19,9 @@ | 126 @@ -19,10 +19,9 @@ |
| 127 ** Any non-GPL usage of this software or parts of this software is strictly | 127 ** Any non-GPL usage of this software or parts of this software is strictly |
| 128 ** forbidden. | 128 ** forbidden. |
| 129 ** | 129 ** |
| 130 -** Commercial non-GPL licensing of this software is possible. | 130 -** Commercial non-GPL licensing of this software is possible. |
| 131 -** For more info contact Ahead Software through Mpeg4AAClicense@nero.com. | 131 -** For more info contact Ahead Software through Mpeg4AAClicense@nero.com. |
| 132 -** | 132 -** |
| 133 -** $Id: local_changes.diff,v 1.4 2005/12/07 23:07:40 rathann Exp $ | 133 -** $Id: output.c,v 1.42 2004/09/04 14:56:28 menno Exp $ |
| 134 +** Initially modified for use with MPlayer by Rich Felker on 2005/03/29 | 134 +** Initially modified for use with MPlayer by Rich Felker on 2005/03/29 |
| 135 +** $Id: local_changes.diff,v 1.4 2005/12/07 23:07:40 rathann Exp $ | 135 +** $Id: output.c,v 1.11 2005/04/05 05:43:41 rfelker Exp $ |
| 136 +** detailed CVS changelog at http://www.mplayerhq.hu/cgi-bin/cvsweb.cgi/main/ | 136 +** detailed CVS changelog at http://www.mplayerhq.hu/cgi-bin/cvsweb.cgi/main/ |
| 137 **/ | 137 **/ |
| 138 | 138 |
| 139 #include "common.h" | 139 #include "common.h" |
| 140 @@ -462,7 +462,7 @@ | 140 @@ -462,7 +462,7 @@ |
