Fixed detection of linux framebuffer support. Included xineutils.h in dsputil_mlib.c and added to diff_to_ffmpeg_cvs.txt. Fixed function prototype in dsputil_mlib.c (should be sent back to ffmpeg-dev at some point). Fixed includes in nosefart. Fixed nested comments and includes in goom.

CVS patchset: 6180
CVS date: 2004/02/20 19:53:38

2 files changed, 35 insertions, 24 deletions

diff --git a/src/libffmpeg/diff_to_ffmpeg_cvs.txt b/src/libffmpeg/diff_to_ffmpeg_cvs.txt
index 348b9a315..b70c44797 100644
--- a/src/libffmpeg/diff_to_ffmpeg_cvs.txt
+++ b/src/libffmpeg/diff_to_ffmpeg_cvs.txt
@@ -526,6 +526,15 @@ retrieving revision 1.14
 diff -u -r1.14 dsputil_mlib.c
 --- mlib/dsputil_mlib.c	11 Oct 2003 16:43:51 -0000	1.14
 +++ mlib/dsputil_mlib.c	1 Feb 2004 04:42:48 -0000
+@@ -20,6 +20,8 @@
+ #include "../dsputil.h"
+ #include "../mpegvideo.h"
+ 
++#include "../../../xine-utils/xineutils.h"
++
+ #include <mlib_types.h>
+ #include <mlib_status.h>
+ #include <mlib_sys.h>
 @@ -419,6 +419,7 @@
  
  void dsputil_init_mlib(DSPContext* c, AVCodecContext *avctx)
diff --git a/src/libffmpeg/libavcodec/mlib/dsputil_mlib.c b/src/libffmpeg/libavcodec/mlib/dsputil_mlib.c
index 6cd8bfe97..278682534 100644
--- a/src/libffmpeg/libavcodec/mlib/dsputil_mlib.c
+++ b/src/libffmpeg/libavcodec/mlib/dsputil_mlib.c
@@ -20,6 +20,8 @@
 #include "../dsputil.h"
 #include "../mpegvideo.h"
 
+#include "../../../xine-utils/xineutils.h"
+
 #include <mlib_types.h>
 #include <mlib_status.h>
 #include <mlib_sys.h>
@@ -60,7 +62,7 @@ static void add_pixels_clamped_mlib(const DCTELEM *block, uint8_t *pixels, int l
 
 /* put block, width 16 pixel, height 8/16 */
 
-static void put_pixels16_mlib (uint8_t * dest, const uint8_t * ref,
+static void put_pixels16_mlib(uint8_t * dest, const uint8_t * ref,
 			       int stride, int height)
 {
   switch (height) {
@@ -77,7 +79,7 @@ static void put_pixels16_mlib (uint8_t * dest, const uint8_t * ref,
   }
 }
 
-static void put_pixels16_x2_mlib (uint8_t * dest, const uint8_t * ref,
+static void put_pixels16_x2_mlib(uint8_t * dest, const uint8_t * ref,
 				  int stride, int height)
 {
   switch (height) {
@@ -94,7 +96,7 @@ static void put_pixels16_x2_mlib (uint8_t * dest, const uint8_t * ref,
   }
 }
 
-static void put_pixels16_y2_mlib (uint8_t * dest, const uint8_t * ref,
+static void put_pixels16_y2_mlib(uint8_t * dest, const uint8_t * ref,
 				  int stride, int height)
 {
   switch (height) {
@@ -130,7 +132,7 @@ static void put_pixels16_xy2_mlib(uint8_t * dest, const uint8_t * ref,
 
 /* put block, width 8 pixel, height 4/8/16 */
 
-static void put_pixels8_mlib (uint8_t * dest, const uint8_t * ref,
+static void put_pixels8_mlib(uint8_t * dest, const uint8_t * ref,
 			       int stride, int height)
 {
   switch (height) {
@@ -151,7 +153,7 @@ static void put_pixels8_mlib (uint8_t * dest, const uint8_t * ref,
   }
 }
 
-static void put_pixels8_x2_mlib (uint8_t * dest, const uint8_t * ref,
+static void put_pixels8_x2_mlib(uint8_t * dest, const uint8_t * ref,
 				  int stride, int height)
 {
   switch (height) {
@@ -172,7 +174,7 @@ static void put_pixels8_x2_mlib (uint8_t * dest, const uint8_t * ref,
   }
 }
 
-static void put_pixels8_y2_mlib (uint8_t * dest, const uint8_t * ref,
+static void put_pixels8_y2_mlib(uint8_t * dest, const uint8_t * ref,
 				  int stride, int height)
 {
   switch (height) {
@@ -216,7 +218,7 @@ static void put_pixels8_xy2_mlib(uint8_t * dest, const uint8_t * ref,
 
 /* average block, width 16 pixel, height 8/16 */
 
-static void avg_pixels16_mlib (uint8_t * dest, const uint8_t * ref,
+static void avg_pixels16_mlib(uint8_t * dest, const uint8_t * ref,
 			       int stride, int height)
 {
   switch (height) {
@@ -233,7 +235,7 @@ static void avg_pixels16_mlib (uint8_t * dest, const uint8_t * ref,
   }
 }
 
-static void avg_pixels16_x2_mlib (uint8_t * dest, const uint8_t * ref,
+static void avg_pixels16_x2_mlib(uint8_t * dest, const uint8_t * ref,
 				  int stride, int height)
 {
   switch (height) {
@@ -250,7 +252,7 @@ static void avg_pixels16_x2_mlib (uint8_t * dest, const uint8_t * ref,
   }
 }
 
-static void avg_pixels16_y2_mlib (uint8_t * dest, const uint8_t * ref,
+static void avg_pixels16_y2_mlib(uint8_t * dest, const uint8_t * ref,
 				  int stride, int height)
 {
   switch (height) {
@@ -286,7 +288,7 @@ static void avg_pixels16_xy2_mlib(uint8_t * dest, const uint8_t * ref,
 
 /* average block, width 8 pixel, height 4/8/16 */
 
-static void avg_pixels8_mlib (uint8_t * dest, const uint8_t * ref,
+static void avg_pixels8_mlib(uint8_t * dest, const uint8_t * ref,
 			       int stride, int height)
 {
   switch (height) {
@@ -307,7 +309,7 @@ static void avg_pixels8_mlib (uint8_t * dest, const uint8_t * ref,
   }
 }
 
-static void avg_pixels8_x2_mlib (uint8_t * dest, const uint8_t * ref,
+static void avg_pixels8_x2_mlib(uint8_t * dest, const uint8_t * ref,
 				  int stride, int height)
 {
   switch (height) {
@@ -328,7 +330,7 @@ static void avg_pixels8_x2_mlib (uint8_t * dest, const uint8_t * ref,
   }
 }
 
-static void avg_pixels8_y2_mlib (uint8_t * dest, const uint8_t * ref,
+static void avg_pixels8_y2_mlib(uint8_t * dest, const uint8_t * ref,
 				  int stride, int height)
 {
   switch (height) {
@@ -384,9 +386,9 @@ static void ff_idct_put_mlib(uint8_t *dest, int line_size, DCTELEM *data)
     int i;
     uint8_t *cm = cropTbl + MAX_NEG_CROP;
 
-    mlib_VideoIDCT8x8_S16_S16 (data, data);
+    mlib_VideoIDCT8x8_S16_S16(data, data);
     
-    for(i=0;i<8;i++) {
+    for (i=0;i<8;i++) {
         dest[0] = cm[data[0]];
         dest[1] = cm[data[1]];
         dest[2] = cm[data[2]];
@@ -403,18 +405,18 @@ static void ff_idct_put_mlib(uint8_t *dest, int line_size, DCTELEM *data)
 
 static void ff_idct_add_mlib(uint8_t *dest, int line_size, DCTELEM *data)
 {
-    mlib_VideoIDCT8x8_S16_S16 (data, data);
+    mlib_VideoIDCT8x8_S16_S16(data, data);
     mlib_VideoAddBlock_U8_S16(dest, (mlib_s16 *)data, line_size);
 }
 
-static void ff_idct_mlib(uint8_t *dest, int line_size, DCTELEM *data)
+static void ff_idct_mlib(DCTELEM *data)
 {
-    mlib_VideoIDCT8x8_S16_S16 (data, data);
+    mlib_VideoIDCT8x8_S16_S16(data, data);
 }
 
 static void ff_fdct_mlib(DCTELEM *data)
 {
-    mlib_VideoDCT8x8_S16_S16 (data, data);
+    mlib_VideoDCT8x8_S16_S16(data, data);
 }
 
 void dsputil_init_mlib(DSPContext* c, AVCodecContext *avctx)
@@ -452,15 +454,15 @@ void dsputil_init_mlib(DSPContext* c, AVCodecContext *avctx)
 void MPV_common_init_mlib(MpegEncContext *s)
 {
   if (xine_mm_accel() & MM_ACCEL_MLIB) {
-    if(s->avctx->dct_algo==FF_DCT_AUTO || s->avctx->dct_algo==FF_DCT_MLIB){
+    if ((s->avctx->dct_algo == FF_DCT_AUTO) || (s->avctx->dct_algo==FF_DCT_MLIB)) {
 	s->dsp.fdct = ff_fdct_mlib;
     }
 
-    if(s->avctx->idct_algo==FF_IDCT_AUTO || s->avctx->idct_algo==FF_IDCT_MLIB){
-        s->dsp.idct_put= ff_idct_put_mlib;
-        s->dsp.idct_add= ff_idct_add_mlib;
-        s->dsp.idct    = ff_idct_mlib;
-        s->dsp.idct_permutation_type= FF_NO_IDCT_PERM;
+    if ((s->avctx->idct_algo == FF_IDCT_AUTO) || (s->avctx->idct_algo == FF_IDCT_MLIB)) {
+        s->dsp.idct                  = ff_idct_mlib;
+        s->dsp.idct_put              = ff_idct_put_mlib;
+        s->dsp.idct_add              = ff_idct_add_mlib;
+        s->dsp.idct_permutation_type = FF_NO_IDCT_PERM;
     }
   }
 }