Change patch structure so it applies cleanly to libmpeg2 sources.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13020 b3059339-0415-0410-9bf9-f77b7e298cf2

1 files changed, 38 insertions, 38 deletions

diff --git a/libmpeg2/libmpeg-0.4.0.diff b/libmpeg2/libmpeg-0.4.0.diff
index 05c7467988..71b7f0b730 100644
--- a/libmpeg2/libmpeg-0.4.0.diff
+++ b/libmpeg2/libmpeg-0.4.0.diff
@@ -1,6 +1,6 @@
-diff -ur orig/cpu_accel.c new/cpu_accel.c
---- orig/cpu_accel.c	2003-10-06 04:31:52.000000000 +0200
-+++ new/cpu_accel.c	2004-02-18 13:48:26.000000000 +0100
+diff -ur libmpeg2/cpu_accel.c libmpeg2/cpu_accel.c
+--- libmpeg2/cpu_accel.c	2003-10-06 04:31:52.000000000 +0200
++++ libmpeg2/cpu_accel.c	2004-02-18 13:48:26.000000000 +0100
 @@ -195,6 +195,7 @@
  #ifdef ARCH_ALPHA
  static inline uint32_t arch_accel (void)
@@ -19,9 +19,9 @@ diff -ur orig/cpu_accel.c new/cpu_accel.c
  }
  #endif /* ARCH_ALPHA */
  #endif /* ACCEL_DETECT */
-diff -ur orig/cpu_state.c new/cpu_state.c
---- orig/cpu_state.c	2003-08-21 10:00:49.000000000 +0200
-+++ new/cpu_state.c	2004-02-18 13:48:29.000000000 +0100
+diff -ur libmpeg2/cpu_state.c libmpeg2/cpu_state.c
+--- libmpeg2/cpu_state.c	2003-08-21 10:00:49.000000000 +0200
++++ libmpeg2/cpu_state.c	2004-02-18 13:48:29.000000000 +0100
 @@ -120,7 +120,7 @@
  	mpeg2_cpu_state_restore = state_restore_mmx;
      }
@@ -31,9 +31,9 @@ diff -ur orig/cpu_state.c new/cpu_state.c
      if (accel & MPEG2_ACCEL_PPC_ALTIVEC) {
  	mpeg2_cpu_state_save = state_save_altivec;
  	mpeg2_cpu_state_restore = state_restore_altivec;
-diff -ur orig/decode.c new/decode.c
---- orig/decode.c	2003-12-22 12:59:34.000000000 +0100
-+++ new/decode.c	2004-02-18 14:19:01.000000000 +0100
+diff -ur libmpeg2/decode.c libmpeg2/decode.c
+--- libmpeg2/decode.c	2003-12-22 12:59:34.000000000 +0100
++++ libmpeg2/decode.c	2004-02-18 14:19:01.000000000 +0100
 @@ -351,6 +351,15 @@
      fbuf->buf[1] = buf[1];
      fbuf->buf[2] = buf[2];
@@ -50,9 +50,9 @@ diff -ur orig/decode.c new/decode.c
  }
  
  void mpeg2_custom_fbuf (mpeg2dec_t * mpeg2dec, int custom_fbuf)
-diff -ur orig/header.c new/header.c
---- orig/header.c	2003-12-22 12:24:02.000000000 +0100
-+++ new/header.c	2004-08-02 18:07:50.000000000 +0200
+diff -ur libmpeg2/header.c libmpeg2/header.c
+--- libmpeg2/header.c	2003-12-22 12:24:02.000000000 +0100
++++ libmpeg2/header.c	2004-08-02 18:07:50.000000000 +0200
 @@ -100,6 +100,9 @@
      mpeg2dec->decoder.convert = NULL;
      mpeg2dec->decoder.convert_id = NULL;
@@ -79,9 +79,9 @@ diff -ur orig/header.c new/header.c
  	    for (j = 0; j < 64; j++)
  		decoder->quantizer_prescale[index][i][j] =
  		    k * mpeg2dec->quantizer_matrix[index][j];
-diff -ur orig/idct_alpha.c new/idct_alpha.c
---- orig/idct_alpha.c	2003-09-19 11:26:42.000000000 +0200
-+++ new/idct_alpha.c	2004-02-18 13:48:29.000000000 +0100
+diff -ur libmpeg2/idct_alpha.c libmpeg2/idct_alpha.c
+--- libmpeg2/idct_alpha.c	2003-09-19 11:26:42.000000000 +0200
++++ libmpeg2/idct_alpha.c	2004-02-18 13:48:29.000000000 +0100
 @@ -59,7 +59,7 @@
  } while (0)
  #endif
@@ -116,9 +116,9 @@ diff -ur orig/idct_alpha.c new/idct_alpha.c
  
  void mpeg2_idct_copy_alpha (int16_t * block, uint8_t * dest, const int stride)
  {
-diff -ur orig/idct.c new/idct.c
---- orig/idct.c	2003-09-19 11:26:42.000000000 +0200
-+++ new/idct.c	2004-02-18 14:30:15.000000000 +0100
+diff -ur libmpeg2/idct.c libmpeg2/idct.c
+--- libmpeg2/idct.c	2003-09-19 11:26:42.000000000 +0200
++++ libmpeg2/idct.c	2004-02-18 14:30:15.000000000 +0100
 @@ -66,7 +66,7 @@
  } while (0)
  #endif
@@ -153,9 +153,9 @@ diff -ur orig/idct.c new/idct.c
  	int i;
  
  	mpeg2_idct_copy = mpeg2_idct_copy_alpha;
-diff -ur orig/motion_comp.c new/motion_comp.c
---- orig/motion_comp.c	2003-10-06 04:31:52.000000000 +0200
-+++ new/motion_comp.c	2004-02-18 13:48:37.000000000 +0100
+diff -ur libmpeg2/motion_comp.c libmpeg2/motion_comp.c
+--- libmpeg2/motion_comp.c	2003-10-06 04:31:52.000000000 +0200
++++ libmpeg2/motion_comp.c	2004-02-18 13:48:37.000000000 +0100
 @@ -43,10 +43,12 @@
      else
  #endif
@@ -169,20 +169,9 @@ diff -ur orig/motion_comp.c new/motion_comp.c
  #ifdef ARCH_ALPHA
      if (accel & MPEG2_ACCEL_ALPHA)
  	mpeg2_mc = mpeg2_mc_alpha;
-diff -ur orig/mpeg2.h new/mpeg2.h
---- orig/mpeg2.h	2003-12-22 13:13:35.000000000 +0100
-+++ new/mpeg2.h	2004-02-18 13:50:13.000000000 +0100
-@@ -82,6 +82,7 @@
- #define PIC_FLAG_COMPOSITE_DISPLAY 32
- #define PIC_FLAG_SKIP 64
- #define PIC_FLAG_TAGS 128
-+#define PIC_FLAG_REPEAT_FIRST_FIELD 256
- #define PIC_MASK_COMPOSITE_DISPLAY 0xfffff000
- 
- typedef struct mpeg2_picture_s {
-diff -ur orig/mpeg2_internal.h new/mpeg2_internal.h
---- orig/mpeg2_internal.h	2003-12-22 12:24:02.000000000 +0100
-+++ new/mpeg2_internal.h	2004-08-02 18:09:17.000000000 +0200
+diff -ur libmpeg2/mpeg2_internal.h libmpeg2/mpeg2_internal.h
+--- libmpeg2/mpeg2_internal.h	2003-12-22 12:24:02.000000000 +0100
++++ libmpeg2/mpeg2_internal.h	2004-08-02 18:09:17.000000000 +0200
 @@ -144,6 +144,11 @@
      int second_field;
  
@@ -195,9 +184,9 @@ diff -ur orig/mpeg2_internal.h new/mpeg2_internal.h
  };
  
  typedef struct {
-diff -ur orig/slice.c new/slice.c
---- orig/slice.c	2003-12-22 12:24:02.000000000 +0100
-+++ new/slice.c	2004-08-02 18:07:50.000000000 +0200
+diff -ur libmpeg2/slice.c libmpeg2/slice.c
+--- libmpeg2/slice.c	2003-12-22 12:24:02.000000000 +0100
++++ libmpeg2/slice.c	2004-08-02 18:07:50.000000000 +0200
 @@ -1564,6 +1564,9 @@
  
  #define NEXT_MACROBLOCK							\
@@ -208,3 +197,14 @@ diff -ur orig/slice.c new/slice.c
      decoder->offset += 16;						\
      if (decoder->offset == decoder->width) {				\
  	do { /* just so we can use the break statement */		\
+diff -ur include/mpeg2.h include/mpeg2.h
+--- include/mpeg2.h	2003-12-22 13:13:35.000000000 +0100
++++ include/mpeg2.h	2004-02-18 13:50:13.000000000 +0100
+@@ -82,6 +82,7 @@
+ #define PIC_FLAG_COMPOSITE_DISPLAY 32
+ #define PIC_FLAG_SKIP 64
+ #define PIC_FLAG_TAGS 128
++#define PIC_FLAG_REPEAT_FIRST_FIELD 256
+ #define PIC_MASK_COMPOSITE_DISPLAY 0xfffff000
+ 
+ typedef struct mpeg2_picture_s {