diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-12-09 12:24:11 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-12-09 12:24:11 +0000 |
| commit | 6caf5586eeb00b45190ceaeff270e6850598e87c (patch) | |
| tree | 2102ee89551ec703f7171ca72dfd0649dc7a358f /libmpcodecs/ve_x264.c | |
| parent | 134a537a76e429b16b8069e60d51ddbd4d6a0494 (diff) | |
| download | mpv-6caf5586eeb00b45190ceaeff270e6850598e87c.tar.bz2 mpv-6caf5586eeb00b45190ceaeff270e6850598e87c.tar.xz | |
Get rid of min/max macros from aviheader.h, they do not belong here.
Replace their uses by FFMIN/FFMAX
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21547 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs/ve_x264.c')
| -rw-r--r-- | libmpcodecs/ve_x264.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libmpcodecs/ve_x264.c b/libmpcodecs/ve_x264.c index 9a46a1ad23..8fee8d1d8c 100644 --- a/libmpcodecs/ve_x264.c +++ b/libmpcodecs/ve_x264.c @@ -124,7 +124,7 @@ void x264enc_set_param(m_option_t* opt, char* arg) if(turbo == 1) { param.i_frame_reference = ( param.i_frame_reference + 1 ) >> 1; - param.analyse.i_subpel_refine = max( min( 3, param.analyse.i_subpel_refine - 1 ), 1 ); + param.analyse.i_subpel_refine = FFMAX( FFMIN( 3, param.analyse.i_subpel_refine - 1 ), 1 ); param.analyse.inter &= ( ~X264_ANALYSE_PSUB8x8 ); param.analyse.inter &= ( ~X264_ANALYSE_BSUB16x16 ); param.analyse.i_trellis = 0; |