diff options
| author | MANTANI Nobutaka <nobutaka@FreeBSD.org> | 2004-08-04 13:42:41 +0000 |
|---|---|---|
| committer | MANTANI Nobutaka <nobutaka@FreeBSD.org> | 2004-08-04 13:42:41 +0000 |
| commit | 2e288f3e6abc0fa41bdf7aaa8c755d08591a8a3c (patch) | |
| tree | d1e6985833cc89419310cce8537af629ea6904ae /multimedia | |
| parent | note conflicts for amd64 (diff) | |
Fix build with gcc-3.4.2.
PR: ports/69874
Submitted by: Michael Nottebrock <michaelnottebrock@gmx.net>
Notes
Notes:
svn path=/head/; revision=115404
Diffstat (limited to 'multimedia')
3 files changed, 134 insertions, 0 deletions
diff --git a/multimedia/libxine/files/patch-src:libffmpeg:libavcodec:h263.c b/multimedia/libxine/files/patch-src:libffmpeg:libavcodec:h263.c new file mode 100644 index 000000000000..4d3913b8cf1b --- /dev/null +++ b/multimedia/libxine/files/patch-src:libffmpeg:libavcodec:h263.c @@ -0,0 +1,31 @@ +--- src/libffmpeg/libavcodec/h263.c.orig Sun May 30 19:24:19 2004 ++++ src/libffmpeg/libavcodec/h263.c Sun Aug 1 12:52:11 2004 +@@ -66,8 +66,8 @@ + static int h263p_decode_umotion(MpegEncContext * s, int pred); + static int h263_decode_block(MpegEncContext * s, DCTELEM * block, + int n, int coded); +-static inline int mpeg4_decode_dc(MpegEncContext * s, int n, int *dir_ptr); +-static inline int mpeg4_decode_block(MpegEncContext * s, DCTELEM * block, ++static int mpeg4_decode_dc(MpegEncContext * s, int n, int *dir_ptr); ++static int mpeg4_decode_block(MpegEncContext * s, DCTELEM * block, + int n, int coded, int intra, int rvlc); + static int h263_pred_dc(MpegEncContext * s, int n, uint16_t **dc_val_ptr); + #ifdef CONFIG_ENCODERS +@@ -4548,7 +4548,7 @@ + * @param dir_ptr the prediction direction will be stored here + * @return the quantized dc + */ +-static inline int mpeg4_decode_dc(MpegEncContext * s, int n, int *dir_ptr) ++static int mpeg4_decode_dc(MpegEncContext * s, int n, int *dir_ptr) + { + int level, code; + +@@ -4593,7 +4593,7 @@ + * decodes a block. + * @return <0 if an error occured + */ +-static inline int mpeg4_decode_block(MpegEncContext * s, DCTELEM * block, ++static int mpeg4_decode_block(MpegEncContext * s, DCTELEM * block, + int n, int coded, int intra, int rvlc) + { + int level, i, last, run; diff --git a/multimedia/libxine/files/patch-src:libffmpeg:libavcodec:mpeg12.c b/multimedia/libxine/files/patch-src:libffmpeg:libavcodec:mpeg12.c new file mode 100644 index 000000000000..3e3bb25c1eb4 --- /dev/null +++ b/multimedia/libxine/files/patch-src:libffmpeg:libavcodec:mpeg12.c @@ -0,0 +1,79 @@ +--- 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 @@ + return diff; + } + +-static inline int mpeg1_decode_block_intra(MpegEncContext *s, +- DCTELEM *block, +- int n) ++static int mpeg1_decode_block_intra(MpegEncContext *s, ++ DCTELEM *block, ++ int n) + { + int level, dc, diff, i, j, run; + int component; +@@ -1536,9 +1536,9 @@ + return 0; + } + +-static inline int mpeg1_decode_block_inter(MpegEncContext *s, +- DCTELEM *block, +- int n) ++static int mpeg1_decode_block_inter(MpegEncContext *s, ++ DCTELEM *block, ++ int n) + { + int level, i, j, run; + RLTable *rl = &rl_mpeg1; +@@ -1614,9 +1614,9 @@ + + /* Also does unquantization here, since I will never support mpeg2 + encoding */ +-static inline int mpeg2_decode_block_non_intra(MpegEncContext *s, +- DCTELEM *block, +- int n) ++static int mpeg2_decode_block_non_intra(MpegEncContext *s, ++ DCTELEM *block, ++ int n) + { + int level, i, j, run; + RLTable *rl = &rl_mpeg1; +@@ -1693,9 +1693,9 @@ + return 0; + } + +-static inline int mpeg2_decode_block_intra(MpegEncContext *s, +- DCTELEM *block, +- int n) ++static int mpeg2_decode_block_intra(MpegEncContext *s, ++ DCTELEM *block, ++ int n) + { + int level, dc, diff, i, j, run; + int component; diff --git a/multimedia/libxine/files/patch-src:libffmpeg:libavcodec:msmpeg4.c b/multimedia/libxine/files/patch-src:libffmpeg:libavcodec:msmpeg4.c new file mode 100644 index 000000000000..8125185cb8f4 --- /dev/null +++ b/multimedia/libxine/files/patch-src:libffmpeg:libavcodec:msmpeg4.c @@ -0,0 +1,24 @@ +--- src/libffmpeg/libavcodec/msmpeg4.c.orig Wed Aug 4 17:27:04 2004 ++++ src/libffmpeg/libavcodec/msmpeg4.c Wed Aug 4 17:27:37 2004 +@@ -60,8 +60,8 @@ + static uint32_t v2_dc_chroma_table[512][2]; + + static inline void msmpeg4_encode_block(MpegEncContext * s, DCTELEM * block, int n); +-static inline int msmpeg4_decode_block(MpegEncContext * s, DCTELEM * block, +- int n, int coded, const uint8_t *scantable); ++static int msmpeg4_decode_block(MpegEncContext * s, DCTELEM * block, ++ int n, int coded, const uint8_t *scantable); + static int msmpeg4_decode_dc(MpegEncContext * s, int n, int *dir_ptr); + static int msmpeg4_decode_motion(MpegEncContext * s, + int *mx_ptr, int *my_ptr); +@@ -1656,8 +1656,8 @@ + return 0; + } + //#define ERROR_DETAILS +-static inline int msmpeg4_decode_block(MpegEncContext * s, DCTELEM * block, +- int n, int coded, const uint8_t *scan_table) ++static int msmpeg4_decode_block(MpegEncContext * s, DCTELEM * block, ++ int n, int coded, const uint8_t *scan_table) + { + int level, i, last, run, run_diff; + int dc_pred_dir; |