Revision: 3464
Author: johnmci
Date: 2015-09-30 18:13:29 -0700 (Wed, 30 Sep 2015)
Log Message:
-----------
JMM update plugins to compile under llvm Xcode 7
Modified Paths:
--------------
trunk/platforms/Cross/plugins/Mpeg3Plugin/libmpeg/audio/dct.c
trunk/platforms/Cross/plugins/Mpeg3Plugin/libmpeg/video/idct.c
trunk/platforms/Cross/plugins/Mpeg3Plugin/libmpeg/video/motion.c
Modified: trunk/platforms/Cross/plugins/Mpeg3Plugin/libmpeg/audio/dct.c
===================================================================
--- trunk/platforms/Cross/plugins/Mpeg3Plugin/libmpeg/audio/dct.c 2015-10-01 01:13:09 UTC (rev 3463)
+++ trunk/platforms/Cross/plugins/Mpeg3Plugin/libmpeg/audio/dct.c 2015-10-01 01:13:29 UTC (rev 3464)
@@ -792,7 +792,7 @@
}
-inline void swap_cmplx(mpeg3_complex_t *a, mpeg3_complex_t *b)
+void swap_cmplx(mpeg3_complex_t *a, mpeg3_complex_t *b)
{
mpeg3_complex_t tmp;
Modified: trunk/platforms/Cross/plugins/Mpeg3Plugin/libmpeg/video/idct.c
===================================================================
--- trunk/platforms/Cross/plugins/Mpeg3Plugin/libmpeg/video/idct.c 2015-10-01 01:13:09 UTC (rev 3463)
+++ trunk/platforms/Cross/plugins/Mpeg3Plugin/libmpeg/video/idct.c 2015-10-01 01:13:29 UTC (rev 3464)
@@ -69,7 +69,7 @@
*/
-inline
+
int mpeg3video_idctrow(short *blk)
{
int x0, x1, x2, x3, x4, x5, x6, x7, x8;
@@ -133,7 +133,6 @@
*/
-inline
int mpeg3video_idctcol(short *blk)
{
int x0, x1, x2, x3, x4, x5, x6, x7, x8;
Modified: trunk/platforms/Cross/plugins/Mpeg3Plugin/libmpeg/video/motion.c
===================================================================
--- trunk/platforms/Cross/plugins/Mpeg3Plugin/libmpeg/video/motion.c 2015-10-01 01:13:09 UTC (rev 3463)
+++ trunk/platforms/Cross/plugins/Mpeg3Plugin/libmpeg/video/motion.c 2015-10-01 01:13:29 UTC (rev 3464)
@@ -64,9 +64,6 @@
int *dmvector, * differential motion vector *
int mvx, int mvy * decoded mv components (always in field format) *
*/
-#if !defined(sun)
-INLINE
-#endif
void mpeg3video_calc_dmv(mpeg3video_t *video,
int DMV[][2],
int *dmvector,