Skip to content

V
vlc-2-2
Commit 0f403e75 authored by Antoine Cellerier's avatar Antoine Cellerier
Browse files
Options

Hopefully fix the build for windows.

parent a3f716c5
Show whitespace changes
Inline Side-by-side
Showing with 7 additions and 7 deletions
modules/video_filter/seamcarving.c
View file @ 0f403e75
...@@ -140,8 +140,8 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic ) ...@@ -140,8 +140,8 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
return p_outpic; return p_outpic;
} }
static inline int min3( int a, int b, int c ); static inline int my_min3( int a, int b, int c );
static inline int min( int a, int b ); static inline int my_min( int a, int b );
static int RemoveVerticalSeam( filter_t *p_filter, picture_t *p_inpic, picture_t *p_outpic, int i_src_visible ); static int RemoveVerticalSeam( filter_t *p_filter, picture_t *p_inpic, picture_t *p_outpic, int i_src_visible );
//#define DRAW_GRADIENT //#define DRAW_GRADIENT
...@@ -264,15 +264,15 @@ static int RemoveVerticalSeam( filter_t *p_filter, picture_t *p_inpic, picture_t ...@@ -264,15 +264,15 @@ static int RemoveVerticalSeam( filter_t *p_filter, picture_t *p_inpic, picture_t
/* Compute line y's minimum energy value for paths ending on /* Compute line y's minimum energy value for paths ending on
* each x */ * each x */
x = 1; x = 1;
p_energy[x] = min( p_energy_prev[x ]+p_grad[x ], p_energy[x] = my_min( p_energy_prev[x ]+p_grad[x ],
p_energy_prev[x+1]+p_grad[x+1] ); p_energy_prev[x+1]+p_grad[x+1] );
for( x = 2; x < i_src_visible - 2; x++ ) for( x = 2; x < i_src_visible - 2; x++ )
{ {
p_energy[x] = min3( p_energy_prev[x-1]+p_grad[x-1], p_energy[x] = my_min3( p_energy_prev[x-1]+p_grad[x-1],
p_energy_prev[x ]+p_grad[x ], p_energy_prev[x ]+p_grad[x ],
p_energy_prev[x+1]+p_grad[x+1] ); p_energy_prev[x+1]+p_grad[x+1] );
} }
p_energy[x] = min( p_energy_prev[x-1]+p_grad[x-1], p_energy[x] = my_min( p_energy_prev[x-1]+p_grad[x-1],
p_energy_prev[x ]+p_grad[x ] ); p_energy_prev[x ]+p_grad[x ] );
#ifdef DRAW_ENERGY #ifdef DRAW_ENERGY
...@@ -353,7 +353,7 @@ static int RemoveVerticalSeam( filter_t *p_filter, picture_t *p_inpic, picture_t ...@@ -353,7 +353,7 @@ static int RemoveVerticalSeam( filter_t *p_filter, picture_t *p_inpic, picture_t
#endif #endif
} }
static inline int min3( int a, int b, int c ) static inline int my_min3( int a, int b, int c )
{ {
if( a < b ) if( a < b )
{ {
...@@ -363,7 +363,7 @@ static inline int min3( int a, int b, int c ) ...@@ -363,7 +363,7 @@ static inline int min3( int a, int b, int c )
if( b < c ) return b; if( b < c ) return b;
return c; return c;
} }
static inline int min( int a, int b ) static inline int my_min( int a, int b )
{ {
return a < b ? a : b; return a < b ? a : b;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment