summaryrefslogtreecommitdiffstats
path: root/libmpeg2
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-07-12 14:06:28 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-07-12 14:06:28 +0000
commit67ff5087da6de99aa63dccc0df672382951121e9 (patch)
tree9e6c2492bab95215baec02b43099de7850987382 /libmpeg2
parentd293461ef9c4b23d1ef7415e842200f36c9c60d3 (diff)
downloadmpv-67ff5087da6de99aa63dccc0df672382951121e9.tar.bz2
mpv-67ff5087da6de99aa63dccc0df672382951121e9.tar.xz
Remove copyright notice changes from local diff.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19031 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpeg2')
-rw-r--r--libmpeg2/libmpeg-0.4.0.diff20
1 files changed, 1 insertions, 19 deletions
diff --git a/libmpeg2/libmpeg-0.4.0.diff b/libmpeg2/libmpeg-0.4.0.diff
index 4aeb798e06..7246ec7070 100644
--- a/libmpeg2/libmpeg-0.4.0.diff
+++ b/libmpeg2/libmpeg-0.4.0.diff
@@ -11,14 +11,7 @@
#ifdef HAVE_BUILTIN_EXPECT
--- libmpeg2/cpu_accel.c 2006-06-16 20:12:26.000000000 +0200
+++ libmpeg2/cpu_accel.c 2006-06-16 20:12:50.000000000 +0200
-@@ -19,9 +19,14 @@
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-+ *
-+ * Modified for use with MPlayer, see libmpeg-0.4.0.diff for the exact changes.
-+ * detailed changelog at http://svn.mplayerhq.hu/mplayer/trunk/
-+ * $Id$
+@@ -22,6 +26,7 @@
*/
#include "config.h"
@@ -313,17 +306,6 @@
--- include/mpeg2.h 2006-06-16 20:12:26.000000000 +0200
+++ libmpeg2/mpeg2.h 2006-06-16 20:12:50.000000000 +0200
-@@ -19,6 +19,10 @@
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-+ *
-+ * Modified for use with MPlayer, see libmpeg-0.4.0.diff for the exact changes.
-+ * detailed changelog at http://svn.mplayerhq.hu/mplayer/trunk/
-+ * $Id$
- */
-
- #ifndef MPEG2_H
@@ -82,6 +86,7 @@
#define PIC_FLAG_COMPOSITE_DISPLAY 32
#define PIC_FLAG_SKIP 64