From 73e520aabf92a3d1b0a8af079746f2db2c96d03c Mon Sep 17 00:00:00 2001 From: MANTANI Nobutaka Date: Thu, 15 Dec 2005 17:19:47 +0000 Subject: Fix build error on 5-stable. PR: ports/90329 Submitted by: Heino Tiedemann --- .../files/patch-src:libffmpeg:libavcodec:mpeg12.c | 94 ++++++++++++++++++++++ 1 file changed, 94 insertions(+) create mode 100644 multimedia/libxine/files/patch-src:libffmpeg:libavcodec:mpeg12.c (limited to 'multimedia/libxine/files/patch-src:libffmpeg:libavcodec:mpeg12.c') 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..a5e83b6367ec --- /dev/null +++ b/multimedia/libxine/files/patch-src:libffmpeg:libavcodec:mpeg12.c @@ -0,0 +1,94 @@ +--- src/libffmpeg/libavcodec/mpeg12.c.orig Fri Dec 16 01:04:27 2005 ++++ src/libffmpeg/libavcodec/mpeg12.c Fri Dec 16 01:12:18 2005 +@@ -65,21 +65,21 @@ + 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, ++static int mpeg1_decode_block_inter(MpegEncContext *s, + DCTELEM *block, + int n); +-static inline int mpeg1_decode_block_intra(MpegEncContext *s, ++static int mpeg1_decode_block_intra(MpegEncContext *s, + DCTELEM *block, + int n); +-static inline int mpeg1_fast_decode_block_inter(MpegEncContext *s, DCTELEM *block, int n); +-static inline int mpeg2_decode_block_non_intra(MpegEncContext *s, ++static int mpeg1_fast_decode_block_inter(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 inline int mpeg2_fast_decode_block_non_intra(MpegEncContext *s, DCTELEM *block, int n); +-static inline int mpeg2_fast_decode_block_intra(MpegEncContext *s, DCTELEM *block, int n); ++static int mpeg2_fast_decode_block_non_intra(MpegEncContext *s, DCTELEM *block, int n); ++static int mpeg2_fast_decode_block_intra(MpegEncContext *s, DCTELEM *block, int n); + static int mpeg_decode_motion(MpegEncContext *s, int fcode, int pred); + static void exchange_uv(MpegEncContext *s); + +@@ -1505,7 +1505,7 @@ + return diff; + } + +-static inline int mpeg1_decode_block_intra(MpegEncContext *s, ++static int mpeg1_decode_block_intra(MpegEncContext *s, + DCTELEM *block, + int n) + { +@@ -1578,7 +1578,7 @@ + return 0; + } + +-static inline int mpeg1_decode_block_inter(MpegEncContext *s, ++static int mpeg1_decode_block_inter(MpegEncContext *s, + DCTELEM *block, + int n) + { +@@ -1656,7 +1656,7 @@ + return 0; + } + +-static inline int mpeg1_fast_decode_block_inter(MpegEncContext *s, DCTELEM *block, int n) ++static int mpeg1_fast_decode_block_inter(MpegEncContext *s, DCTELEM *block, int n) + { + int level, i, j, run; + RLTable *rl = &rl_mpeg1; +@@ -1728,7 +1728,7 @@ + } + + +-static inline int mpeg2_decode_block_non_intra(MpegEncContext *s, ++static int mpeg2_decode_block_non_intra(MpegEncContext *s, + DCTELEM *block, + int n) + { +@@ -1809,7 +1809,7 @@ + return 0; + } + +-static inline int mpeg2_fast_decode_block_non_intra(MpegEncContext *s, ++static int mpeg2_fast_decode_block_non_intra(MpegEncContext *s, + DCTELEM *block, + int n) + { +@@ -1872,7 +1872,7 @@ + } + + +-static inline int mpeg2_decode_block_intra(MpegEncContext *s, ++static int mpeg2_decode_block_intra(MpegEncContext *s, + DCTELEM *block, + int n) + { +@@ -1952,7 +1952,7 @@ + return 0; + } + +-static inline int mpeg2_fast_decode_block_intra(MpegEncContext *s, ++static int mpeg2_fast_decode_block_intra(MpegEncContext *s, + DCTELEM *block, + int n) + { -- cgit v1.2.3