[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[414] mplayerxp

[<nic...@us...>]

Revision: 414
          http://mplayerxp.svn.sourceforge.net/mplayerxp/?rev=414&view=rev
Author:   nickols_k
Date:     2012-11-19 15:52:58 +0000 (Mon, 19 Nov 2012)
Log Message:
-----------
cleanups

Modified Paths:
--------------
    mplayerxp/configure
    mplayerxp/libvo/jpeg_enc.c
    mplayerxp/postproc/af_scaletempo.cpp
    mplayerxp/postproc/libmenu/menu.cpp
    mplayerxp/postproc/swscale.h

Modified: mplayerxp/configure
===================================================================
--- mplayerxp/configure	2012-11-19 13:39:12 UTC (rev 413)
+++ mplayerxp/configure	2012-11-19 15:52:58 UTC (rev 414)
@@ -1145,6 +1145,8 @@
 
 #ifdef __cplusplus
 }
+#undef FFMAX
+#undef FFMIN
 #endif
 #endif
 EOF

Modified: mplayerxp/libvo/jpeg_enc.c
===================================================================
--- mplayerxp/libvo/jpeg_enc.c	2012-11-19 13:39:12 UTC (rev 413)
+++ mplayerxp/libvo/jpeg_enc.c	2012-11-19 15:52:58 UTC (rev 414)
@@ -33,10 +33,7 @@
 #endif
 /* We need this #define because we need ../libavcodec/common.h to #define
  * be2me_32, otherwise the linker will complain that it doesn't exist */
-#define HAVE_AV_CONFIG_H
-#include "../libmpcodecs/interface/ffmpeg/avcodec.h"
-//#include "../libavcodec/dsputil.h"
-//#include "../libavcodec/mpegvideo.h"
+#include "mp_conf_lavc.h"
 
 #include "jpeg_enc.h"
 #include "vo_msg.h"

Modified: mplayerxp/postproc/af_scaletempo.cpp
===================================================================
--- mplayerxp/postproc/af_scaletempo.cpp	2012-11-19 13:39:12 UTC (rev 413)
+++ mplayerxp/postproc/af_scaletempo.cpp	2012-11-19 15:52:58 UTC (rev 414)
@@ -30,6 +30,7 @@
  * samples from last stride with correlated samples of current input
  *
  */
+#include <algorithm>
 
 #include <stdlib.h>
 #include <string.h>
@@ -40,9 +41,6 @@
 #include "osdep/mplib.h"
 #include "pp_msg.h"
 
-#define FFMAX(a,b) ((a) > (b) ? (a) : (b))
-#define FFMIN(a,b) ((a) > (b) ? (b) : (a))
-
 // Data for specific instances of this filter
 typedef struct af_scaletempo_s
 {
@@ -99,7 +97,7 @@
     } else {
       int bytes_skip;
       s->bytes_to_slide -= s->bytes_queued;
-      bytes_skip = FFMIN(s->bytes_to_slide, bytes_in);
+      bytes_skip = std::min(s->bytes_to_slide, bytes_in);
       s->bytes_queued = 0;
       s->bytes_to_slide -= bytes_skip;
       offset += bytes_skip;
@@ -108,7 +106,7 @@
   }
 
   if (bytes_in > 0) {
-    int bytes_copy = FFMIN(s->bytes_queue - s->bytes_queued, bytes_in);
+    int bytes_copy = std::min(s->bytes_queue - s->bytes_queued, bytes_in);
     memcpy(s->buf_queue + s->bytes_queued,
 	   (int8_t*)data->audio + offset,
 	   bytes_copy);

Modified: mplayerxp/postproc/libmenu/menu.cpp
===================================================================
--- mplayerxp/postproc/libmenu/menu.cpp	2012-11-19 13:39:12 UTC (rev 413)
+++ mplayerxp/postproc/libmenu/menu.cpp	2012-11-19 15:52:58 UTC (rev 414)
@@ -1,3 +1,5 @@
+#include <algorithm>
+
 #include "mp_config.h"
 #include "help_mp.h"
 
@@ -337,7 +339,7 @@
       fribidi_set_mirroring (1);
       fribidi_set_reorder_nsm (0);
       char_set_num = fribidi_parse_charset("UTF-8");
-      buffer_size = FFMAX(1024,len+1);
+      buffer_size = std::max(1024,len+1);
       logical = mp_malloc(buffer_size);
       visual = mp_malloc(buffer_size);
       outputstr = new char [buffer_size];

Modified: mplayerxp/postproc/swscale.h
===================================================================
--- mplayerxp/postproc/swscale.h	2012-11-19 13:39:12 UTC (rev 413)
+++ mplayerxp/postproc/swscale.h	2012-11-19 15:52:58 UTC (rev 414)
@@ -22,7 +22,7 @@
 #ifndef SWSCALE_H
 #define SWSCALE_H
 
-#include "mp_conf_lavc.h" // unfortunatelly
+#include "mp_conf_lavc.h"
 
 extern int sws_init(void);
 extern void sws_uninit(void);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.