ports/69874: libxine does not compile on post gcc-3.4.2 -CURRENT

[Michael Nottebrock]

>Number:         69874
>Category:       ports
>Synopsis:       libxine does not compile on post gcc-3.4.2 -CURRENT
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Aug 01 13:20:21 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Michael Nottebrock
>Release:        FreeBSD 5.2-CURRENT i386
>Organization:
>Environment:
System: FreeBSD kiste 5.2-CURRENT FreeBSD 5.2-CURRENT #0: Fri Jun 25 07:31:27 CEST 2004 root at kiste:/usr/obj/usr/src/sys/KISTE-UP i386


	
>Description:
	Inlining of mpeg4_decode_dc and mpeg4_decode_block fails. 
	
>How-To-Repeat:
	
>Fix:

	The trivial fix is de-inlining the functions. This might incur a
	performance penalty, which I haven't checked. It should be 
	sufficient as a stop-gap fix anyway.

--- libxine.diff begins here ---
Index: files/patch-src_libffmpeg_libavcodec_h263.c
===================================================================
RCS file: files/patch-src_libffmpeg_libavcodec_h263.c
diff -N files/patch-src_libffmpeg_libavcodec_h263.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-src_libffmpeg_libavcodec_h263.c	1 Aug 2004 13:09:24 -0000
@@ -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;
--- libxine.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: