sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix build error on 5-stable.

Browse source 
PR:		ports/90329
Submitted by:	Heino Tiedemann <rotkaps_spam_trap@gmx.de>
This commit is contained in:
MANTANI Nobutaka 2005-12-15 17:19:47 +00:00
parent e87e69b622
commit 73e520aabf
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=151249
3 changed files with 134 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
multimedia/libxine/files/patch-src:libffmpeg:libavcodec:h263.c
View file

@ -1,5 +1,5 @@
--- src/libffmpeg/libavcodec/h263.c.orig Tue Dec 13 22:39:59 2005
+++ src/libffmpeg/libavcodec/h263.c Tue Dec 13 22:41:08 2005
--- src/libffmpeg/libavcodec/h263.c.orig Fri Dec 16 00:57:15 2005
+++ src/libffmpeg/libavcodec/h263.c Fri Dec 16 01:00:23 2005
@@ -66,8 +66,8 @@
static int h263p_decode_umotion(MpegEncContext * s, int pred);
static int h263_decode_block(MpegEncContext * s, DCTELEM * block,
@ -11,3 +11,21 @@
int n, int coded, int intra, int rvlc);
static int mpeg4_get_block_length(MpegEncContext * s, DCTELEM * block, int n, int intra_dc,
uint8_t *scan_table);
@@ -4682,7 +4682,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;
@@ -4727,7 +4727,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;

94
multimedia/libxine/files/patch-src:libffmpeg:libavcodec:mpeg12.c Normal file
View file

@ -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)
{

20
multimedia/libxine/files/patch-src:libffmpeg:libavcodec:msmpeg4.c Normal file
View file

@ -0,0 +1,20 @@
--- src/libffmpeg/libavcodec/msmpeg4.c.orig Fri Dec 16 01:17:22 2005
+++ src/libffmpeg/libavcodec/msmpeg4.c Fri Dec 16 01:18:00 2005
@@ -60,7 +60,7 @@
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,
+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,
@@ -1659,7 +1659,7 @@
return 0;
}
//#define ERROR_DETAILS
-static inline int msmpeg4_decode_block(MpegEncContext * s, DCTELEM * block,
+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;