diff options
Diffstat (limited to 'multimedia/libxine/files/patch-src:libffmpeg:libavcodec:mpeg12.c')
| -rw-r--r-- | multimedia/libxine/files/patch-src:libffmpeg:libavcodec:mpeg12.c | 37 |
1 files changed, 6 insertions, 31 deletions
diff --git a/multimedia/libxine/files/patch-src:libffmpeg:libavcodec:mpeg12.c b/multimedia/libxine/files/patch-src:libffmpeg:libavcodec:mpeg12.c index 3e3bb25c1eb4..5dd6cce9fc91 100644 --- a/multimedia/libxine/files/patch-src:libffmpeg:libavcodec:mpeg12.c +++ b/multimedia/libxine/files/patch-src:libffmpeg:libavcodec:mpeg12.c @@ -1,31 +1,6 @@ ---- src/libffmpeg/libavcodec/mpeg12.c.orig Wed Aug 4 17:16:09 2004 -+++ src/libffmpeg/libavcodec/mpeg12.c Wed Aug 4 17:19:51 2004 -@@ -65,16 +65,16 @@ - int component); - static void mpeg1_encode_motion(MpegEncContext *s, int val, int f_or_b_code); // RAL: f_code parameter added - #endif //CONFIG_ENCODERS --static inline int mpeg1_decode_block_inter(MpegEncContext *s, -- DCTELEM *block, -- int n); --static inline int mpeg1_decode_block_intra(MpegEncContext *s, -- DCTELEM *block, -- int n); --static inline int mpeg2_decode_block_non_intra(MpegEncContext *s, -+static int mpeg1_decode_block_inter(MpegEncContext *s, -+ DCTELEM *block, -+ int n); -+static int mpeg1_decode_block_intra(MpegEncContext *s, -+ DCTELEM *block, -+ int n); -+static int mpeg2_decode_block_non_intra(MpegEncContext *s, - DCTELEM *block, - int n); --static inline int mpeg2_decode_block_intra(MpegEncContext *s, -+static int mpeg2_decode_block_intra(MpegEncContext *s, - DCTELEM *block, - int n); - static int mpeg_decode_motion(MpegEncContext *s, int fcode, int pred); -@@ -1463,9 +1463,9 @@ +--- src/libffmpeg/libavcodec/mpeg12.c.orig Sun Sep 12 21:17:14 2004 ++++ src/libffmpeg/libavcodec/mpeg12.c Mon Nov 15 01:06:46 2004 +@@ -1044,9 +1044,9 @@ return diff; } @@ -38,7 +13,7 @@ { int level, dc, diff, i, j, run; int component; -@@ -1536,9 +1536,9 @@ +@@ -1117,9 +1117,9 @@ return 0; } @@ -51,7 +26,7 @@ { int level, i, j, run; RLTable *rl = &rl_mpeg1; -@@ -1614,9 +1614,9 @@ +@@ -1195,9 +1195,9 @@ /* Also does unquantization here, since I will never support mpeg2 encoding */ @@ -64,7 +39,7 @@ { int level, i, j, run; RLTable *rl = &rl_mpeg1; -@@ -1693,9 +1693,9 @@ +@@ -1274,9 +1274,9 @@ return 0; } |